Added manifests and altered scripts to include them in built zip files.

Author: Furball The Great

boards/esp32-idf/buildzipdir.sh

@@ -8,6 +8,7 @@ cp build/ota_data_initial.bin /tmp/build/esp32zip
 cp build/main.bin /tmp/build/esp32zip
 cp build/web.bin /tmp/build/esp32zip
 cp boards/esp32-idf/flash* boards/esp32-idf/readme* /tmp/build/esp32zip
+sed 's/RELEASETAG/$GITHUB_REF_NAME/' boards/esp32-idf/manifest.json  > /tmp/build/esp32zip/manifest.json
 cp LICENSE /tmp/build/esp32zip
 cp webui/dist/bundle.js.LICENSE.txt /tmp/build/esp32zip
 ls /tmp/build/esp32zip

boards/esp32-idf/manifest.json

@@ -0,0 +1,17 @@
+{
+    "name": "AirMeter.io RELEASETAG",
+    "builds": [
+      {
+        "chipFamily": "ESP32",
+        "improv": false,
+        "parts": [
+          { "path": "bootloader.bin", "offset": 4096},
+          { "path": "partition-table.bin", "offset": 32768 },
+          { "path": "ota_data_initial.bin", "offset": 53248 },
+          { "path": "main.bin", "offset": 65536 },
+          { "path": "web.bin", "offset": 2285568 }
+        ]
+      }
+    ]
+  }
+  

boards/esp32-idf/sdkconfig

@@ -44,12 +44,12 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
-# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
+CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
-CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
-CONFIG_BOOTLOADER_LOG_LEVEL=3
+CONFIG_BOOTLOADER_LOG_LEVEL=1
 # CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 # CONFIG_BOOTLOADER_FACTORY_RESET is not set
@@ -60,10 +60,10 @@ CONFIG_BOOTLOADER_WDT_ENABLE=y
 # CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
 CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
-# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set
+CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
-CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
+CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x10
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
 # end of Bootloader config
 
@@ -134,11 +134,10 @@ CONFIG_PARTITION_TABLE_MD5=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_COMPILER_OPTIMIZATION_PERF is not set
 # CONFIG_COMPILER_OPTIMIZATION_NONE is not set
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
+# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
-CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0
+# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
 # CONFIG_COMPILER_CXX_RTTI is not set
 CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
@@ -347,7 +346,7 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 #
 # Common ESP-related
 #
-CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+# CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584
@@ -379,19 +378,8 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y
 #
 # Ethernet
 #
-CONFIG_ETH_ENABLED=y
-CONFIG_ETH_USE_ESP32_EMAC=y
-CONFIG_ETH_PHY_INTERFACE_RMII=y
-# CONFIG_ETH_PHY_INTERFACE_MII is not set
-CONFIG_ETH_RMII_CLK_INPUT=y
-# CONFIG_ETH_RMII_CLK_OUTPUT is not set
-CONFIG_ETH_RMII_CLK_IN_GPIO=0
-CONFIG_ETH_DMA_BUFFER_SIZE=512
-CONFIG_ETH_DMA_RX_BUFFER_NUM=10
-CONFIG_ETH_DMA_TX_BUFFER_NUM=10
-CONFIG_ETH_USE_SPI_ETHERNET=y
-# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
-# CONFIG_ETH_SPI_ETHERNET_W5500 is not set
+# CONFIG_ETH_USE_ESP32_EMAC is not set
+# CONFIG_ETH_USE_SPI_ETHERNET is not set
 # CONFIG_ETH_USE_OPENETH is not set
 # end of Ethernet
 
@@ -570,23 +558,20 @@ CONFIG_FMB_COMM_MODE_TCP_EN=y
 CONFIG_FMB_TCP_PORT_DEFAULT=502
 CONFIG_FMB_TCP_PORT_MAX_CONN=5
 CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_COMM_MODE_RTU_EN=y
-CONFIG_FMB_COMM_MODE_ASCII_EN=y
+# CONFIG_FMB_COMM_MODE_RTU_EN is not set
+# CONFIG_FMB_COMM_MODE_ASCII_EN is not set
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_FMB_QUEUE_LENGTH=20
 CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
 CONFIG_FMB_SERIAL_BUF_SIZE=256
-CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
-CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
 CONFIG_FMB_PORT_TASK_PRIO=10
-CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT=y
-CONFIG_FMB_CONTROLLER_SLAVE_ID=0x00112233
+# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
 CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
 CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
 CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
-CONFIG_FMB_TIMER_PORT_ENABLED=y
+# CONFIG_FMB_TIMER_PORT_ENABLED is not set
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
 # CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
@@ -672,7 +657,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 # LWIP
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
-CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
+# CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES is not set
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
@@ -776,7 +761,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # SNTP
 #
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=2
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
@@ -965,7 +950,7 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 # OpenSSL
 #
 # CONFIG_OPENSSL_DEBUG is not set
-CONFIG_OPENSSL_ERROR_STACK=y
+# CONFIG_OPENSSL_ERROR_STACK is not set
 # CONFIG_OPENSSL_ASSERT_DO_NOTHING is not set
 CONFIG_OPENSSL_ASSERT_EXIT=y
 # end of OpenSSL
@@ -1179,12 +1164,12 @@ CONFIG_LEGACY_INCLUDE_COMMON_HEADERS=y
 # Deprecated options for backward compatibility
 CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
 # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
-# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
+CONFIG_LOG_BOOTLOADER_LEVEL_ERROR=y
 # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
-CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
+# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
-CONFIG_LOG_BOOTLOADER_LEVEL=3
+CONFIG_LOG_BOOTLOADER_LEVEL=1
 # CONFIG_APP_ROLLBACK_ENABLE is not set
 # CONFIG_FLASH_ENCRYPTION_ENABLED is not set
 # CONFIG_FLASHMODE_QIO is not set
@@ -1202,11 +1187,10 @@ CONFIG_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_MONITOR_BAUD=115200
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
-CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
+# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set
+CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
 # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
-CONFIG_CXX_EXCEPTIONS=y
-CONFIG_CXX_EXCEPTIONS_EMG_POOL_SIZE=0
+# CONFIG_CXX_EXCEPTIONS is not set
 CONFIG_STACK_CHECK_NONE=y
 # CONFIG_STACK_CHECK_NORM is not set
 # CONFIG_STACK_CHECK_STRONG is not set
@@ -1281,13 +1265,12 @@ CONFIG_MB_QUEUE_LENGTH=20
 CONFIG_MB_SERIAL_TASK_STACK_SIZE=4096
 CONFIG_MB_SERIAL_BUF_SIZE=256
 CONFIG_MB_SERIAL_TASK_PRIO=10
-CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT=y
-CONFIG_MB_CONTROLLER_SLAVE_ID=0x00112233
+# CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
 CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
 CONFIG_MB_CONTROLLER_STACK_SIZE=4096
 CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
-CONFIG_MB_TIMER_PORT_ENABLED=y
+# CONFIG_MB_TIMER_PORT_ENABLED is not set
 CONFIG_MB_TIMER_GROUP=0
 CONFIG_MB_TIMER_INDEX=0
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set

boards/esp8266-rtossdk/buildzipdir.sh

@@ -8,6 +8,7 @@ cp build/ota_data_initial.bin /tmp/build/esp8266zip
 cp build/airmeter-io.bin /tmp/build/esp8266zip
 cp build/web.bin /tmp/build/esp8266zip
 cp boards/esp8266-rtossdk/flash* boards/esp8266-rtossdk/readme* /tmp/build/esp8266zip
+sed 's/RELEASETAG/$GITHUB_REF_NAME/' boards/esp8266-rtossdk/manifest.json  > /tmp/build/esp8266zip/manifest.json
 cp LICENSE /tmp/build/esp8266zip
 cp webui/dist/bundle.js.LICENSE.txt /tmp/build/esp8266zip
 ls /tmp/build/esp8266zip

boards/esp8266-rtossdk/manifest.json

@@ -0,0 +1,17 @@
+{
+    "name": "AirMeter.io RELEASETAG",
+    "builds": [
+      {
+        "chipFamily": "ESP8266",
+        "improv": false,
+        "parts": [
+          { "path": "bootloader.bin", "offset": 0},
+          { "path": "partition-table.bin", "offset": 32768 },
+          { "path": "ota_data_initial.bin", "offset": 53248 },
+          { "path": "airmeter-io.bin", "offset": 65536 },
+          { "path": "web.bin", "offset": 2285568 }
+        ]
+      }
+    ]
+  }
+