Allow modem define from makefile

diff --git a/Boards.h b/Boards.h
index 751a373e458a8df1e8bbab3233c6d3e366e9a63f..b921b4e5daba76b8dd53c46d22c1315314db7283 100644 (file)
--- a/Boards.h
+++ b/Boards.h
@@ -42,14 +42,16 @@
     #define BOARD_GENERIC_NRF52 0x50
     #define BOARD_RAK4630       0x51
 
-    #if BOARD_MODEL == BOARD_RAK4630
-      #define MODEM SX1262
-    #elif BOARD_MODEL == BOARD_RNODE_NG_22
-      #define MODEM SX1262
-    #elif BOARD_MODEL == BOARD_GENERIC_NRF52
-      #define MODEM SX1262
-    #else
-      #define MODEM SX1276
+    #ifndef MODEM
+      #if BOARD_MODEL == BOARD_RAK4630
+        #define MODEM SX1262
+      #elif BOARD_MODEL == BOARD_RNODE_NG_22
+        #define MODEM SX1262
+      #elif BOARD_MODEL == BOARD_GENERIC_NRF52
+        #define MODEM SX1262
+      #else
+        #define MODEM SX1276
+      #endif
     #endif
 
 #endif
\ No newline at end of file

diff --git a/Makefile b/Makefile
index effaa0a2adfb39883e7c5f632ac034c3231e3c9e..2d2fb5abcccc21cd640b7d26f2e50cb82e05fffe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,9 @@ firmware-mega2560:
 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-tbeam_sx126x:
+       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\" \"-DMODEM=0x03\""
+
 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=0x39\""
 
@@ -73,7 +76,7 @@ firmware-lora32_v20:
        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=0x36\" \"-DEXTERNAL_LEDS=true\""
 
 firmware-lora32_v21:
-       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=0x37\" \"-DMODEM=0x01\""
+       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=0x37\""
 
 firmware-lora32_v21_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=0x37\" \"-DEXTERNAL_LEDS=true\""
@@ -112,11 +115,11 @@ upload-mega2560:
        arduino-cli upload -p /dev/ttyACM0 --fqbn arduino:avr:mega
 
 upload-tbeam:
-       arduino-cli upload -p /dev/ttyUSB0 --fqbn esp32:esp32:t-beam
+       arduino-cli upload -p /dev/ttyACM0 --fqbn esp32:esp32:t-beam
        @sleep 1
-       rnodeconf /dev/ttyUSB0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.t-beam/RNode_Firmware.ino.bin)
+       rnodeconf /dev/ttyACM0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.t-beam/RNode_Firmware.ino.bin)
        @sleep 3
-       python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
+       python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
 
 upload-lora32_v10:
        arduino-cli upload -p /dev/ttyUSB0 --fqbn esp32:esp32:ttgo-lora32

diff --git a/Release/console_image.bin b/Release/console_image.bin
index 26fee23ed24f1c27b70dcd180f287cc652254256..271d7c11fc0a811049c5075625ad35cfcec66393 100644 (file)
Binary files a/Release/console_image.bin and b/Release/console_image.bin differ