diff --git a/build.sh b/build.sh index 89bd0b012..63627a2e5 100755 --- a/build.sh +++ b/build.sh @@ -148,6 +148,7 @@ for section, options in data: env_name = section[4:] mqtt_enabled = False ota_enabled = False + ota_disabled = False platform = None for key, value in options: values = value if isinstance(value, list) else str(value).split() @@ -159,11 +160,13 @@ for section, options in data: for flag in values: if "WITH_MQTT_BRIDGE" in str(flag): mqtt_enabled = True + if "DISABLE_LORA_OTA" in str(flag): + ota_disabled = True match = pattern.search(str(flag)) if match and platform is None: platform = match.group(0) if platform: - print(f"{env_name}\t{platform}\t{1 if mqtt_enabled else 0}\t{1 if ota_enabled else 0}") + print(f"{env_name}\t{platform}\t{1 if mqtt_enabled else 0}\t{1 if ota_enabled and not ota_disabled else 0}") ' "$SUPPORTED_PLATFORM_PATTERN" <<<"$PIO_CONFIG_JSON" ) fi diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index fa701c45a..53eb886b5 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -88,6 +88,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -166,6 +167,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini index 2723fdc27..8bbab0d81 100644 --- a/variants/heltec_v2/platformio.ini +++ b/variants/heltec_v2/platformio.ini @@ -83,6 +83,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index bf2376044..37327ab40 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/variants/lilygo_tbeam_SX1262/platformio.ini @@ -120,6 +120,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows this board's internal DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini index 0492ec6eb..0d945eb7a 100644 --- a/variants/lilygo_tbeam_SX1276/platformio.ini +++ b/variants/lilygo_tbeam_SX1276/platformio.ini @@ -116,6 +116,7 @@ build_flags = -D MAX_NEIGHBOURS=50 -D PERSISTANT_GPS=1 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini index 32039286f..231a130b9 100644 --- a/variants/lilygo_tlora_v2_1/platformio.ini +++ b/variants/lilygo_tlora_v2_1/platformio.ini @@ -269,6 +269,7 @@ build_flags = -D WITH_RS232_BRIDGE=Serial2 -D WITH_RS232_BRIDGE_RX=34 -D WITH_RS232_BRIDGE_TX=25 + -D DISABLE_LORA_OTA=1 ; RS232 bridge plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -290,6 +291,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index eb9b201d4..659cee75e 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -97,6 +97,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 @@ -166,6 +167,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 -D WITH_ESPNOW_BRIDGE=1 + -D DISABLE_LORA_OTA=1 ; ESP-NOW plus LoRa OTA overflows classic ESP32 DRAM ; -D BRIDGE_DEBUG=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1