Merge branch '2.0.x-maintenance' into master-merge-commit

pkendall64 · pkendall64 · commit ac269dc8366e · 2021-12-23T16:16:02.000+13:00
# Conflicts:
#	src/lib/SX127xDriver/SX127x.cpp
#	src/lib/SX127xDriver/SX127xRegs.h
diff --git a/src/include/target/BETAFPV_2400_RX.h b/src/include/target/BETAFPV_2400_RX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "BETAFPV 2400RX"
+#define DEVICE_NAME "BETAFPV 2G4RX"
 #endif
 
 #define USE_SX1280_DCDC
diff --git a/src/include/target/BETAFPV_2400_TX.h b/src/include/target/BETAFPV_2400_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME          "BETAFPV 2400TX"
+#define DEVICE_NAME          "BETAFPV 2G4Nano"
 #endif
 
 // There is some special handling for this target
diff --git a/src/include/target/BETAFPV_2400_TX_MICRO.h b/src/include/target/BETAFPV_2400_TX_MICRO.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME              "BETAFPV 2400TX Micro"
+#define DEVICE_NAME              "BETAFPV 2G4Micro"
 #endif
 
 // Any device features
diff --git a/src/include/target/BETAFPV_900_TX.h b/src/include/target/BETAFPV_900_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME          "BETAFPV 900TX"
+#define DEVICE_NAME          "BETAFPV 900Nano"
 #endif
 
 // There is some special handling for this target
diff --git a/src/include/target/BETAFPV_900_TX_MICRO.h b/src/include/target/BETAFPV_900_TX_MICRO.h
@@ -1,11 +1,9 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME              "BETAFPV 900TX Micro"
+#define DEVICE_NAME              "BETAFPV 900Micro"
 #endif
 
-// There is some special handling for this target
-#define TARGET_TX_BETAFPV_900_MICRO_V1
-
 // Any device features
+#define USE_SX1276_RFO_HF
 #define USE_OLED_I2C
 #define OLED_REVERSED
 #define HAS_FIVE_WAY_BUTTON
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/Frsky_TX_R9M_LITE_PRO.h b/src/include/target/Frsky_TX_R9M_LITE_PRO.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "R9M Lite Pro"
+#define DEVICE_NAME "FrSky R9M Lt Pro"
 #endif
 
 #define TARGET_USE_EEPROM           1
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"
 #endif
 
 // Any device features
diff --git a/src/include/target/HappyModel_ES24TX_Pro_Series_2400_TX.h b/src/include/target/HappyModel_ES24TX_Pro_Series_2400_TX.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "ES24TX Pro Ser"
+#define DEVICE_NAME "HM ES24TX Pro"
 #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_STM32.h b/src/include/target/NamimnoRC_FLASH_2400_RX_STM32.h
@@ -1,5 +1,5 @@
 #ifndef DEVICE_NAME
-#define DEVICE_NAME "Namimno 2400RX"
+#define DEVICE_NAME "Namimno 2G4RX"
 #endif
 // GPIO pin definitions
 #define GPIO_PIN_RST            PB4
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/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/lib/SX127xDriver/SX127xRegs.h b/src/lib/SX127xDriver/SX127xRegs.h
@@ -268,4 +268,4 @@ typedef enum
 #define PREAMBLE_DETECTED 0x51
 
 #define SPI_READ 0b00000000
-#define SPI_WRITE 0b10000000
+#define SPI_WRITE 0b10000000
diff --git a/src/lib/Telemetry/telemetry.cpp b/src/lib/Telemetry/telemetry.cpp
@@ -245,6 +245,23 @@ bool Telemetry::AppendTelemetryPackage(uint8_t *package)
         {
             targetIndex = payloadTypesCount - 2;
             targetFound = true;
+
+            // larger msp resonses are sent in two chunks so special handling is needed so both get sent
+            if (header->type == CRSF_FRAMETYPE_MSP_RESP)
+            {
+                // there is already another response stored
+                if (payloadTypes[targetIndex].updated)
+                {
+                    // use other slot
+                    targetIndex = payloadTypesCount - 1;
+                }
+
+                // if both slots are taked do not overwrite other data since the first chunk would be lost
+                if (payloadTypes[targetIndex].updated)
+                {
+                    targetFound = false;
+                }
+            }
         }
         else
         {
diff --git a/src/python/build_flags.py b/src/python/build_flags.py
@@ -56,6 +56,8 @@ def process_flags(path):
 def escapeChars(x):
     parts = re.search("(.*)=\w*\"(.*)\"$", x)
     if parts and parts.group(2):
+        if parts.group(1) == "-DMY_STARTUP_MELODY_ARR": # ignoring escape chars for startup melody
+            return x
         x = parts.group(1) + '="' + parts.group(2).translate(str.maketrans({
             "!": "\\\\\\\\041",
             "\"": "\\\\\\\\042",
diff --git a/src/python/build_html.py b/src/python/build_html.py
@@ -21,7 +21,7 @@ def compress(data):
     Optional argument is the compression level, in range of 0-9.
     """
     buf = io.BytesIO()
-    with gzip.GzipFile(fileobj=buf, mode='wb', compresslevel=gzip._COMPRESS_LEVEL_BEST, mtime=0.0) as f:
+    with gzip.GzipFile(fileobj=buf, mode='wb', compresslevel=9, mtime=0.0) as f:
         f.write(data)
     return buf.getvalue()
 
diff --git a/src/src/options.cpp b/src/src/options.cpp
@@ -5,7 +5,7 @@
 #define STR(macro) QUOTE(macro)
 const unsigned char target_name[] = "\xBE\xEF\xCA\xFE" STR(TARGET_NAME);
 const uint8_t target_name_size = sizeof(target_name);
-const char device_name[] = STR(DEVICE_NAME);
+const char device_name[] = DEVICE_NAME;
 const uint8_t device_name_size = sizeof(device_name);
 const char commit[] {LATEST_COMMIT, 0};
 const char version[] = {LATEST_VERSION, 0};
diff --git a/src/targets/diy_2400.ini b/src/targets/diy_2400.ini
@@ -14,6 +14,9 @@ build_flags =
 	-O2
 src_filter = ${env_common_esp32.src_filter} -<rx_*.cpp>
 
+[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_common_esp32, radio_2400
 build_flags =
@@ -45,6 +48,9 @@ lib_deps =
 	${env_common_esp32.lib_deps}
 	olikraus/U8g2@^2.28.8
 
+[env:DIY_2400_TX_ESP32_SX1280_LORA1280F27_via_WIFI]
+extends = env:DIY_2400_TX_ESP32_SX1280_LORA1280F27_via_UART
+
 [env:DIY_2400_TX_ESP8285_SX1280_via_UART]
 # Status: These TXes work as free-running transmitters, but do not have working halfduplex inverted UART
 # to let them work in handsets so if someone could fix that for CapnBry, he'd love you with mouth
diff --git a/src/targets/diy_900.ini b/src/targets/diy_900.ini
@@ -14,6 +14,9 @@ src_filter = ${env_common_esp32.src_filter} -<rx_*.cpp>
 lib_deps = 	${env_common_esp32.lib_deps}
 		olikraus/U8g2@^2.28.8
 
+[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_common_esp32, radio_900
 build_flags =
@@ -25,6 +28,9 @@ src_filter = ${env_common_esp32.src_filter} -<rx_*.cpp>
 lib_deps = 	${env_common_esp32.lib_deps}
 		olikraus/U8g2@^2.28.8
 
+[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_common_esp32, radio_900
 build_flags =
@@ -34,6 +40,9 @@ build_flags =
 	-include target/DIY_900_TX_ESP32_SX127x_E19.h
 src_filter = ${env_common_esp32.src_filter} -<rx_*.cpp>
 
+[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_common_esp32, radio_900
 build_flags =
@@ -43,6 +52,9 @@ build_flags =
 	-include target/DIY_900_TX_ESP32_SX127x_RFM95.h
 src_filter = ${env_common_esp32.src_filter} -<rx_*.cpp>
 
+[env:DIY_900_TX_ESP32_SX127x_RFM95_via_WIFI]
+extends = env:DIY_900_TX_ESP32_SX127x_RFM95_via_UART
+
 
 # ********************************
 # Receiver targets
