Renamed others for consistency

deadbytefpv · deadbytefpv · commit 74f02cf2d614 · 2021-12-16T14:05:35.000+08:00
diff --git a/src/include/target/FM30_RX_MINI.h b/src/include/target/FM30_RX_MINI.h
@@ -8,7 +8,7 @@
     // There is some special handling for this target
     #define TARGET_RX_FM30_MINI
     #ifndef DEVICE_NAME
-        #define DEVICE_NAME "FM30 MINI"
+        #define DEVICE_NAME "SIYI FM30 MINI"
     #endif
 #endif
 
diff --git a/src/include/target/Frsky_RX_R9M.h b/src/include/target/Frsky_RX_R9M.h
@@ -21,24 +21,24 @@ Credit to Jacob Walser (jaxxzer) for the pinout!!!
 #if defined(USE_R9MM_R9MINI_SBUS)
     #define GPIO_PIN_RCSIGNAL_RX    PA3
     #define GPIO_PIN_RCSIGNAL_TX    PA2
-    #define DEVICE_NAME "R9MM SBUS"
+    #define DEVICE_NAME "FrSky R9MM SBUS"
 #elif defined(TARGET_R9SLIM_RX)
     #define GPIO_PIN_RCSIGNAL_RX    PA3  // RX1 PIN OF CONNECTOR 1 ON SLIM
     #define GPIO_PIN_RCSIGNAL_TX    PA2  // TX1 PIN OF CONNECTOR 1 ON SLIM
-    #define DEVICE_NAME "R9SLIM RX"
+    #define DEVICE_NAME "FrSky R9SLIM RX"
 #elif defined(TARGET_R9SLIMPLUS_RX)      // R9SLIMPLUS USES DUAL UART CONFIGURATION FOR TX1/RX1
     #define GPIO_PIN_RCSIGNAL_RX    PB11 // RX1 PIN OF CONNECTOR 1 ON SLIMPLUS
     #define GPIO_PIN_RCSIGNAL_TX    PA9  // TX1 PIN OF CONNECTOR 1 ON SLIMPLUS
-    #define DEVICE_NAME "R9SLIM PLUS"
+    #define DEVICE_NAME "FrSky R9SLIM+"
 #elif defined(TARGET_R900MINI_RX)
     #define GPIO_PIN_RCSIGNAL_RX    PA3 // convinient pin for direct chip solder
     #define GPIO_PIN_RCSIGNAL_TX    PA2 // convinient pin for direct chip solder
-    #define DEVICE_NAME "R900 MINI"
+    #define DEVICE_NAME "Jumper R900 MINI"
 #else
     #define GPIO_PIN_RCSIGNAL_RX    PA10
     #define GPIO_PIN_RCSIGNAL_TX    PA9
     #ifndef DEVICE_NAME
-        #define DEVICE_NAME "R9MM"
+        #define DEVICE_NAME "FrSky R9MM"
     #endif
 #endif
 
diff --git a/src/include/target/HGLRC_Hermes_2400_TX.h b/src/include/target/HGLRC_Hermes_2400_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "HGLRC Hermes 24"
+#define DEVICE_NAME "HGLRC Hermes 2G4"
 #endif
 
 // Any device features
diff --git a/src/include/target/MATEK_2400_RX.h b/src/include/target/MATEK_2400_RX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "MATEK 2400RX"
+#define DEVICE_NAME "MATEK R24"
 #endif
 // GPIO pin definitions
 #define GPIO_PIN_NSS                15
diff --git a/src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h b/src/include/target/NamimnoRC_FLASH_2400_OLED_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Nm.Flash OLED"
+#define DEVICE_NAME "NM Flash OLED"
 #endif
 
 // Features
diff --git a/src/include/target/NamimnoRC_FLASH_2400_RX.h b/src/include/target/NamimnoRC_FLASH_2400_RX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Namimno 2400RX"
+#define DEVICE_NAME "NM 2400RX"
 #endif
 // GPIO pin definitions
 #define GPIO_PIN_RST            PB4
diff --git a/src/include/target/NamimnoRC_FLASH_2400_TX.h b/src/include/target/NamimnoRC_FLASH_2400_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Namimno Flash"
+#define DEVICE_NAME "NM Flash"
 #endif
 
 #define USE_TX_BACKPACK
diff --git a/src/include/target/NamimnoRC_VOYAGER_900_ESP_RX.h b/src/include/target/NamimnoRC_VOYAGER_900_ESP_RX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Namimno 900RX"
+#define DEVICE_NAME "NM 900RX"
 #endif
 // GPIO pin definitions
 #define GPIO_PIN_NSS          15
diff --git a/src/include/target/NamimnoRC_VOYAGER_900_OLED_TX.h b/src/include/target/NamimnoRC_VOYAGER_900_OLED_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Nm.Voyager OLED"
+#define DEVICE_NAME "NM Voyager OLED"
 #endif
 
 // Features
diff --git a/src/include/target/NamimnoRC_VOYAGER_900_RX.h b/src/include/target/NamimnoRC_VOYAGER_900_RX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Namimno 900RX"
+#define DEVICE_NAME "NM 900RX"
 #endif
 // GPIO pin definitions
 #define GPIO_PIN_RST            PC14
diff --git a/src/include/target/NamimnoRC_VOYAGER_900_TX.h b/src/include/target/NamimnoRC_VOYAGER_900_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Namimno Voyager"
+#define DEVICE_NAME "NM Voyager"
 #endif
 
 #define USE_TX_BACKPACK
diff --git a/src/include/target/QuadKopters_JR_2400_TX.h b/src/include/target/QuadKopters_JR_2400_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "QuadKopters 24"
+#define DEVICE_NAME "QuadKopters 2G4"
 #endif
 
 // Any device features
diff --git a/src/test/tmp_pio_test_transport.cpp b/src/test/tmp_pio_test_transport.cpp
@@ -0,0 +1,28 @@
+#include <Arduino.h>
+#include <output_export.h>
+
+
+
+#ifdef __GNUC__
+void output_start(unsigned int baudrate __attribute__((unused)))
+#else
+void output_start(unsigned int baudrate)
+#endif
+{
+    Serial.begin(115200);
+}
+
+void output_char(int c)
+{
+    Serial.write(c);
+}
+
+void output_flush(void)
+{
+    Serial.flush();
+}
+
+void output_complete(void)
+{
+   Serial.end();
+}
diff --git a/src/user_defines.txt b/src/user_defines.txt
@@ -22,7 +22,7 @@
 #-DRegulatory_Domain_IN_866
 #-DRegulatory_Domain_AU_433
 #-DRegulatory_Domain_EU_433
-#-DRegulatory_Domain_FCC_915
+-DRegulatory_Domain_FCC_915
 
 ### PERFORMANCE OPTIONS: ###
 
