fix: Board id collission with heltec

diff --git a/Config.h b/Config.h
index 56764e03892dac27aa2a77913ed517a1203af9d1..326c6c86d2c3db349c7e077b59643225044665eb 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -35,7 +35,7 @@
        #define BOARD_GENERIC_ESP32 0x35
        #define BOARD_LORA32_V2_0   0x36
        #define BOARD_LORA32_V2_1   0x37
-       #define BOARD_LORA32_V1_0   0x38
+       #define BOARD_LORA32_V1_0   0x39
        #define BOARD_HELTEC32_V2   0x38
        #define BOARD_RNODE_NG_20   0x40
        #define BOARD_RNODE_NG_21   0x41

diff --git a/Makefile b/Makefile
index 961e44801d2604563288946a6a8f591c72949dc7..199e948705e6b14ea660a7b867cb1afe3319b707 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ firmware-tbeam:
        arduino-cli compile --fqbn esp32:esp32:t-beam -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x33\""
 
 firmware-lora32_v10:
-       arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x38\""
+       arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=\0x39""
 
 firmware-lora32_v10_extled:
        arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x38\" \"-DEXTERNAL_LEDS=true\""
@@ -177,7 +177,7 @@ release-tbeam:
        rm -r build
 
 release-lora32_v10:
-       arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x38\""
+       arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x39\""
        cp ~/.arduino15/packages/esp32/hardware/esp32/2.0.?/tools/partitions/boot_app0.bin build/rnode_firmware_lora32v10.boot_app0
        cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin build/rnode_firmware_lora32v10.bin
        cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bootloader.bin build/rnode_firmware_lora32v10.bootloader