Skip to content

Commit 903e775

Browse files
arjenhiemstraarjenhiemstra
committed
Version 2.9.0-beta7
Changes since 2.9.0-beta6 fix: update packages - ArduinoJson 7.2.0 -> 7.2.1 - AsyncTCP 3.2.14 -> 3.3.1 - ESPAsyncWebServer 3.3.23 -> 3.4.5 fix: simplify config save and reset, add option to save/reset all system config files fix: config save check implemented partially fix: mDNS hostname should only have lower case characters fix: refactor i2c slave receive function (reduce memory use and complexity) fix: esp-idf 5 prep fix: prevent error message on empty ha discovery config fix: typo fix: remove unused include Firmware binary (CVE HW rev.2 and NON-CVE): https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta7.bin
1 parent 6bda082 commit 903e775

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+14023
-697
lines changed

‎compiled_firmware_files/firmware.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
"2": {
1010
"latest_fw": "2.8.0",
1111
"link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.8.0.bin",
12-
"latest_beta_fw": "2.9.0-beta6",
13-
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta6.bin",
14-
"beta_release_notes": "https://github.com/arjenhiemstra/ithowifi/releases/tag/Version-2.9.0-beta6",
12+
"latest_beta_fw": "2.9.0-beta7",
13+
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta7.bin",
14+
"beta_release_notes": "https://github.com/arjenhiemstra/ithowifi/releases/tag/Version-2.9.0-beta7",
1515
"release_notes": "https://github.com/arjenhiemstra/ithowifi/releases/tag/Version-2.8.0"
1616
},
1717
"NON-CVE 1": {
1818
"latest_fw": "2.8.0",
1919
"link": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.8.0.bin",
20-
"latest_beta_fw": "2.9.0-beta6",
21-
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta6.bin",
22-
"beta_release_notes": "https://github.com/arjenhiemstra/ithowifi/releases/tag/Version-2.9.0-beta6",
20+
"latest_beta_fw": "2.9.0-beta7",
21+
"link_beta": "https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta7.bin",
22+
"beta_release_notes": "https://github.com/arjenhiemstra/ithowifi/releases/tag/Version-2.9.0-beta7",
2323
"release_notes": "https://github.com/arjenhiemstra/ithowifi/releases/tag/Version-2.8.0"
2424
}
2525
}

‎compiled_firmware_files/unified_hw2_noncve/elf/nrgitho-v2.9.0-beta7.elf‎

26 MB
Binary file not shown.

‎compiled_firmware_files/unified_hw2_noncve/nrgitho-v2.9.0-beta7.bin‎

1.46 MB
Binary file not shown.

‎software/NRG_itho_wifi/main/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#pragma once
22

3-
inline const char * fw_version = "2.9.0-beta6";
3+
inline const char * fw_version = "2.9.0-beta7";

‎software/NRG_itho_wifi/main/webroot/controls_js_gz.h‎

Lines changed: 676 additions & 676 deletions
Large diffs are not rendered by default.

‎software/NRG_itho_wifi/main/webroot_source/controls.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -703,14 +703,12 @@ $(document).ready(function () {
703703
}
704704
}
705705
else if ($(this).attr('id') == 'resetsysconf') {
706-
if (confirm("This will reset the system config to factory default, are you sure?")) {
706+
if (confirm("This will reset the system configs files to factory default, are you sure?")) {
707707
websock_send('{"resetsysconf":true}');
708708
}
709709
}
710710
else if ($(this).attr('id') == 'saveallconfigs') {
711-
if (confirm("This will reset the system configs files to factory default, are you sure?")) {
712-
websock_send('{"saveallconfigs":true}');
713-
}
711+
websock_send('{"saveallconfigs":true}');
714712
}
715713
else if ($(this).attr('id') == 'reboot') {
716714
if (confirm("This will reboot the device, are you sure?")) {

‎software/NRG_itho_wifi/platformio.ini‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@ default_envs =
1212
[env]
1313
; Global data for all [env:***]
1414
build_flags =
15-
-D VERSION=2.9.0-beta6
15+
-D VERSION=2.9.0-beta7
1616
;upload_port = /dev/cu.usbserial-1410 #optional, only needed if PlatformIO autodetect is not working
1717
;monitor_port = /dev/cu.usbserial-1410 #optional, only needed if PlatformIO autodetect is not working
1818
platform = platformio/espressif32 @ ~6.9.0
19+
;platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10/platform-espressif32.zip
1920
framework = arduino, espidf
21+
; board_build.embed_txtfiles =
22+
; managed_components/espressif__esp_insights/server_certs/https_server.crt
23+
; managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
24+
; managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
25+
; managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
2026
lib_ldf_mode = chain+
2127
monitor_speed = 115200
2228
lib_deps =
@@ -45,7 +51,7 @@ build_flags =
4551
-std=gnu++2a
4652
-std=gnu17
4753
-Os
48-
-DESP32
54+
;-DESP32
4955
-DMG_ARCH=MG_ARCH_ESP32
5056
-DMAX_NUM_OF_REMOTES=12
5157
-fno-strict-aliasing -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields

‎software/NRG_itho_wifi/sdkconfig.beta‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ CONFIG_FMB_TCP_PORT_MAX_CONN=5
725725
CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
726726
CONFIG_FMB_COMM_MODE_RTU_EN=y
727727
CONFIG_FMB_COMM_MODE_ASCII_EN=y
728-
CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
728+
CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
729729
CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
730730
CONFIG_FMB_QUEUE_LENGTH=20
731731
CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
@@ -784,7 +784,7 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
784784
CONFIG_FREERTOS_DEBUG_OCDAWARE=y
785785
CONFIG_FREERTOS_FPU_IN_ISR=y
786786
CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
787-
# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
787+
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
788788
# end of FreeRTOS
789789

790790
#
@@ -1042,7 +1042,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
10421042
# end of Certificate Bundle
10431043

10441044
# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
1045-
# CONFIG_MBEDTLS_CMAC_C is not set
1045+
CONFIG_MBEDTLS_CMAC_C=y
10461046
CONFIG_MBEDTLS_HARDWARE_AES=y
10471047
CONFIG_MBEDTLS_HARDWARE_MPI=y
10481048
CONFIG_MBEDTLS_HARDWARE_SHA=y
@@ -1526,7 +1526,7 @@ CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y
15261526
CONFIG_ESP32_ENABLE_COREDUMP=y
15271527
CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
15281528
CONFIG_ESP32_CORE_DUMP_STACK_SIZE=0
1529-
CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
1529+
CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=3000
15301530
CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
15311531
CONFIG_MB_QUEUE_LENGTH=20
15321532
CONFIG_MB_SERIAL_TASK_STACK_SIZE=4096

‎software/NRG_itho_wifi/sdkconfig.dev‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ CONFIG_FMB_TCP_PORT_MAX_CONN=5
725725
CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
726726
CONFIG_FMB_COMM_MODE_RTU_EN=y
727727
CONFIG_FMB_COMM_MODE_ASCII_EN=y
728-
CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
728+
CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
729729
CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
730730
CONFIG_FMB_QUEUE_LENGTH=20
731731
CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
@@ -784,7 +784,7 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
784784
CONFIG_FREERTOS_DEBUG_OCDAWARE=y
785785
CONFIG_FREERTOS_FPU_IN_ISR=y
786786
CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
787-
# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set
787+
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
788788
# end of FreeRTOS
789789

790790
#
@@ -1042,7 +1042,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
10421042
# end of Certificate Bundle
10431043

10441044
# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
1045-
# CONFIG_MBEDTLS_CMAC_C is not set
1045+
CONFIG_MBEDTLS_CMAC_C=y
10461046
CONFIG_MBEDTLS_HARDWARE_AES=y
10471047
CONFIG_MBEDTLS_HARDWARE_MPI=y
10481048
CONFIG_MBEDTLS_HARDWARE_SHA=y
@@ -1526,7 +1526,7 @@ CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y
15261526
CONFIG_ESP32_ENABLE_COREDUMP=y
15271527
CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
15281528
CONFIG_ESP32_CORE_DUMP_STACK_SIZE=0
1529-
CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
1529+
CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=3000
15301530
CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
15311531
CONFIG_MB_QUEUE_LENGTH=20
15321532
CONFIG_MB_SERIAL_TASK_STACK_SIZE=4096

‎software/lib/AsyncTCP@src-feb66ac088d654894a099c45a9bff78c/CMakeLists.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
set(COMPONENT_SRCDIRS
2+
"src"
3+
)
4+
5+
set(COMPONENT_ADD_INCLUDEDIRS
6+
"src"
7+
)
8+
9+
set(COMPONENT_REQUIRES
10+
"arduino-esp32"
11+
)
12+
13+
register_component()
14+
15+
target_compile_options(${COMPONENT_TARGET} PRIVATE -fno-rtti)

0 commit comments

Comments
 (0)