Merge branch 'master' of github.com:ExpressLRS/ExpressLRS into more-b…

…aros
CapnBry · Dec 4, 2023 · 892505c · 892505c
2 parents 166da48 + 55edd2e
commit 892505c
Show file tree

Hide file tree

Showing 28 changed files with 11 additions and 781 deletions.
diff --git 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);

diff --git 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/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)
 

diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml
diff --git 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",

diff --git a/src/targets/HGLRC_2400.ini b/src/targets/HGLRC_2400.ini
diff --git a/src/targets/HGLRC_900.ini b/src/targets/HGLRC_900.ini
diff --git a/src/targets/Jumper_2400.ini b/src/targets/Jumper_2400.ini
diff --git a/src/targets/MATEK_2400.ini b/src/targets/MATEK_2400.ini
diff --git a/src/targets/axis_2400.ini b/src/targets/axis_2400.ini
diff --git a/src/targets/betafpv_2400.ini b/src/targets/betafpv_2400.ini
diff --git a/src/targets/betafpv_900.ini b/src/targets/betafpv_900.ini