diff --git a/iotm/esp32_4mb/400/firmware.bin b/iotm/esp32_4mb/400/firmware.bin index 83335b7b..08ce70b6 100644 Binary files a/iotm/esp32_4mb/400/firmware.bin and b/iotm/esp32_4mb/400/firmware.bin differ diff --git a/iotm/esp32_4mb/400/littlefs.bin b/iotm/esp32_4mb/400/littlefs.bin index 0d4e51e0..b9d0d686 100644 Binary files a/iotm/esp32_4mb/400/littlefs.bin and b/iotm/esp32_4mb/400/littlefs.bin differ diff --git a/iotm/esp8266_4mb/400/firmware.bin b/iotm/esp8266_4mb/400/firmware.bin new file mode 100644 index 00000000..f44ca861 Binary files /dev/null and b/iotm/esp8266_4mb/400/firmware.bin differ diff --git a/iotm/esp8266_4mb/400/littlefs.bin b/iotm/esp8266_4mb/400/littlefs.bin new file mode 100644 index 00000000..faf52c77 Binary files /dev/null and b/iotm/esp8266_4mb/400/littlefs.bin differ diff --git a/platformio.ini b/platformio.ini index 7cf8c373..eef2aaa9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -451,29 +451,50 @@ build_src_filter = [env:esp32_4mb_fromitems] lib_deps = + https://github.com/enjoyneering/AHTxx.git + adafruit/Adafruit BME280 Library + adafruit/Adafruit BMP280 Library + beegee-tokyo/DHT sensor library for ESPx https://github.com/milesburton/Arduino-Temperature-Control-Library https://github.com/jbechter/arduino-onewire-DS2423 paulstoffregen/OneWire @ ^2.3.7 https://github.com/tremaru/iarduino_RTC + Sensirion I2C SCD4x @0.4.0 + Sensirion Core @0.6.0 + robtillaart/SHT2x@^0.1.1 WEMOS SHT3x@1.0.0 plerup/EspSoftwareSerial gyverlibs/EncButton @ ^2.0 + https://github.com/RoboticsBrno/ServoESP32 + adafruit/Adafruit MCP23017 Arduino Library@^2.1.0 adafruit/Adafruit BusIO @ ^1.13.2 + dfrobot/DFRobotDFPlayerMini @ ^1.0.5 + adafruit/Adafruit BusIO @ ^1.13.2 + https://github.com/robotclass/RobotClass_LiquidCrystal_I2C + marcoschwartz/LiquidCrystal_I2C@^1.1.4 build_src_filter = + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -481,9 +502,14 @@ build_src_filter = + + + + + + + + + + + + + + + + [env:esp32s2_4mb_fromitems] lib_deps = diff --git a/src/Main.cpp b/src/Main.cpp index 6185235f..fccafe59 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -3,7 +3,7 @@ #include "classes/IoTDB.h" #include "utils/Statistic.h" #include -#ifdef esp32s2_4mb +#ifdef esp32s2_4mb #include #endif @@ -80,9 +80,9 @@ void stopErrorMarker(int id) { } void setup() { -#ifdef esp32s2_4mb +#ifdef esp32s2_4mb USB.begin(); -#endif +#endif #ifdef esp32_4mb My_timer = timerBegin(0, 80, true); timerAttachInterrupt(My_timer, &onTimer, true); @@ -107,7 +107,7 @@ void setup() { Serial.println("FIRMWARE NAME " + String(FIRMWARE_NAME)); Serial.println("FIRMWARE VERSION " + String(FIRMWARE_VERSION)); Serial.println("WEB VERSION " + getWebVersion()); - const String buildTime = String(BUILD_DAY) + "/" + String(BUILD_MONTH) + "/" + String(BUILD_YEAR) + " " + String(BUILD_HOUR) + ":" + String(BUILD_MIN) + ":" + String(BUILD_SEC); + const String buildTime = String(BUILD_DAY) + "." + String(BUILD_MONTH) + "." + String(BUILD_YEAR) + " " + String(BUILD_HOUR) + ":" + String(BUILD_MIN) + ":" + String(BUILD_SEC); Serial.println("BUILD TIME " + buildTime); jsonWriteStr_(errorsHeapJson, F("bt"), buildTime); Serial.println(F("------------------------")); diff --git a/src/utils/Statistic.cpp b/src/utils/Statistic.cpp index 812236dc..621e1de5 100644 --- a/src/utils/Statistic.cpp +++ b/src/utils/Statistic.cpp @@ -16,8 +16,8 @@ void stInit() { void updateDeviceStatus() { String ret; - String serverIP; - jsonRead(settingsFlashJson, F("serverip"), serverIP); + String serverIP = "http://iotmanager.org"; + // jsonRead(settingsFlashJson, F("serverip"), serverIP); String url = serverIP + F("/projects/esprebootstat.php"); // SerialPrint("i", "Stat", "url " + url); if ((WiFi.status() == WL_CONNECTED)) {