From 9310b783106acac6828dd6634310ec84b2bea3a3 Mon Sep 17 00:00:00 2001 From: PXKJ <52065178+AlanAlger001@users.noreply.github.com> Date: Mon, 20 Nov 2023 03:34:16 +0800 Subject: [PATCH 1/4] Fix esp32s3 and backpack passthrough flashing settings (#2472) * Update devBackpack.cpp * Update devBackpack.cpp --- src/lib/Backpack/devBackpack.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/Backpack/devBackpack.cpp b/src/lib/Backpack/devBackpack.cpp index c06e7dd97c..15ad16e3e8 100644 --- a/src/lib/Backpack/devBackpack.cpp +++ b/src/lib/Backpack/devBackpack.cpp @@ -40,10 +40,11 @@ void startPassthrough() uint32_t baud = PASSTHROUGH_BAUD == -1 ? BACKPACK_LOGGING_BAUD : PASSTHROUGH_BAUD; // get ready for passthrough if (GPIO_PIN_RCSIGNAL_RX == GPIO_PIN_RCSIGNAL_TX) - { - // if we have a single S.PORT pin for RX then we assume the standard UART pins for passthrough - CRSF::Port.begin(baud, SERIAL_8N1, 3, 1); - } + #if defined(PLATFORM_ESP32_S3) + CRSF::Port.begin(baud, SERIAL_8N1, 44, 43); // 如果PLATFORM_ESP32_S3宏定义，则将引脚配置为44和43，If PLATFORM_ESP32_S3 macro is defined, pins are configured as 44 and 43 + #else + CRSF::Port.begin(baud, SERIAL_8N1, 3, 1); // 否则继续使用默认引脚配置3和1，Otherwise continue to use default pin configuration 3 and 1 + #endif else { CRSF::Port.begin(baud, SERIAL_8N1, GPIO_PIN_RCSIGNAL_RX, GPIO_PIN_RCSIGNAL_TX); From 0984889b838406377113b745a05864819b8faebf Mon Sep 17 00:00:00 2001 From: Jye <14170229+JyeSmith@users.noreply.github.com> Date: Tue, 21 Nov 2023 07:04:02 +1000 Subject: [PATCH 2/4] Move unified.ini to top of targets list (#2473) * move unified.ini to top of targets list * The Purge --- src/platformio.ini | 24 ++------- src/targets/HGLRC_2400.ini | 25 --------- src/targets/HGLRC_900.ini | 18 ------- src/targets/Jumper_2400.ini | 47 ----------------- src/targets/MATEK_2400.ini | 34 ------------ src/targets/axis_2400.ini | 24 --------- src/targets/betafpv_2400.ini | 59 --------------------- src/targets/betafpv_900.ini | 31 ----------- src/targets/diy_2400.ini | 90 -------------------------------- src/targets/diy_900.ini | 75 -------------------------- src/targets/diy_ble_joystick.ini | 8 --- src/targets/emax_2400.ini | 17 ------ src/targets/emax_900.ini | 17 ------ src/targets/foxeer_2400.ini | 18 ------- src/targets/happymodel_2400.ini | 34 ------------ src/targets/happymodel_900.ini | 18 ------- src/targets/iFlight_2400.ini | 25 --------- src/targets/iFlight_900.ini | 24 --------- src/targets/namimnorc_2400.ini | 28 ---------- src/targets/namimnorc_900.ini | 18 ------- src/targets/neutronrc_900.ini | 19 ------- src/targets/quadkopters_2400.ini | 25 --------- src/targets/radiomaster_2400.ini | 54 ------------------- src/targets/vantac_2400.ini | 25 --------- 24 files changed, 3 insertions(+), 754 deletions(-) delete mode 100644 src/targets/HGLRC_2400.ini delete mode 100644 src/targets/HGLRC_900.ini delete mode 100644 src/targets/Jumper_2400.ini delete mode 100644 src/targets/MATEK_2400.ini delete mode 100644 src/targets/axis_2400.ini delete mode 100644 src/targets/betafpv_2400.ini delete mode 100644 src/targets/betafpv_900.ini delete mode 100644 src/targets/diy_ble_joystick.ini delete mode 100644 src/targets/emax_2400.ini delete mode 100644 src/targets/emax_900.ini delete mode 100644 src/targets/foxeer_2400.ini delete mode 100644 src/targets/iFlight_2400.ini delete mode 100644 src/targets/iFlight_900.ini delete mode 100644 src/targets/neutronrc_900.ini delete mode 100644 src/targets/quadkopters_2400.ini delete mode 100644 src/targets/radiomaster_2400.ini delete mode 100644 src/targets/vantac_2400.ini diff --git a/src/platformio.ini b/src/platformio.ini index cfc8775437..9c9e4f1106 100644 --- a/src/platformio.ini +++ b/src/platformio.ini @@ -5,34 +5,16 @@ extra_configs = # keep common first targets/common.ini # defined one by one to maintain the order - targets/ELRS_2400.ini - targets/axis_2400.ini + targets/unified.ini + targets/diy_900.ini + targets/diy_2400.ini targets/frsky.ini - targets/emax_900.ini - targets/emax_2400.ini targets/happymodel_900.ini targets/happymodel_2400.ini - targets/betafpv_900.ini - targets/betafpv_2400.ini targets/imrc.ini targets/namimnorc_900.ini targets/namimnorc_2400.ini - targets/neutronrc_900.ini targets/siyi.ini - targets/HGLRC_900.ini - targets/HGLRC_2400.ini - targets/quadkopters_2400.ini - targets/diy_900.ini - targets/diy_2400.ini - targets/diy_ble_joystick.ini - targets/MATEK_2400.ini - targets/iFlight_900.ini - targets/iFlight_2400.ini - targets/vantac_2400.ini - targets/Jumper_2400.ini - targets/radiomaster_2400.ini - targets/foxeer_2400.ini - targets/unified.ini # ------------------------- TARGET ENV DEFINITIONS ----------------- diff --git a/src/targets/HGLRC_2400.ini b/src/targets/HGLRC_2400.ini deleted file mode 100644 index 59382d3434..0000000000 --- a/src/targets/HGLRC_2400.ini +++ /dev/null @@ -1,25 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -[env:HGLRC_Hermes_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = hglrc.tx_2400.hermes - -[env:HGLRC_Hermes_2400_TX_via_WIFI] -extends = env:HGLRC_Hermes_2400_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:HGLRC_Hermes_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = hglrc.rx_2400.hermes - -[env:HGLRC_Hermes_2400_RX_via_BetaflightPassthrough] -extends = env:HGLRC_Hermes_2400_RX_via_UART - -[env:HGLRC_Hermes_2400_RX_via_WIFI] -extends = env:HGLRC_Hermes_2400_RX_via_UART diff --git a/src/targets/HGLRC_900.ini b/src/targets/HGLRC_900.ini deleted file mode 100644 index a361b843af..0000000000 --- a/src/targets/HGLRC_900.ini +++ /dev/null @@ -1,18 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -# ******************************** -# Receiver targets -# ******************************** - -[env:HGLRC_Hermes_900_RX_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = hglrc.rx_900.hermes - -[env:HGLRC_Hermes_900_RX_via_BetaflightPassthrough] -extends = env:HGLRC_Hermes_900_RX_via_UART - -[env:HGLRC_Hermes_900_RX_via_WIFI] -extends = env:HGLRC_Hermes_900_RX_via_UART diff --git a/src/targets/Jumper_2400.ini b/src/targets/Jumper_2400.ini deleted file mode 100644 index 9a8ef37321..0000000000 --- a/src/targets/Jumper_2400.ini +++ /dev/null @@ -1,47 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -[env:Jumper_AION_2400_T-Pro_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board = pico32 -board_config = jumper.tx_2400.t-pro - -[env:Jumper_AION_2400_T-Pro_TX_via_WIFI] -extends = env:Jumper_AION_2400_T-Pro_TX_via_UART - -[env:Jumper_AION_2400_T-Pro_TX_via_ETX] -extends = env:Jumper_AION_2400_T-Pro_TX_via_UART - -[env:Jumper_AION_2400_T-Lite_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board = pico32 -board_config = jumper.tx_2400.t-lite - -[env:Jumper_AION_2400_T-Lite_TX_via_WIFI] -extends = env:Jumper_AION_2400_T-Lite_TX_via_UART - -[env:Jumper_AION_2400_T-Lite_TX_via_ETX] -extends = env:Jumper_AION_2400_T-Lite_TX_via_UART - -[env:Jumper_AION_NANO_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = jumper.tx_2400.nano - -[env:Jumper_AION_NANO_2400_TX_via_WIFI] -extends = env:Jumper_AION_NANO_2400_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:Jumper_AION_Nano_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = jumper.rx_2400.nano - -[env:Jumper_AION_Nano_2400_RX_via_BetaflightPassthrough] -extends = env:Jumper_AION_Nano_2400_RX_via_UART - -[env:Jumper_AION_Nano_2400_RX_via_WIFI] -extends = env:Jumper_AION_Nano_2400_RX_via_UART \ No newline at end of file diff --git a/src/targets/MATEK_2400.ini b/src/targets/MATEK_2400.ini deleted file mode 100644 index 3fe22d5817..0000000000 --- a/src/targets/MATEK_2400.ini +++ /dev/null @@ -1,34 +0,0 @@ -# ******************************** -# Receiver MATEK_2400_RX -# ******************************** - -# ELRS-R24-D -[env:MATEK_2400_RX_R24D_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = matek.rx_2400.r24d - -[env:MATEK_2400_RX_R24D_via_BetaflightPassthrough] -extends = env:MATEK_2400_RX_R24D_via_UART - -[env:MATEK_2400_RX_R24D_via_WIFI] -extends = env:MATEK_2400_RX_R24D_via_UART - - -# ELRS-R24-S -[env:MATEK_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = matek.rx_2400.r24s - -[env:MATEK_2400_RX_via_BetaflightPassthrough] -extends = env:MATEK_2400_RX_via_UART - -[env:MATEK_2400_RX_via_WIFI] -extends = env:MATEK_2400_RX_via_UART - -# ELRS-R24-P -[env:MATEK_2400_RX_PWM_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = matek.rx_2400.r24p - -[env:MATEK_2400_RX_PWM_via_WIFI] -extends = env:MATEK_2400_RX_PWM_via_UART diff --git a/src/targets/axis_2400.ini b/src/targets/axis_2400.ini deleted file mode 100644 index 0c03c95e86..0000000000 --- a/src/targets/axis_2400.ini +++ /dev/null @@ -1,24 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** -[env:AXIS_THOR_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = axis.tx_2400.thor -monitor_speed = 420000 - -[env:AXIS_THOR_2400_TX_via_WIFI] -extends = env:AXIS_THOR_2400_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:AXIS_THOR_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = axis.rx_2400.thor - -[env:AXIS_THOR_2400_RX_via_WIFI] -extends = env:AXIS_THOR_2400_RX_via_UART - -[env:AXIS_THOR_2400_RX_via_BetaflightPassthrough] -extends = env:AXIS_THOR_2400_RX_via_UART diff --git a/src/targets/betafpv_2400.ini b/src/targets/betafpv_2400.ini deleted file mode 100644 index d7ac62bbcd..0000000000 --- a/src/targets/betafpv_2400.ini +++ /dev/null @@ -1,59 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** - -[env:BETAFPV_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = betafpv.tx_2400.nano2g4 - -[env:BETAFPV_2400_TX_via_WIFI] -extends = env:BETAFPV_2400_TX_via_UART - -[env:BETAFPV_2400_TX_MICRO_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = betafpv.tx_2400.micro2g4 - -[env:BETAFPV_2400_TX_MICRO_via_WIFI] -extends = env:BETAFPV_2400_TX_MICRO_via_UART - -[env:BETAFPV_2400_TX_MICRO_1000mw_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = betafpv.tx_2400.micro1w - -[env:BETAFPV_2400_TX_MICRO_1000mw_via_WIFI] -extends = env:BETAFPV_2400_TX_MICRO_1000mw_via_UART - -[env:BETAFPV_2400_TX_LITERADIO3_via_ETX] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = betafpv.tx_2400.literadio3 - -[env:BETAFPV_2400_TX_LITERADIO3_via_UART] -extends = env:BETAFPV_2400_TX_LITERADIO3_via_ETX - -[env:BETAFPV_2400_TX_LITERADIO3_via_WIFI] -extends = env:BETAFPV_2400_TX_LITERADIO3_via_ETX - - -# ******************************** -# Receiver targets -# ******************************** - -[env:BETAFPV_Nano_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = betafpv.rx_2400.nano - -[env:BETAFPV_Nano_2400_RX_via_BetaflightPassthrough] -extends = env:BETAFPV_Nano_2400_RX_via_UART - -[env:BETAFPV_Nano_2400_RX_via_WIFI] -extends = env:BETAFPV_Nano_2400_RX_via_UART - -[env:BETAFPV_SuperD_2400_RX_via_UART] -extends = env:Unified_ESP32_2400_RX_via_UART -board_config = betafpv.rx_2400.superd - -[env:BETAFPV_SuperD_2400_RX_via_BetaflightPassthrough] -extends = env:BETAFPV_SuperD_2400_RX_via_UART - -[env:BETAFPV_SuperD_2400_RX_via_WIFI] -extends = env:BETAFPV_SuperD_2400_RX_via_UART diff --git a/src/targets/betafpv_900.ini b/src/targets/betafpv_900.ini deleted file mode 100644 index 480ec5b486..0000000000 --- a/src/targets/betafpv_900.ini +++ /dev/null @@ -1,31 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** - -[env:BETAFPV_900_TX_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = betafpv.tx_900.nano900 - -[env:BETAFPV_900_TX_via_WIFI] -extends = env:BETAFPV_900_TX_via_UART - -[env:BETAFPV_900_TX_MICRO_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = betafpv.tx_900.micro900 - -[env:BETAFPV_900_TX_MICRO_via_WIFI] -extends = env:BETAFPV_900_TX_MICRO_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:BETAFPV_900_RX_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = betafpv.rx_900.plain - -[env:BETAFPV_900_RX_via_BetaflightPassthrough] -extends = env:BETAFPV_900_RX_via_UART - -[env:BETAFPV_900_RX_via_WIFI] -extends = env:BETAFPV_900_RX_via_UART diff --git a/src/targets/diy_2400.ini b/src/targets/diy_2400.ini index b94a3844b1..55ad7a8eaf 100644 --- a/src/targets/diy_2400.ini +++ b/src/targets/diy_2400.ini @@ -3,93 +3,10 @@ # Transmitter targets # ******************************** -[env:DIY_2400_TX_ESP32_SX1280_Mini_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = diy.tx_2400.mini - -[env:DIY_2400_TX_ESP32_SX1280_Mini_via_WIFI] -extends = env:DIY_2400_TX_ESP32_SX1280_Mini_via_UART - -[env:DIY_2400_TX_ESP32_SX1280_E28_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = diy.tx_2400.e28 - -[env:DIY_2400_TX_ESP32_SX1280_E28_via_WIFI] -extends = env:DIY_2400_TX_ESP32_SX1280_E28_via_UART - -[env:DIY_2400_TX_ESP32_SX1280_LORA1280F27_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = diy.tx_2400.f27 - -[env:DIY_2400_TX_ESP32_SX1280_LORA1280F27_via_WIFI] -extends = env:DIY_2400_TX_ESP32_SX1280_LORA1280F27_via_UART - -[env:DIY_2400_TX_DUPLETX_ESP_via_UART] -extends = env:Unified_ESP8285_2400_TX_via_UART -board_config = generic.tx_2400.dupletxesp - -[env:DIY_2400_TX_DUPLETX_ESP_via_WIFI] -extends = env:DIY_2400_TX_DUPLETX_ESP_via_UART - -[env:DIY_2400_TX_DUPLETX_via_ETX] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = generic.tx_2400.dupletx - -[env:DIY_2400_TX_DUPLETX_via_UART] -extends = env:DIY_2400_TX_DUPLETX_via_ETX - -[env:DIY_2400_TX_DUPLETX_via_WIFI] -extends = env:DIY_2400_TX_DUPLETX_via_ETX - -[env:DIY_2400_TX_GEMINI_via_ETX] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = generic.tx_2400.gemini - -[env:DIY_2400_TX_GEMINI_via_UART] -extends = env:DIY_2400_TX_GEMINI_via_ETX - -[env:DIY_2400_TX_GEMINI_via_WIFI] -extends = env:DIY_2400_TX_GEMINI_via_ETX - - # ******************************** # Receiver targets # ******************************** -[env:DIY_2400_RX_ESP8285_SX1280_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = generic.rx_2400.plain - -[env:DIY_2400_RX_ESP8285_SX1280_via_BetaflightPassthrough] -extends = env:DIY_2400_RX_ESP8285_SX1280_via_UART - -[env:DIY_2400_RX_ESP8285_SX1280_via_WIFI] -extends = env:DIY_2400_RX_ESP8285_SX1280_via_UART - -[env:DIY_2400_PA_RGB_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = generic.rx_2400.pa-rgb - -[env:DIY_2400_PA_RGB_RX_via_BetaflightPassthrough] -extends = env:DIY_2400_PA_RGB_RX_via_UART - -[env:DIY_2400_PA_RGB_RX_via_WIFI] -extends = env:DIY_2400_PA_RGB_RX_via_UART - -[env:DIY_2400_RX_PWMP_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = generic.rx_2400.pwm5 - -[env:DIY_2400_RX_PWMP_via_WIFI] -extends = env:DIY_2400_RX_PWMP_via_UART - -[env:DIY_2400_RX_PWMPEX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = generic.rx_2400.pwm6 - -[env:DIY_2400_RX_PWMPEX_via_WIFI] -extends = env:DIY_2400_RX_PWMPEX_via_UART - [env:DIY_2400_RX_STM32_CCG_Nano_v0_5_via_STLINK] extends = env_common_stm32, radio_2400 board = l432kb @@ -117,10 +34,3 @@ upload_flags = [env:DIY_2400_RX_STM32_CCG_Nano_v0_5_via_BetaflightPassthrough] extends = env:DIY_2400_RX_STM32_CCG_Nano_v0_5_via_STLINK - -[env:DIY_2400_RX_PWM_VARIO_via_UART] -extends = env:Unified_ESP32_2400_RX_via_UART -board_config = generic.rx_2400.pwm-vario - -[env:DIY_2400_RX_PWM_VARIO_via_WIFI] -extends = env:DIY_2400_RX_PWM_VARIO_via_UART diff --git a/src/targets/diy_900.ini b/src/targets/diy_900.ini index b1b3976eca..56541717cc 100644 --- a/src/targets/diy_900.ini +++ b/src/targets/diy_900.ini @@ -3,34 +3,6 @@ # Transmitter targets # ******************************** -[env:DIY_900_TX_TTGO_V1_SX127x_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = diy.tx_900.ttgov1 - -[env:DIY_900_TX_TTGO_V1_SX127x_via_WIFI] -extends = env:DIY_900_TX_TTGO_V1_SX127x_via_UART - -[env:DIY_900_TX_TTGO_V2_SX127x_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = diy.tx_900.ttgov2 - -[env:DIY_900_TX_TTGO_V2_SX127x_via_WIFI] -extends = env:DIY_900_TX_TTGO_V2_SX127x_via_UART - -[env:DIY_900_TX_ESP32_SX127x_E19_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = diy.tx_900.e19 - -[env:DIY_900_TX_ESP32_SX127x_E19_via_WIFI] -extends = env:DIY_900_TX_ESP32_SX127x_E19_via_UART - -[env:DIY_900_TX_ESP32_SX127x_RFM95_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = diy.tx_900.rfm95 - -[env:DIY_900_TX_ESP32_SX127x_RFM95_via_WIFI] -extends = env:DIY_900_TX_ESP32_SX127x_RFM95_via_UART - [env:DIY_900_TX_STM32_SX1272_via_STLINK] extends = env_common_stm32, radio_900 build_flags = @@ -51,53 +23,6 @@ upload_flags = # Receiver targets # ******************************** -[env:DIY_900_RX_TTGO_V1_SX127x_via_UART] -extends = env:Unified_ESP32_900_RX_via_UART -board_config = diy.rx_900.ttgov1 - -[env:DIY_900_RX_TTGO_V1_SX127x_via_BetaflightPassthrough] -extends = env:DIY_900_RX_TTGO_V1_SX127x_via_UART - -[env:DIY_900_RX_TTGO_V1_SX127x_via_WIFI] -extends = env:DIY_900_RX_TTGO_V1_SX127x_via_UART - -[env:DIY_900_RX_TTGO_V2_SX127x_via_UART] -extends = env:Unified_ESP32_900_RX_via_UART -board_config = diy.rx_900.ttgov2 - -[env:DIY_900_RX_TTGO_V2_SX127x_via_BetaflightPassthrough] -extends = env:DIY_900_RX_TTGO_V2_SX127x_via_UART - -[env:DIY_900_RX_TTGO_V2_SX127x_via_WIFI] -extends = env:DIY_900_RX_TTGO_V2_SX127x_via_UART - -[env:DIY_900_RX_ESP8285_SX127x_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = generic.rx_900.plain - -[env:DIY_900_RX_ESP8285_SX127x_via_BetaflightPassthrough] -extends = env:DIY_900_RX_ESP8285_SX127x_via_UART - -[env:DIY_900_RX_ESP8285_SX127x_via_WIFI] -extends = env:DIY_900_RX_ESP8285_SX127x_via_UART - -[env:DIY_900_RX_HUZZAH_RFM95W_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = diy.rx_900.huzzah - -[env:DIY_900_RX_HUZZAH_RFM95W_via_BetaflightPassthrough] -extends = env:DIY_900_RX_HUZZAH_RFM95W_via_UART - -[env:DIY_900_RX_HUZZAH_RFM95W_via_WIFI] -extends = env:DIY_900_RX_HUZZAH_RFM95W_via_UART - -[env:DIY_900_RX_PWMP_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = generic.rx_900.pwmp - -[env:DIY_900_RX_PWMP_via_WIFI] -extends = env:DIY_900_RX_PWMP_via_UART - [env:DIY_900_RX_BluePill_via_STLINK] extends = env_common_stm32, radio_900 build_flags = diff --git a/src/targets/diy_ble_joystick.ini b/src/targets/diy_ble_joystick.ini deleted file mode 100644 index cfc4fdbdf5..0000000000 --- a/src/targets/diy_ble_joystick.ini +++ /dev/null @@ -1,8 +0,0 @@ - -# ******************************** -# DIY BLE Joystick target -# ******************************** - -[env:DIY_BLE_JOYSTICK_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = diy.tx_2400.ble diff --git a/src/targets/emax_2400.ini b/src/targets/emax_2400.ini deleted file mode 100644 index a5df44a35d..0000000000 --- a/src/targets/emax_2400.ini +++ /dev/null @@ -1,17 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** - -[env:EMAX_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = emax.tx_2400.plain - -[env:EMAX_2400_TX_via_WIFI] -extends = env:EMAX_2400_TX_via_UART - -[env:EMAX_NANO_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = emax.tx_2400.nano - -[env:EMAX_NANO_2400_TX_via_WIFI] -extends = env:EMAX_2400_TX_via_UART diff --git a/src/targets/emax_900.ini b/src/targets/emax_900.ini deleted file mode 100644 index 2221e1ae08..0000000000 --- a/src/targets/emax_900.ini +++ /dev/null @@ -1,17 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** - -[env:EMAX_900_TX_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = emax.tx_900.plain - -[env:EMAX_900_TX_via_WIFI] -extends = env:EMAX_900_TX_via_UART - -[env:EMAX_NANO_900_TX_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = emax.tx_900.nano - -[env:EMAX_NANO_900_TX_via_WIFI] -extends = env:EMAX_NANO_900_TX_via_UART diff --git a/src/targets/foxeer_2400.ini b/src/targets/foxeer_2400.ini deleted file mode 100644 index 4ad2fda206..0000000000 --- a/src/targets/foxeer_2400.ini +++ /dev/null @@ -1,18 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -# ******************************** -# Receiver targets -# ******************************** - -[env:Foxeer_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = foxeer.rx_2400.pa-rgb - -[env:Foxeer_2400_RX_via_BetaflightPassthrough] -extends = env:Foxeer_2400_RX_via_UART - -[env:Foxeer_2400_RX_via_WIFI] -extends = env:Foxeer_2400_RX_via_UART diff --git a/src/targets/happymodel_2400.ini b/src/targets/happymodel_2400.ini index c72c3c8c34..c28ed0c9dd 100644 --- a/src/targets/happymodel_2400.ini +++ b/src/targets/happymodel_2400.ini @@ -3,46 +3,12 @@ # Transmitter targets # ******************************** -[env:HappyModel_ES24TX_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = happymodel.tx_2400.es24 - -[env:HappyModel_ES24TX_2400_TX_via_WIFI] -extends = env:HappyModel_ES24TX_2400_TX_via_UART - -[env:HappyModel_ES24TX_Pro_Series_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = happymodel.tx_2400.es24pro - -[env:HappyModel_ES24TX_Pro_Series_2400_TX_via_WIFI] -extends = env:HappyModel_ES24TX_Pro_Series_2400_TX_via_UART - # ******************************** # Receiver targets # ******************************** -[env:HappyModel_EP_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = happymodel.rx_2400.ep1 - -[env:HappyModel_EP_2400_RX_via_BetaflightPassthrough] -extends = env:HappyModel_EP_2400_RX_via_UART - -[env:HappyModel_EP_2400_RX_via_WIFI] -extends = env:HappyModel_EP_2400_RX_via_UART - [env:HappyModel_PP_2400_RX_via_STLINK] extends = env:DIY_2400_RX_STM32_CCG_Nano_v0_5_via_STLINK [env:HappyModel_PP_2400_RX_via_BetaflightPassthrough] extends = env:HappyModel_PP_2400_RX_via_STLINK - -[env:HappyModel_EP_Dual_2400_RX_via_UART] -extends = env:Unified_ESP32_2400_RX_via_UART -board_config = happymodel.rx_2400.ep-dual - -[env:HappyModel_EP_Dual_2400_RX_via_BetaflightPassthrough] -extends = env:HappyModel_EP_Dual_2400_RX_via_UART - -[env:HappyModel_EP_Dual_2400_RX_via_WIFI] -extends = env:HappyModel_EP_Dual_2400_RX_via_UART diff --git a/src/targets/happymodel_900.ini b/src/targets/happymodel_900.ini index 4d2f52f683..e99e6913ca 100644 --- a/src/targets/happymodel_900.ini +++ b/src/targets/happymodel_900.ini @@ -26,14 +26,6 @@ extends = env:HappyModel_TX_ES915TX_via_STLINK [env:HappyModel_TX_ES915TX_via_WIFI] extends = env:HappyModel_TX_ES915TX_via_STLINK -[env:HappyModel_TX_ES900TX_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = happymodel.tx_900.es900 - -[env:HappyModel_TX_ES900TX_via_WIFI] -extends = env:HappyModel_TX_ES900TX_via_UART - - # ******************************** # Receiver targets # ******************************** @@ -55,13 +47,3 @@ upload_flags = [env:HappyModel_RX_ES915RX_via_BetaflightPassthrough] extends = env:HappyModel_RX_ES915RX_via_STLINK - -[env:HappyModel_RX_ES900RX_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = happymodel.rx_900.es900 - -[env:HappyModel_RX_ES900RX_via_WIFI] -extends = env:HappyModel_RX_ES900RX_via_UART - -[env:HappyModel_RX_ES900RX_via_BetaflightPassthrough] -extends = env:HappyModel_RX_ES900RX_via_UART diff --git a/src/targets/iFlight_2400.ini b/src/targets/iFlight_2400.ini deleted file mode 100644 index 1bccdcd6d9..0000000000 --- a/src/targets/iFlight_2400.ini +++ /dev/null @@ -1,25 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -[env:iFlight_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = iflight.tx_2400.plain - -[env:iFlight_2400_TX_via_WIFI] -extends = env:iFlight_2400_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:iFlight_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = iflight.rx_2400.plain - -[env:iFlight_2400_RX_via_BetaflightPassthrough] -extends = env:iFlight_2400_RX_via_UART - -[env:iFlight_2400_RX_via_WIFI] -extends = env:iFlight_2400_RX_via_UART diff --git a/src/targets/iFlight_900.ini b/src/targets/iFlight_900.ini deleted file mode 100644 index 80b35b6e97..0000000000 --- a/src/targets/iFlight_900.ini +++ /dev/null @@ -1,24 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** - -[env:iFlight_900_TX_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = iflight.tx_900.plain - -[env:iFlight_900_TX_via_WIFI] -extends = env:iFlight_900_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:iFlight_900_RX_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = iflight.rx_900.plain - -[env:iFlight_900_RX_via_WIFI] -extends = env:iFlight_900_RX_via_UART - -[env:iFlight_900_RX_via_BetaflightPassthrough] -extends = env:iFlight_900_RX_via_UART diff --git a/src/targets/namimnorc_2400.ini b/src/targets/namimnorc_2400.ini index ae0d08798a..4ace79a545 100644 --- a/src/targets/namimnorc_2400.ini +++ b/src/targets/namimnorc_2400.ini @@ -22,14 +22,6 @@ upload_flags = [env:NamimnoRC_FLASH_2400_TX_via_WIFI] extends = env:NamimnoRC_FLASH_2400_TX_via_STLINK -[env:NamimnoRC_FLASH_2400_OLED_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = namimnorc.tx_2400.flash - -[env:NamimnoRC_FLASH_2400_OLED_TX_via_WIFI] -extends = env:NamimnoRC_FLASH_2400_OLED_TX_via_UART - - # ******************************** # Receiver targets # ******************************** @@ -51,23 +43,3 @@ upload_flags = [env:NamimnoRC_FLASH_2400_RX_via_BetaflightPassthrough] extends = env:NamimnoRC_FLASH_2400_RX_via_STLINK - -[env:NamimnoRC_FLASH_2400_ESP_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = namimnorc.rx_2400.flash - -[env:NamimnoRC_FLASH_2400_ESP_RX_via_BetaflightPassthrough] -extends = env:NamimnoRC_FLASH_2400_ESP_RX_via_UART - -[env:NamimnoRC_FLASH_2400_ESP_RX_via_WIFI] -extends = env:NamimnoRC_FLASH_2400_ESP_RX_via_UART - -[env:NamimnoRC_FLASH_2400_ESP_RX_PA_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = namimnorc.rx_2400.flash-pa - -[env:NamimnoRC_FLASH_2400_ESP_RX_PA_via_BetaflightPassthrough] -extends = env:NamimnoRC_FLASH_2400_ESP_RX_PA_via_UART - -[env:NamimnoRC_FLASH_2400_ESP_RX_PA_via_WIFI] -extends = env:NamimnoRC_FLASH_2400_ESP_RX_PA_via_UART diff --git a/src/targets/namimnorc_900.ini b/src/targets/namimnorc_900.ini index 35cb9a3b81..99b7314ab2 100644 --- a/src/targets/namimnorc_900.ini +++ b/src/targets/namimnorc_900.ini @@ -23,14 +23,6 @@ lib_deps = [env:NamimnoRC_VOYAGER_900_TX_via_WIFI] extends = env:NamimnoRC_VOYAGER_900_TX_via_STLINK -[env:NamimnoRC_VOYAGER_900_OLED_TX_via_UART] -extends = env:Unified_ESP32_900_TX_via_UART -board_config = namimnorc.tx_900.voyager - -[env:NamimnoRC_VOYAGER_900_OLED_TX_via_WIFI] -extends = env:NamimnoRC_VOYAGER_900_OLED_TX_via_UART - - # ******************************** # Receiver targets # ******************************** @@ -53,13 +45,3 @@ lib_deps = [env:NamimnoRC_VOYAGER_900_RX_via_BetaflightPassthrough] extends = env:NamimnoRC_VOYAGER_900_RX_via_STLINK - -[env:NamimnoRC_VOYAGER_900_ESP_RX_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = namimnorc.rx_900.voyager - -[env:NamimnoRC_VOYAGER_900_ESP_RX_via_BetaflightPassthrough] -extends = env:NamimnoRC_VOYAGER_900_ESP_RX_via_UART - -[env:NamimnoRC_VOYAGER_900_ESP_RX_via_WIFI] -extends = env:NamimnoRC_VOYAGER_900_ESP_RX_via_UART diff --git a/src/targets/neutronrc_900.ini b/src/targets/neutronrc_900.ini deleted file mode 100644 index bf0101d302..0000000000 --- a/src/targets/neutronrc_900.ini +++ /dev/null @@ -1,19 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - - -# ******************************** -# Receiver targets -# ******************************** - -[env:NeutronRC_900_RX_via_UART] -extends = env:Unified_ESP8285_900_RX_via_UART -board_config = neutronrc.rx_900.plain - -[env:NeutronRC_900_RX_via_BetaflightPassthrough] -extends = env:NeutronRC_900_RX_via_UART - -[env:NeutronRC_900_RX_via_WIFI] -extends = env:DIY_900_RX_ESP8285_SX127x_via_WIFI diff --git a/src/targets/quadkopters_2400.ini b/src/targets/quadkopters_2400.ini deleted file mode 100644 index b540d962dd..0000000000 --- a/src/targets/quadkopters_2400.ini +++ /dev/null @@ -1,25 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -[env:QuadKopters_JR_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = quadkopters.tx_2400.jr - -[env:QuadKopters_JR_2400_TX_via_WIFI] -extends = env:QuadKopters_JR_2400_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:QuadKopters_NANO_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = quadkopters.rx_2400.nano - -[env:QuadKopters_NANO_RX_via_BetaflightPassthrough] -extends = env:QuadKopters_NANO_RX_via_UART - -[env:QuadKopters_NANO_RX_via_WIFI] -extends = env:QuadKopters_NANO_RX_via_UART diff --git a/src/targets/radiomaster_2400.ini b/src/targets/radiomaster_2400.ini deleted file mode 100644 index 51f12680e4..0000000000 --- a/src/targets/radiomaster_2400.ini +++ /dev/null @@ -1,54 +0,0 @@ -# ******************************** -# Transmitter targets -# ******************************** - -[env:RadioMaster_Zorro_2400_TX_via_ETX] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = radiomaster.tx_2400.zorro - -[env:RadioMaster_Zorro_2400_TX_via_UART] -extends = env:RadioMaster_Zorro_2400_TX_via_ETX - -[env:RadioMaster_Zorro_2400_TX_via_WIFI] -extends = env:RadioMaster_Zorro_2400_TX_via_ETX - -[env:RadioMaster_TX16S_2400_TX_via_ETX] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = radiomaster.tx_2400.tx16s - -[env:RadioMaster_TX16S_2400_TX_via_UART] -extends = env:RadioMaster_TX16S_2400_TX_via_ETX - -[env:RadioMaster_TX16S_2400_TX_via_WIFI] -extends = env:RadioMaster_TX16S_2400_TX_via_ETX - -[env:RadioMaster_Ranger_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = radiomaster.tx_2400.ranger - -[env:RadioMaster_Ranger_2400_TX_via_WIFI] -extends = env:RadioMaster_Ranger_2400_TX_via_UART - -[env:RadioMaster_Ranger_Micro_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = radiomaster.tx_2400.ranger-micro - -[env:RadioMaster_Ranger_Micro_2400_TX_via_WIFI] -extends = env:RadioMaster_Ranger_Micro_2400_TX_via_UART - -[env:RadioMaster_Ranger_Nano_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = radiomaster.tx_2400.ranger-nano - -[env:RadioMaster_Ranger_Nano_2400_TX_via_WIFI] -extends = env:RadioMaster_Ranger_Nano_2400_TX_via_UART - -[env:RadioMaster_Boxer_2400_TX_via_ETX] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = radiomaster.tx_2400.boxer - -[env:RadioMaster_Boxer_2400_TX_via_UART] -extends = env:RadioMaster_Boxer_2400_TX_via_ETX - -[env:RadioMaster_Boxer_2400_TX_via_WIFI] -extends = env:RadioMaster_Boxer_2400_TX_via_ETX diff --git a/src/targets/vantac_2400.ini b/src/targets/vantac_2400.ini deleted file mode 100644 index 7eb6e0e2be..0000000000 --- a/src/targets/vantac_2400.ini +++ /dev/null @@ -1,25 +0,0 @@ - -# ******************************** -# Transmitter targets -# ******************************** - -[env:Vantac_Lite_2400_TX_via_UART] -extends = env:Unified_ESP32_2400_TX_via_UART -board_config = vantac.tx_2400.lite - -[env:Vantac_Lite_2400_TX_via_WIFI] -extends = env:Vantac_Lite_2400_TX_via_UART - -# ******************************** -# Receiver targets -# ******************************** - -[env:Vantac_2400_RX_via_UART] -extends = env:Unified_ESP8285_2400_RX_via_UART -board_config = vantac.rx_2400.plain - -[env:Vantac_2400_RX_via_BetaflightPassthrough] -extends = env:Vantac_2400_RX_via_UART - -[env:Vantac_2400_RX_via_WIFI] -extends = env:Vantac_2400_RX_via_UART From 419eb35e8a018b159693f21ea96e610def2f4f0f Mon Sep 17 00:00:00 2001 From: Paul Kendall Date: Tue, 21 Nov 2023 20:07:14 +1300 Subject: [PATCH 3/4] Remove extraneous pyproject.toml file (#2481) --- src/python/pyproject.toml | 21 --------------------- src/python/setup.py | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 src/python/pyproject.toml diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml deleted file mode 100644 index 67579b9971..0000000000 --- a/src/python/pyproject.toml +++ /dev/null @@ -1,21 +0,0 @@ -[project] -name = "binary_configurator" -version = "3.3.0" -description = "ExpressLRS Binary Installer" -requires-python = ">=3.6" -authors = [ - { name = "ExpressLRS Team" } -] -dependencies = [ - "pyserial" -] -classifiers = [ - "Programming Language :: Python :: 3", - "Operating System :: OS Independent", -] - -[tool.poetry] -packages = [ - { include = "." }, - { include = "external" }, -] diff --git a/src/python/setup.py b/src/python/setup.py index 40a3ad9d18..1de3cf0cff 100644 --- a/src/python/setup.py +++ b/src/python/setup.py @@ -1,7 +1,7 @@ import setuptools setuptools.setup( name="binary_configurator", - version="3.3.0", + version="3.4.0", author="ExpressLRS Team", author_email="", description="ExpressLRS Binary Installer", From 55edd2e7b27af4cc2da0787658e193805d68240a Mon Sep 17 00:00:00 2001 From: benjinne Date: Tue, 21 Nov 2023 23:13:31 -0500 Subject: [PATCH 4/4] stlink flash fix bootloader path (#2483) * stlink flash fix bootloader path * stlink flash fix bootloader path allow fdir to be empty --- src/python/binary_flash.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/binary_flash.py b/src/python/binary_flash.py index ff90f21453..2c16bd2469 100644 --- a/src/python/binary_flash.py +++ b/src/python/binary_flash.py @@ -62,7 +62,8 @@ def upload_stm32_stlink(args, options: FirmwareOptions): app_start = flash_start + offset if options.bootloader is not None: - stlink.program_flash('bootloader/' + options.bootloader, flash_start, erase=True, verify=True, initialize_comms=True) + bootloader_dir = '' if args.fdir is None else args.fdir + '/' + stlink.program_flash(bootloader_dir + 'bootloader/' + options.bootloader, flash_start, erase=True, verify=True, initialize_comms=True) stlink.program_flash(args.file.name, app_start, erase=True, verify=True, initialize_comms=True)