Fix bf passthrough flashing for DIY RX (ExpressLRS#275)

greenbigfrog · web-flow · commit afc7009e8500 · 2021-01-07T01:29:23.000+10:00
* fix typo

* fix esptool part of BF_Passthrough flashing for rx900

* fix bf init passthrough

* Make use of env to set baud rate

* fix upload_cmd for 2400 RX
diff --git a/src/platformio.ini b/src/platformio.ini
@@ -304,8 +304,8 @@ src_filter = ${env:DIY_900_RX_ESP8285_SX127x_via_UART.src_filter}
 upload_speed = 74880
 upload_protocol = custom
 upload_command =
-	python python/runpython.py $PYTHONEXE python/BFinitPassthrough.py 74880
-	python $PROJECT_PACKAGES_DIR/framework-arduinoespressif32/tools/esptool.py --no-stub -b 74880 -c esp8266 --before no_reset --after soft_reset write_flash 0x0000 $SOURCE
+	python $PROJECT_DIR/python/BFinitPassthrough.py $UPLOAD_SPEED
+	python $PROJECT_PACKAGES_DIR/framework-arduinoespressif8266/tools/esptool/esptool.py --no-stub -b $UPLOAD_SPEED -c esp8266 --before no_reset --after soft_reset write_flash 0x0000 $SOURCE
 
 [env:DIY_2400_TX_ESP32_SX1280_Mini_via_UART]
 platform = espressif32@1.12.0
@@ -411,8 +411,8 @@ board_build.f_cpu = ${env:DIY_2400_RX_ESP8285_SX1280_via_UART.board_build.f_cpu}
 src_filter = ${env:DIY_2400_RX_ESP8285_SX1280_via_UART.src_filter}
 upload_protocol = custom
 upload_command =
-	python python/runpython.py $PYTHONEXE python/BFinitPassthrough.py $UPLOAD_SPEED
-	python $PROJECT_PACKAGES_DIR/framework-arduinoespressif32/tools/esptool.py --no-stub -b $UPLOAD_SPEED -c esp8266 --before no_reset --after soft_reset write_flash 0x0000 $SOURCE
+	python $PROJECT_DIR/python/BFinitPassthrough.py $UPLOAD_SPEED
+	python $PROJECT_PACKAGES_DIR/framework-arduinoespressif8266/tools/esptool/esptool.py --no-stub -b $UPLOAD_SPEED -c esp8266 --before no_reset --after soft_reset write_flash 0x0000 $SOURCE
 
 [env:DIY_2400_RX_STM32_CCG_Nano_v0_5]
 platform = ststm32@9.0.0
diff --git a/src/python/build_env_setup.py b/src/python/build_env_setup.py
@@ -9,7 +9,7 @@
 # don't overwrite if custom command defined
 if stm and "$UPLOADER $UPLOADERFLAGS" in env.get('UPLOADCMD', '$UPLOADER $UPLOADERFLAGS'):
     target_name = env['PIOENV'].upper()
-    print("STM ENv: '%s'" % target_name)
+    print("STM ENV: '%s'" % target_name)
     if "_R9M_" in target_name:
         env.AddPostAction("buildprog", [opentx.gen_elrs])
         if "WIFI" in target_name:
