version 2.9.0-beta2

compiled_firmware_files/firmware.json

@@ -9,14 +9,14 @@
         "2": {
             "latest_fw": "2.8.0",
             "link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.8.0.bin",
-            "latest_beta_fw": "2.9.0-beta1",
-            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta1.bin"
+            "latest_beta_fw": "2.9.0-beta2",
+            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta2.bin"
         },
         "NON-CVE 1": {
             "latest_fw": "2.8.0",
             "link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.8.0.bin",
-            "latest_beta_fw": "2.9.0-beta1",
-            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta1.bin"
+            "latest_beta_fw": "2.9.0-beta2",
+            "link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta2.bin"
         }
     }
 }

software/NRG_itho_wifi/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 3.16)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 get_filename_component(configName "${CMAKE_BINARY_DIR}" NAME)

software/NRG_itho_wifi/dependencies.lock

@@ -3,7 +3,7 @@ dependencies:
     component_hash: null
     source:
       type: idf
-    version: 4.4.6
-manifest_hash: 745d5f35635c730e06f545b7d84b4ea5e8236f6e2751a43b51203ced139ddb39
+    version: 4.4.7
+manifest_hash: e70ff19af7538c977dc9cd554f833f2d8783fe23418b97944d4714cd0f5d4039
 target: esp32
 version: 1.0.0

software/NRG_itho_wifi/main/CMakeLists.txt

@@ -4,4 +4,3 @@
 FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/main/*.*)
 
 idf_component_register(SRCS ${app_sources})
-

software/NRG_itho_wifi/main/generic_functions.cpp

@@ -37,7 +37,7 @@ uint8_t getIthoStatusJSON(JsonObject root)
     root["ppmw"] = static_cast<int>(ppmw + 0.5);
     index++;
   }
-  if (systemConfig.fw_check && fw_update_available > 0)
+  if (systemConfig.fw_check)
   {
     root["firmware_update_available"] = fw_update_available ? "true" : "false";
     index++;

software/NRG_itho_wifi/main/tasks/task_syscontrol.cpp

@@ -1004,6 +1004,7 @@ bool ithoInitCheck()
     if (systemConfig.itho_pwm2i2c)
     {
       sendI2CPWMinit();
+      // sendCO2init();
     }
   }
   return false;

software/NRG_itho_wifi/main/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define FWVERSION "2.9.0-beta1"
+#define FWVERSION "2.9.0-beta2"

software/NRG_itho_wifi/main/websocket.cpp

@@ -29,12 +29,12 @@ void websocketInit()
   {
     WebSerial.setAuthentication(systemConfig.sys_username, systemConfig.sys_password);
   }
-  //if enable a web based serial terminal will be available at http://IP:8000/webserial
+  // if enable a web based serial terminal will be available at http://IP:8000/webserial
   if (logConfig.webserial_active)
   {
     WebSerial.begin(&wsserver);
-  }  
-  
+  }
+
 #endif
 }
 
@@ -151,7 +151,7 @@ void jsonWsSend(const char *rootName)
   else if (strcmp(rootName, "remtypeconf") == 0)
   {
     JsonObject nested = root[rootName].to<JsonObject>();
-    nested["remtype"] = static_cast<uint16_t>(virtualRemotes.getRemoteType(0));
+    nested["remtype"] = static_cast<uint16_t>(virtualRemotes.getRemoteType(0)); // FIXME, should also support remotes on other positions than only index 0
   }
   else if (strcmp(rootName, "remotes") == 0)
   {
@@ -333,6 +333,14 @@ void handle_ws_message(std::string &&msg)
         {
           setSettingCE30(root["ithotemptemp"].as<int16_t>(), root["ithotemp"].as<int16_t>(), root["ithotimestamp"].as<uint32_t>(), true);
         }
+        else if (val == 0xC000)
+        {
+          sendCO2speed(root["itho_c000_speed1"].as<uint8_t>(), root["itho_c000_speed2"].as<uint8_t>());
+        }
+        else if (val == 0x9298)
+        {
+          sendCO2value(root["itho_9298_val"].as<uint16_t>());
+        }
         else if (val == 4030)
         {
           setSetting4030(root["idx"].as<uint16_t>(), root["dt"].as<uint8_t>(), root["val"].as<int16_t>(), root["chk"].as<uint8_t>(), true);
@@ -567,10 +575,9 @@ void handle_ws_message(std::string &&msg)
       remotes.updateRemoteFunction(index, remfunc);
       RemoteTypes type = static_cast<RemoteTypes>(root["remtype"].as<uint16_t>() | 0);
       remotes.updateRemoteType(index, type);
-
-      bool bidirectional = (type == RemoteTypes::RFTAUTON || type == RemoteTypes::RFTN || type == RemoteTypes::RFTCO2 || type == RemoteTypes::RFTRV || type == RemoteTypes::RFTSPIDER) ? (remfunc != RemoteFunctions::MONITOR ? true : false) : false;
+      bool bidirectional = root["bidirectional"] | 0;
       remotes.updateRemoteBidirectional(index, bidirectional);
-
+      // bool bidirectional = (type == RemoteTypes::RFTAUTON || type == RemoteTypes::RFTN || type == RemoteTypes::RFTCO2 || type == RemoteTypes::RFTRV || type == RemoteTypes::RFTSPIDER) ? (remfunc != RemoteFunctions::MONITOR ? true : false) : false;
       uint8_t id[3] = {0, 0, 0};
       id[0] = root["id"][0].as<uint8_t>();
       id[1] = root["id"][1].as<uint8_t>();

software/NRG_itho_wifi/platformio.ini

@@ -12,45 +12,44 @@ default_envs =
 [env]
 ; Global data for all [env:***]
 build_flags =
-  -D VERSION=2.9.0-beta1
+  -D VERSION=2.9.0-beta2
 ;upload_port = /dev/cu.usbserial-1410 #optional, only needed if PlatformIO autodetect is not working
 ;monitor_port = /dev/cu.usbserial-1410 #optional, only needed if PlatformIO autodetect is not working
+platform = platformio/espressif32 @ ~6.9.0
 framework = arduino, espidf
 lib_ldf_mode = chain+
 monitor_speed = 115200
 lib_deps =
     https://github.com/bblanchon/ArduinoStreamUtils.git#v1.9.0
     https://github.com/bblanchon/ArduinoJson.git#v7.2.0
     https://github.com/thijse/Arduino-Log.git#1.1.1
-    ;https://github.com/me-no-dev/AsyncTCP.git#ca8ac5f919d02bea07b474531981ddbfd64de97c
-    ;https://github.com/me-no-dev/ESPAsyncWebServer.git#f71e3d427b5be9791a8a2c93cf8079792c3a9a26
     https://github.com/mathieucarbou/AsyncTCP.git#v3.2.10
     https://github.com/mathieucarbou/ESPAsyncWebServer.git#v3.3.17
     https://github.com/mathieucarbou/MycilaWebSerial#v6.4.1
     https://github.com/jclds139/FS_FilePrint.git#a8b3bae397ce918c49be112c034a0fcbbc5c24fd
     https://github.com/arjenhiemstra/pubsubclient.git#3c7c4a89df6536cc52a3962cd0b76b0bfc8f5818
     https://github.com/arcao/Syslog#e9c2eea7a91fdda3a55f9df2ebc122f3152da02d
     https://github.com/arjenhiemstra/ArduinoNvs.git
-    https://github.com/joltwallet/esp_littlefs.git#v1.14.2
+    https://github.com/joltwallet/esp_littlefs.git#v1.14.8
     ;https://github.com/jgromes/RadioLib.git#6.4.2
 
 [project_base]
-;this section has config items common to all ESP32 boards
-platform = espressif32 @ ~6.5.0
 board_build.filesystem = littlefs
 board_build.partitions = ithowifi_parttable_coredump.csv
 monitor_filters = esp32_exception_decoder
 extra_scripts = 
   build_script.py
 build_flags =
+  ;-I managed_components/joltwallet__littlefs/include
   -Os
   -DESP32
-  -DMAX_NUM_OF_REMOTES=10
+  -DMG_ARCH=MG_ARCH_ESP32
+  -DMAX_NUM_OF_REMOTES=12
   -fno-strict-aliasing -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields
   -mlongcalls -nostdlib
   -g0
   -Wall -Wextra
-  -Wpointer-arith -Wunused-but-set-variable -Wdeprecated-declarations
+  -Wpointer-arith -Wunused-but-set-variable -Wdeprecated-declarations -Wno-error=format
 #check_skip_packages = true
 
 [env:dev]

software/NRG_itho_wifi/sdkconfig.beta

@@ -50,8 +50,16 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 CONFIG_BOOTLOADER_LOG_LEVEL=0
+
+#
+# Serial Flash Configurations
+#
 # CONFIG_BOOTLOADER_SPI_CUSTOM_WP_PIN is not set
 CONFIG_BOOTLOADER_SPI_WP_PIN=7
+# CONFIG_BOOTLOADER_FLASH_DC_AWARE is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
+# end of Serial Flash Configurations
+
 # CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 # CONFIG_BOOTLOADER_FACTORY_RESET is not set
@@ -67,7 +75,6 @@ CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x10
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
-CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
 #
@@ -494,6 +501,7 @@ CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
 CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
 # CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
+CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
 # end of Sleep Config
 
 #
@@ -514,6 +522,10 @@ CONFIG_ESP_IPC_ISR_ENABLE=y
 # LCD and Touch Panel
 #
 
+#
+# LCD Touch Drivers are maintained in the IDF Component Registry
+#
+
 #
 # LCD Peripheral Configuration
 #
@@ -623,6 +635,10 @@ CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
 # CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
+# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
+CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5
 CONFIG_ESP32_WIFI_CSI_ENABLED=y
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
@@ -832,6 +848,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
 # CONFIG_LWIP_NETIF_API is not set
+CONFIG_LWIP_TCPIP_TASK_PRIO=18
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
@@ -845,6 +862,7 @@ CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 CONFIG_LWIP_SO_RCVBUF=y
 # CONFIG_LWIP_NETBUF_RECVINFO is not set
+CONFIG_LWIP_IP_DEFAULT_TTL=64
 CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
@@ -895,10 +913,12 @@ CONFIG_LWIP_TCP_MSS=1436
 CONFIG_LWIP_TCP_TMR_INTERVAL=250
 CONFIG_LWIP_TCP_MSL=60000
 CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
-CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5760
+CONFIG_LWIP_TCP_WND_DEFAULT=5760
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
+CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4
 # CONFIG_LWIP_TCP_SACK_OUT is not set
 # CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
@@ -955,6 +975,13 @@ CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
 # end of SNTP
 
+#
+# DNS
+#
+CONFIG_LWIP_DNS_MAX_SERVERS=3
+# CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT is not set
+# end of DNS
+
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1194,6 +1221,20 @@ CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # end of PThreads
 
+#
+# Main Flash configuration
+#
+
+#
+# Optional and Experimental Features (READ DOCS FIRST)
+#
+
+#
+# Features here require specific hardware (READ DOCS FIRST!)
+#
+# end of Optional and Experimental Features (READ DOCS FIRST)
+# end of Main Flash configuration
+
 #
 # SPI Flash driver
 #
@@ -1510,8 +1551,8 @@ CONFIG_TCP_MAXRTX=12
 CONFIG_TCP_SYNMAXRTX=6
 CONFIG_TCP_MSS=1436
 CONFIG_TCP_MSL=60000
-CONFIG_TCP_SND_BUF_DEFAULT=5744
-CONFIG_TCP_WND_DEFAULT=5744
+CONFIG_TCP_SND_BUF_DEFAULT=5760
+CONFIG_TCP_WND_DEFAULT=5760
 CONFIG_TCP_RECVMBOX_SIZE=6
 CONFIG_TCP_QUEUE_OOSEQ=y
 # CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set