Targets: add new NamimnoRC FLASH ESP diversity receiver (ExpressLRS#1074)

cruwaller · web-flow · commit 17c16601e5d5 · 2021-12-06T12:46:51.000+10:00
diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h b/src/include/target/NamimnoRC_FLASH_2400_RX_ESP8285.h
@@ -0,0 +1,19 @@
+#define DEVICE_NAME "Namimno 2400RX"
+// GPIO pin definitions
+#define GPIO_PIN_NSS            15
+#define GPIO_PIN_BUSY           5
+#define GPIO_PIN_DIO1           4
+#define GPIO_PIN_MOSI           13
+#define GPIO_PIN_MISO           12
+#define GPIO_PIN_SCK            14
+#define GPIO_PIN_RST            2
+#define GPIO_PIN_LED_RED        16
+#define GPIO_PIN_TX_ENABLE      9   // Required by diversity RX
+#if defined(USE_DIVERSITY)
+// Low = Ant1, High = Ant2, pulled high by external resistor
+#define GPIO_PIN_ANTENNA_SELECT 0
+#endif
+
+// Output Power - use default SX1280
+
+#define Regulatory_Domain_ISM_2400 1
diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h b/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h
diff --git a/src/targets/namimnorc_2400.ini b/src/targets/namimnorc_2400.ini
@@ -23,14 +23,14 @@ extends = env:NamimnoRC_FLASH_2400_TX_via_STLINK
 
 [env:NamimnoRC_FLASH_2400_OLED_TX_via_UART]
 extends = env_common_esp32
-build_flags = 
+build_flags =
 	${env_common_esp32.build_flags}
 	${common_env_data.build_flags_tx}
 	-include target/NamimnoRC_FLASH_2400_OLED_TX.h
 	-D VTABLES_IN_FLASH=1
 	-O2
 src_filter = ${env_common_esp32.src_filter} -<rx_*.cpp>
-lib_deps = 
+lib_deps =
 	${env_common_esp32.lib_deps}
 	olikraus/U8g2@^2.28.8
 
@@ -50,7 +50,7 @@ build_flags =
 	${radio_2400.build_flags}
 	-D HSE_VALUE=12000000U
 	-D VECT_TAB_OFFSET=0x8000U
-	-include target/NamimnoRC_FLASH_2400_RX.h
+	-include target/NamimnoRC_FLASH_2400_RX_STM32.h
 board_build.ldscript = variants/R9MM/R9MM_ldscript.ld
 src_filter = ${env_common_stm32.src_filter} -<tx_*.cpp>
 upload_flags =
@@ -61,11 +61,19 @@ upload_flags =
 extends = env:NamimnoRC_FLASH_2400_RX_via_STLINK
 
 [env:NamimnoRC_FLASH_2400_ESP_RX_via_UART]
-extends = env:DIY_2400_RX_ESP8285_SX1280_via_UART
+extends = env_common_esp82xx, radio_2400
+build_flags =
+	${env_common_esp82xx.build_flags}
+	${common_env_data.build_flags_rx}
+	${radio_2400.build_flags}
+	-include target/NamimnoRC_FLASH_2400_RX_ESP8285.h
+src_filter = ${env_common_esp82xx.src_filter} -<tx_*.cpp>
 
 [env:NamimnoRC_FLASH_2400_ESP_RX_via_BetaflightPassthrough]
-extends = env:DIY_2400_RX_ESP8285_SX1280_via_BetaflightPassthrough
+extends = env:NamimnoRC_FLASH_2400_ESP_RX_via_UART
+upload_protocol = custom
+upload_speed = 420000
+upload_command = ${env_common_esp82xx.bf_upload_command}
 
 [env:NamimnoRC_FLASH_2400_ESP_RX_via_WIFI]
 extends = env:NamimnoRC_FLASH_2400_ESP_RX_via_UART
-
