diff --git a/Config.h b/Config.h index 4684378..72cc480 100644 --- a/Config.h +++ b/Config.h @@ -99,12 +99,16 @@ const int pin_led_rx = 14; const int pin_led_tx = 32; #elif BOARD_MODEL == BOARD_LORA32_V2_0 - // TODO: Add correct pins here - // const int pin_cs = 18; - // const int pin_reset = 23; - // const int pin_dio = 26; - // const int pin_led_rx = 2; - // const int pin_led_tx = 25; + const int pin_cs = 18; + const int pin_reset = 12; + const int pin_dio = 26; + #if defined(EXTERNAL_LEDS) + const int pin_led_rx = 15; + const int pin_led_tx = 4; + #else + const int pin_led_rx = 23; + const int pin_led_tx = 23; + #endif #elif BOARD_MODEL == BOARD_LORA32_V2_1 const int pin_cs = 18; const int pin_reset = 23; @@ -208,4 +212,4 @@ #define START_FROM_BROWNOUT 0x03 #define START_FROM_JTAG 0x04 -#endif \ No newline at end of file +#endif diff --git a/Makefile b/Makefile index 25199fc..a874d62 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,9 @@ firmware-lora32_v20: firmware-lora32_v21: arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x37\"" +firmware-lora32_v20_extled: + arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x36\" \"-DEXTERNAL_LEDS=true\"" + firmware-lora32_v21_extled: arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x37\" \"-DEXTERNAL_LEDS=true\"" @@ -58,7 +61,7 @@ upload-mega2560: -release-all: release-rnode release-tbeam release-lora32_v21 release-featheresp32 release-genericesp32 +release-all: release-rnode release-tbeam release-lora32_v20 release-lora32_v21 release-lora32_v20_extled release-lora32_v21_extled release-featheresp32 release-genericesp32 release-rnode: arduino-cli compile --fqbn unsignedio:avr:rnode -e @@ -92,6 +95,24 @@ release-lora32_v21: zip --junk-paths ./Precompiled/rnode_firmware_latest_lora32v21.zip ./Precompiled/esptool/esptool.py build/rnode_firmware_latest_lora32v21.boot_app0 build/rnode_firmware_latest_lora32v21.bin build/rnode_firmware_latest_lora32v21.bootloader build/rnode_firmware_latest_lora32v21.partitions rm -r build +release-lora32_v20_extled: + arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x36\" \"-DEXTERNAL_LEDS=true\"" + cp ~/.arduino15/packages/esp32/hardware/esp32/2.0.2/tools/partitions/boot_app0.bin build/rnode_firmware_latest_lora32v20.boot_app0 + cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin build/rnode_firmware_latest_lora32v20.bin + cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bootloader.bin build/rnode_firmware_latest_lora32v20.bootloader + cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.partitions.bin build/rnode_firmware_latest_lora32v20.partitions + zip --junk-paths ./Precompiled/rnode_firmware_latest_lora32v20_extled.zip ./Precompiled/esptool/esptool.py build/rnode_firmware_latest_lora32v20.boot_app0 build/rnode_firmware_latest_lora32v20.bin build/rnode_firmware_latest_lora32v20.bootloader build/rnode_firmware_latest_lora32v20.partitions + rm -r build + +release-lora32_v21_extled: + arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x37\" \"-DEXTERNAL_LEDS=true\"" + cp ~/.arduino15/packages/esp32/hardware/esp32/2.0.2/tools/partitions/boot_app0.bin build/rnode_firmware_latest_lora32v21.boot_app0 + cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin build/rnode_firmware_latest_lora32v21.bin + cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bootloader.bin build/rnode_firmware_latest_lora32v21.bootloader + cp build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.partitions.bin build/rnode_firmware_latest_lora32v21.partitions + zip --junk-paths ./Precompiled/rnode_firmware_latest_lora32v21_extled.zip ./Precompiled/esptool/esptool.py build/rnode_firmware_latest_lora32v21.boot_app0 build/rnode_firmware_latest_lora32v21.bin build/rnode_firmware_latest_lora32v21.bootloader build/rnode_firmware_latest_lora32v21.partitions + rm -r build + release-featheresp32: arduino-cli compile --fqbn esp32:esp32:featheresp32 -e --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x34\"" cp ~/.arduino15/packages/esp32/hardware/esp32/2.0.2/tools/partitions/boot_app0.bin build/rnode_firmware_latest_featheresp32.boot_app0 @@ -113,4 +134,4 @@ release-genericesp32: release-mega2560: arduino-cli compile --fqbn arduino:avr:mega -e cp build/arduino.avr.mega/RNode_Firmware.ino.hex Precompiled/rnode_firmware_latest_m2560.hex - rm -r build \ No newline at end of file + rm -r build diff --git a/Precompiled/rnode_firmware_latest_esp32_generic.zip b/Precompiled/rnode_firmware_latest_esp32_generic.zip index ae48d22..2c37009 100644 Binary files a/Precompiled/rnode_firmware_latest_esp32_generic.zip and b/Precompiled/rnode_firmware_latest_esp32_generic.zip differ diff --git a/Precompiled/rnode_firmware_latest_featheresp32.zip b/Precompiled/rnode_firmware_latest_featheresp32.zip index 14cfa9f..ba5abaa 100644 Binary files a/Precompiled/rnode_firmware_latest_featheresp32.zip and b/Precompiled/rnode_firmware_latest_featheresp32.zip differ diff --git a/Precompiled/rnode_firmware_latest_lora32v20.zip b/Precompiled/rnode_firmware_latest_lora32v20.zip new file mode 100644 index 0000000..bd9e92a Binary files /dev/null and b/Precompiled/rnode_firmware_latest_lora32v20.zip differ diff --git a/Precompiled/rnode_firmware_latest_lora32v20_extled.zip b/Precompiled/rnode_firmware_latest_lora32v20_extled.zip new file mode 100644 index 0000000..74f61e1 Binary files /dev/null and b/Precompiled/rnode_firmware_latest_lora32v20_extled.zip differ diff --git a/Precompiled/rnode_firmware_latest_lora32v21.zip b/Precompiled/rnode_firmware_latest_lora32v21.zip index 54f3765..800811b 100644 Binary files a/Precompiled/rnode_firmware_latest_lora32v21.zip and b/Precompiled/rnode_firmware_latest_lora32v21.zip differ diff --git a/Precompiled/rnode_firmware_latest_lora32v21_extled.zip b/Precompiled/rnode_firmware_latest_lora32v21_extled.zip new file mode 100644 index 0000000..4688cb6 Binary files /dev/null and b/Precompiled/rnode_firmware_latest_lora32v21_extled.zip differ diff --git a/Precompiled/rnode_firmware_latest_tbeam.zip b/Precompiled/rnode_firmware_latest_tbeam.zip index 735e35d..36fbe3d 100644 Binary files a/Precompiled/rnode_firmware_latest_tbeam.zip and b/Precompiled/rnode_firmware_latest_tbeam.zip differ diff --git a/Utilities.h b/Utilities.h index d561f08..5a8a7b1 100644 --- a/Utilities.h +++ b/Utilities.h @@ -42,10 +42,10 @@ uint8_t boot_vector = 0x00; void led_tx_on() { digitalWrite(pin_led_tx, LOW); } void led_tx_off() { digitalWrite(pin_led_tx, HIGH); } #elif BOARD_MODEL == BOARD_LORA32_V2_0 - // void led_rx_on() { digitalWrite(pin_led_rx, HIGH); } - // void led_rx_off() { digitalWrite(pin_led_rx, LOW); } - // void led_tx_on() { digitalWrite(pin_led_tx, LOW); } - // void led_tx_off() { digitalWrite(pin_led_tx, HIGH); } + void led_rx_on() { digitalWrite(pin_led_rx, HIGH); } + void led_rx_off() { digitalWrite(pin_led_rx, LOW); } + void led_tx_on() { digitalWrite(pin_led_tx, HIGH); } + void led_tx_off() { digitalWrite(pin_led_tx, LOW); } #elif BOARD_MODEL == BOARD_LORA32_V2_1 void led_rx_on() { digitalWrite(pin_led_rx, HIGH); } void led_rx_off() { digitalWrite(pin_led_rx, LOW); } @@ -955,4 +955,4 @@ inline uint16_t fifo16_len(FIFOBuffer16 *f) { PMU.setPowerOutPut(AXP192_LDO3, AXP202_OFF); } -#endif \ No newline at end of file +#endif