Moving files around to match main repo

HGLRC-T · Sep 10, 2023 · 4c475cc · 4c475cc
1 parent fe9e0b0
commit 4c475cc
Show file tree

Hide file tree

Showing 84 changed files with 374 additions and 64 deletions.
diff --git a/targets_validator.py → .github/targets_validator.py b/targets_validator.py → .github/targets_validator.py
@@ -1,15 +1,23 @@
 import os, sys
 import json
 import glob
+import argparse
 
 hadError = False
+warnEnabled = False
 firmwares = set()
 
 def error(msg):
     global hadError
     hadError = True
     print(msg)
 
+def warn(msg):
+    if warnEnabled:
+        global hadError
+        hadError = True
+        print(msg)
+
 def validate_stm32(vendor, type, devname, device):
     for method in device['upload_methods']:
         if method not in ['stlink', 'dfu', 'uart', 'wifi', 'betaflight', 'stock']:
@@ -34,14 +42,19 @@ def validate_esp(vendor, type, devname, device):
     if len(device['lua_name']) > 16:
         error(f'device "{vendor}.{type}.{devname}" must have a "lua_name" of 16 characters or less')
     # validate layout_file
+    if not device['firmware'].startswith('Unified'):
+        error(f'ESP target "{vendor}.{type}.{devname}" must be using a Unified firmware')
     if 'layout_file' not in device:
         error(f'device "{vendor}.{type}.{devname}" must have a "layout_file" child element')
     else:
-        dir = 'hardware/' + ('RX/' if type.startswith('rx') else 'TX/')
+        dir = ('RX/' if type.startswith('rx') else 'TX/')
         if not os.path.isfile(dir + device['layout_file']):
             layout_file = device['layout_file']
             error(f'File specified by layout_file "{layout_file}" in target "{vendor}.{type}.{devname}", does not exist')
     # could validate overlay
+    if 'prior_target_name' not in device:
+        warn(f'device "{vendor}.{type}.{devname}" should have a "prior_target_name" child element')
+
 
 def validate_esp32(vendor, type, devname, device):
     for method in device['upload_methods']:
@@ -62,6 +75,8 @@ def validate_devices(vendor, type, devname, device):
         error(f'device "{vendor}.{type}.{devname}" must have a "product_name" child element')
     if 'upload_methods' not in device:
         error(f'device "{vendor}.{type}.{devname}" must have a "upload_methods" child element')
+    if 'min_version' not in device:
+        error(f'device "{vendor}.{type}.{devname}" must have a "min_version" child element')
 
     if 'firmware' not in device:
         error(f'device "{vendor}.{type}.{devname}" must have a "firmware" child element')
@@ -105,21 +120,15 @@ def validate_vendor(name, types):
                 validate_devices(name, type, device, types[type][device])
 
 if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Configure Binary Firmware")
+    parser.add_argument("--warn", "-w", action='store_true', default=False, help="Print warnings")
+    args = parser.parse_args()
+    warnEnabled = args.warn
+
     targets = {}
-    with open('hardware/targets.json') as f:
+    with open('targets.json') as f:
         targets = json.load(f)
 
-        for inifile in glob.iglob('targets/*.ini'):
-            with open(inifile) as ini:
-                for line in ini:
-                    if line.startswith('[env:'):
-                        try:
-                            firmware_file = line[5:line.index('_via_')]
-                            firmwares.add(firmware_file)
-                        except ValueError:
-                            print(line)
-                            None
-
         for vendor in targets:
             validate_vendor(vendor, targets[vendor])
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -15,11 +15,11 @@ jobs:
 
     - name: Validate hardware target files
       run: |
-        python targets_validator.py
+        python .github/targets_validator.py
 
     - name: Create hardware target zip
       run: |
-        zip -r -9 hardware.zip ./hardware
+        zip -r -9 hardware.zip *
 
     - name: Upload hardware target zip to ExpressLRS artifactory
       env:

diff --git a/hardware/RX/DIY 900 TTGO V1.json → RX/DIY 900 TTGO V1.json b/hardware/RX/DIY 900 TTGO V1.json → RX/DIY 900 TTGO V1.json
diff --git a/hardware/RX/DIY 900 TTGO V2.json → RX/DIY 900 TTGO V2.json b/hardware/RX/DIY 900 TTGO V2.json → RX/DIY 900 TTGO V2.json
diff --git a/hardware/RX/DIY Huzzah RFM95.json → RX/DIY Huzzah RFM95.json b/hardware/RX/DIY Huzzah RFM95.json → RX/DIY Huzzah RFM95.json
diff --git a/hardware/RX/Frank 2400.json → RX/Frank 2400.json b/hardware/RX/Frank 2400.json → RX/Frank 2400.json
diff --git a/hardware/RX/Generic 2400 Diversity PA.json → RX/Generic 2400 Diversity PA.json b/hardware/RX/Generic 2400 Diversity PA.json → RX/Generic 2400 Diversity PA.json
diff --git a/hardware/RX/Generic 2400 PA RGB.json → RX/Generic 2400 PA RGB.json b/hardware/RX/Generic 2400 PA RGB.json → RX/Generic 2400 PA RGB.json
diff --git a/hardware/RX/Generic 2400 PA.json → RX/Generic 2400 PA.json b/hardware/RX/Generic 2400 PA.json → RX/Generic 2400 PA.json
diff --git a/hardware/RX/Generic 2400 PWMP5.json → RX/Generic 2400 PWMP5.json b/hardware/RX/Generic 2400 PWMP5.json → RX/Generic 2400 PWMP5.json
diff --git a/hardware/RX/Generic 2400 PWMP6.json → RX/Generic 2400 PWMP6.json b/hardware/RX/Generic 2400 PWMP6.json → RX/Generic 2400 PWMP6.json
diff --git a/hardware/RX/Generic 2400 PWMP7.json → RX/Generic 2400 PWMP7.json b/hardware/RX/Generic 2400 PWMP7.json → RX/Generic 2400 PWMP7.json
diff --git a/...eneric 2400 True Diversity PA PWM 14.json → ...eneric 2400 True Diversity PA PWM 14.json b/...eneric 2400 True Diversity PA PWM 14.json → ...eneric 2400 True Diversity PA PWM 14.json
diff --git a/...neric 2400 True Diversity PA and VTx.json → ...neric 2400 True Diversity PA and VTx.json b/...neric 2400 True Diversity PA and VTx.json → ...neric 2400 True Diversity PA and VTx.json
@@ -4,16 +4,17 @@
 
     "radio_miso": 33,
     "radio_mosi": 32,
-    "radio_rst": 26,
     "radio_sck": 25,
 
     "radio_busy": 36,
     "radio_dio1": 37,
     "radio_nss": 27,
+    "radio_rst": 26,
 
     "radio_busy_2": 39,
     "radio_dio1_2": 34,
     "radio_nss_2": 13,
+    "radio_rst_2": 21,
 
     "power_rxen": 10,
     "power_txen": 14,

diff --git a/...re/RX/Generic 2400 True Diversity PA.json → RX/Generic 2400 True Diversity PA.json b/...re/RX/Generic 2400 True Diversity PA.json → RX/Generic 2400 True Diversity PA.json
@@ -4,16 +4,17 @@
 
     "radio_miso": 33,
     "radio_mosi": 32,
-    "radio_rst": 26,
     "radio_sck": 25,
 
     "radio_busy": 36,
     "radio_dio1": 37,
     "radio_nss": 27,
+    "radio_rst": 26,
 
     "radio_busy_2": 39,
     "radio_dio1_2": 34,
     "radio_nss_2": 13,
+    "radio_rst_2": 21,
 
     "power_rxen": 10,
     "power_txen": 14,

diff --git a/...X/Generic 2400 True Diversity PWM 16.json → RX/Generic 2400 True Diversity PWM 16.json b/...X/Generic 2400 True Diversity PWM 16.json → RX/Generic 2400 True Diversity PWM 16.json
diff --git a/.../Generic 2400 True Diversity and VTx.json → RX/Generic 2400 True Diversity and VTx.json b/.../Generic 2400 True Diversity and VTx.json → RX/Generic 2400 True Diversity and VTx.json
@@ -4,16 +4,17 @@
 
     "radio_miso": 33,
     "radio_mosi": 32,
-    "radio_rst": 26,
     "radio_sck": 25,
 
     "radio_busy": 36,
     "radio_dio1": 37,
     "radio_nss": 27,
+    "radio_rst": 26,
 
     "radio_busy_2": 39,
     "radio_dio1_2": 34,
     "radio_nss_2": 13,
+    "radio_rst_2": 21,
 
     "power_min": 0,
     "power_high": 0,

diff --git a/...are/RX/Generic 2400 Whoop Rx and VTx.json → RX/Generic 2400 Whoop Rx and VTx.json b/...are/RX/Generic 2400 Whoop Rx and VTx.json → RX/Generic 2400 Whoop Rx and VTx.json
diff --git a/hardware/RX/Generic 2400.json → RX/Generic 2400.json b/hardware/RX/Generic 2400.json → RX/Generic 2400.json
diff --git a/hardware/RX/Generic 900 PWMP.json → RX/Generic 900 PWMP.json b/hardware/RX/Generic 900 PWMP.json → RX/Generic 900 PWMP.json
diff --git a/...are/RX/Generic 900 True Diversity PA.json → RX/Generic 900 True Diversity PA.json b/...are/RX/Generic 900 True Diversity PA.json → RX/Generic 900 True Diversity PA.json
diff --git a/...RX/Generic 900 True Diversity PWM 16.json → RX/Generic 900 True Diversity PWM 16.json b/...RX/Generic 900 True Diversity PWM 16.json → RX/Generic 900 True Diversity PWM 16.json
diff --git a/hardware/RX/Generic 900.json → RX/Generic 900.json b/hardware/RX/Generic 900.json → RX/Generic 900.json
diff --git a/hardware/RX/Namimno FLASH 2400 PA.json → RX/Namimno FLASH 2400 PA.json b/hardware/RX/Namimno FLASH 2400 PA.json → RX/Namimno FLASH 2400 PA.json
diff --git a/hardware/RX/Namimno VOYAGER 900.json → RX/Namimno VOYAGER 900.json b/hardware/RX/Namimno VOYAGER 900.json → RX/Namimno VOYAGER 900.json
diff --git a/hardware/RX/Radiomaster 2400 ER8G.json → RX/Radiomaster 2400 ER8G.json b/hardware/RX/Radiomaster 2400 ER8G.json → RX/Radiomaster 2400 ER8G.json
@@ -29,7 +29,7 @@
     "i2c_scl": 18,
     "vbat": 39,
     "button": 0,
-    "vbat_scale": 1024,
-    "vbat_offset": -62,
+    "vbat_scale": 700,
+    "vbat_offset": -30,
     "vbat_atten": 7
 }
diff --git a/hardware/RX/Vario 2400.json → RX/Vario 2400.json b/hardware/RX/Vario 2400.json → RX/Vario 2400.json
@@ -21,7 +21,7 @@
     "pwm_outputs": [14,1,3,15,2,4],
     "vbat": 39,
     "button": 0,
-    "vbat_scale": 700,
-    "vbat_offset": -30,
+    "vbat_scale": 1024,
+    "vbat_offset": -62,
     "vbat_atten": 7
 }
diff --git a/hardware/RX/iFlight 2400.json → RX/iFlight 2400.json b/hardware/RX/iFlight 2400.json → RX/iFlight 2400.json
diff --git a/hardware/TX/AXIS Thor 2400.json → TX/AXIS Thor 2400.json b/hardware/TX/AXIS Thor 2400.json → TX/AXIS Thor 2400.json
diff --git a/hardware/TX/BETAFPV 2400 LiteRadio 3.json → TX/BETAFPV 2400 LiteRadio 3.json b/hardware/TX/BETAFPV 2400 LiteRadio 3.json → TX/BETAFPV 2400 LiteRadio 3.json
diff --git a/hardware/TX/BETAFPV 2400 Micro 1W.json → TX/BETAFPV 2400 Micro 1W.json b/hardware/TX/BETAFPV 2400 Micro 1W.json → TX/BETAFPV 2400 Micro 1W.json
diff --git a/hardware/TX/BETAFPV 2400 Micro.json → TX/BETAFPV 2400 Micro.json b/hardware/TX/BETAFPV 2400 Micro.json → TX/BETAFPV 2400 Micro.json
diff --git a/hardware/TX/BETAFPV 2400 Nano.json → TX/BETAFPV 2400 Nano.json b/hardware/TX/BETAFPV 2400 Nano.json → TX/BETAFPV 2400 Nano.json
diff --git a/hardware/TX/BETAFPV 900 Micro.json → TX/BETAFPV 900 Micro.json b/hardware/TX/BETAFPV 900 Micro.json → TX/BETAFPV 900 Micro.json
diff --git a/hardware/TX/BETAFPV 900 Nano.json → TX/BETAFPV 900 Nano.json b/hardware/TX/BETAFPV 900 Nano.json → TX/BETAFPV 900 Nano.json
diff --git a/hardware/TX/DIY 2400 BLE Joystick.json → TX/DIY 2400 BLE Joystick.json b/hardware/TX/DIY 2400 BLE Joystick.json → TX/DIY 2400 BLE Joystick.json
diff --git a/hardware/TX/DIY 2400 DupleTX ESP.json → TX/DIY 2400 DupleTX ESP.json b/hardware/TX/DIY 2400 DupleTX ESP.json → TX/DIY 2400 DupleTX ESP.json
diff --git a/hardware/TX/DIY 2400 DupleTX.json → TX/DIY 2400 DupleTX.json b/hardware/TX/DIY 2400 DupleTX.json → TX/DIY 2400 DupleTX.json
diff --git a/hardware/TX/DIY 2400 E28.json → TX/DIY 2400 E28.json b/hardware/TX/DIY 2400 E28.json → TX/DIY 2400 E28.json
diff --git a/hardware/TX/DIY 2400 F27.json → TX/DIY 2400 F27.json b/hardware/TX/DIY 2400 F27.json → TX/DIY 2400 F27.json
diff --git a/hardware/TX/DIY 2400 Mini.json → TX/DIY 2400 Mini.json b/hardware/TX/DIY 2400 Mini.json → TX/DIY 2400 Mini.json
diff --git a/hardware/TX/DIY 900 E19.json → TX/DIY 900 E19.json b/hardware/TX/DIY 900 E19.json → TX/DIY 900 E19.json
diff --git a/hardware/TX/DIY 900 RFM95.json → TX/DIY 900 RFM95.json b/hardware/TX/DIY 900 RFM95.json → TX/DIY 900 RFM95.json
diff --git a/hardware/TX/DIY 900 TTGO V1.json → TX/DIY 900 TTGO V1.json b/hardware/TX/DIY 900 TTGO V1.json → TX/DIY 900 TTGO V1.json
diff --git a/hardware/TX/DIY 900 TTGO V2.json → TX/DIY 900 TTGO V2.json b/hardware/TX/DIY 900 TTGO V2.json → TX/DIY 900 TTGO V2.json
diff --git a/hardware/TX/EMAX 2400 Nano.json → TX/EMAX 2400 Nano.json b/hardware/TX/EMAX 2400 Nano.json → TX/EMAX 2400 Nano.json
diff --git a/hardware/TX/EMAX 2400 OLED.json → TX/EMAX 2400 OLED.json b/hardware/TX/EMAX 2400 OLED.json → TX/EMAX 2400 OLED.json
diff --git a/hardware/TX/EMAX 900 Nano.json → TX/EMAX 900 Nano.json b/hardware/TX/EMAX 900 Nano.json → TX/EMAX 900 Nano.json
diff --git a/hardware/TX/EMAX 900 OLED.json → TX/EMAX 900 OLED.json b/hardware/TX/EMAX 900 OLED.json → TX/EMAX 900 OLED.json
diff --git a/hardware/TX/Generic 2400 Gemini.json → TX/Generic 2400 Gemini.json b/hardware/TX/Generic 2400 Gemini.json → TX/Generic 2400 Gemini.json
@@ -4,16 +4,17 @@
 
     "radio_miso": 33,
     "radio_mosi": 32,
-    "radio_rst": 26,
     "radio_sck": 25,
 
     "radio_busy": 36,
     "radio_dio1": 37,
     "radio_nss": 27,
+    "radio_rst": 26,
 
     "radio_busy_2": 39,
     "radio_dio1_2": 34,
     "radio_nss_2": 13,
+    "radio_rst_2": 21,
 
     "power_rxen": 10,
     "power_txen": 14,

diff --git a/hardware/TX/Generic 900 Gemini.json → TX/Generic 900 Gemini.json b/hardware/TX/Generic 900 Gemini.json → TX/Generic 900 Gemini.json
@@ -33,9 +33,9 @@
     "ledidx_rgb_boot": [0],
 
     "use_backpack": true,
-    "debug_backpack_baud": 420000,
-    "debug_backpack_rx": 3,
-    "debug_backpack_tx": 1,
+    "debug_backpack_baud": 460800,
+    "debug_backpack_rx": 18,
+    "debug_backpack_tx": 5,
     "backpack_boot": 23,
     "backpack_en": 19
 }
diff --git a/hardware/TX/HGLRC Hermes 2400.json → TX/HGLRC Hermes 2400.json b/hardware/TX/HGLRC Hermes 2400.json → TX/HGLRC Hermes 2400.json
diff --git a/hardware/TX/HappyModel ES24 Pro.json → TX/HappyModel ES24 Pro.json b/hardware/TX/HappyModel ES24 Pro.json → TX/HappyModel ES24 Pro.json
diff --git a/hardware/TX/HappyModel ES24.json → TX/HappyModel ES24.json b/hardware/TX/HappyModel ES24.json → TX/HappyModel ES24.json
diff --git a/hardware/TX/HappyModel ES900.json → TX/HappyModel ES900.json b/hardware/TX/HappyModel ES900.json → TX/HappyModel ES900.json
diff --git a/hardware/TX/Jumper AION Nano.json → TX/Jumper AION Nano.json b/hardware/TX/Jumper AION Nano.json → TX/Jumper AION Nano.json
diff --git a/TX/Jumper T-20 2400.json b/TX/Jumper T-20 2400.json
@@ -0,0 +1,22 @@
+{
+    "serial_rx": 3,
+    "serial_tx": 1,
+    "radio_busy": 21,
+    "radio_dio1": 4,
+    "radio_miso": 19,
+    "radio_mosi": 23,
+    "radio_nss": 5,
+    "radio_rst": 14,
+    "radio_sck": 18,
+    "radio_dcdc": true,
+    "power_enable": 25,
+    "power_rxen": 27,
+    "power_txen": 26,
+    "power_lna_gain": 12,
+    "power_min": 1,
+    "power_high": 6,
+    "power_max": 6,
+    "power_default": 2,
+    "power_control": 0,
+    "power_values": [-16,-13,-9,-5,-3,3]
+}
diff --git a/TX/Jumper T-20 900.json b/TX/Jumper T-20 900.json
@@ -0,0 +1,19 @@
+{
+    "serial_rx": 3,
+    "serial_tx": 1,
+    "radio_dio0": 26,
+    "radio_dio1": 25,
+    "radio_miso": 19,
+    "radio_mosi": 23,
+    "radio_nss": 5,
+    "radio_rst": 14,
+    "radio_sck": 18,
+    "power_rxen": 13,
+    "power_txen": 12,
+    "power_min": 4,
+    "power_high": 6,
+    "power_max": 6,
+    "power_default": 4,
+    "power_control": 0,
+    "power_values": [0,3,15]
+}
diff --git a/hardware/TX/Jumper T-Lite.json → TX/Jumper T-Lite.json b/hardware/TX/Jumper T-Lite.json → TX/Jumper T-Lite.json
diff --git a/hardware/TX/Jumper T-Pro.json → TX/Jumper T-Pro.json b/hardware/TX/Jumper T-Pro.json → TX/Jumper T-Pro.json
diff --git a/hardware/TX/Namimno Flash OLED.json → TX/Namimno Flash OLED.json b/hardware/TX/Namimno Flash OLED.json → TX/Namimno Flash OLED.json
diff --git a/hardware/TX/Namimno Voyager OLED.json → TX/Namimno Voyager OLED.json b/hardware/TX/Namimno Voyager OLED.json → TX/Namimno Voyager OLED.json
diff --git a/hardware/TX/QuadKopters JR 2400.json → TX/QuadKopters JR 2400.json b/hardware/TX/QuadKopters JR 2400.json → TX/QuadKopters JR 2400.json
diff --git a/hardware/TX/Radiomaster Boxer.json → TX/Radiomaster Boxer.json b/hardware/TX/Radiomaster Boxer.json → TX/Radiomaster Boxer.json
diff --git a/hardware/TX/Radiomaster Ranger Micro.json → TX/Radiomaster Ranger Micro.json b/hardware/TX/Radiomaster Ranger Micro.json → TX/Radiomaster Ranger Micro.json
diff --git a/hardware/TX/Radiomaster Ranger.json → TX/Radiomaster Ranger.json b/hardware/TX/Radiomaster Ranger.json → TX/Radiomaster Ranger.json
diff --git a/hardware/TX/Radiomaster TX16S 2400.json → TX/Radiomaster TX16S 2400.json b/hardware/TX/Radiomaster TX16S 2400.json → TX/Radiomaster TX16S 2400.json
diff --git a/hardware/TX/Radiomaster Zorro.json → TX/Radiomaster Zorro.json b/hardware/TX/Radiomaster Zorro.json → TX/Radiomaster Zorro.json
diff --git a/hardware/TX/Vantac Lite.json → TX/Vantac Lite.json b/hardware/TX/Vantac Lite.json → TX/Vantac Lite.json
diff --git a/hardware/TX/iFlight 2400 V2.json → TX/iFlight 2400 V2.json b/hardware/TX/iFlight 2400 V2.json → TX/iFlight 2400 V2.json
diff --git a/hardware/TX/iFlight 2400.json → TX/iFlight 2400.json b/hardware/TX/iFlight 2400.json → TX/iFlight 2400.json
diff --git a/hardware/TX/iFlight 900 V2.json → TX/iFlight 900 V2.json b/hardware/TX/iFlight 900 V2.json → TX/iFlight 900 V2.json
diff --git a/hardware/TX/iFlight 900.json → TX/iFlight 900.json b/hardware/TX/iFlight 900.json → TX/iFlight 900.json
diff --git a/logo/README.md b/logo/README.md
@@ -0,0 +1,13 @@
+# Logos for TFT/OLED display
+
+TFT color displays logos must be sized 160x53 in RGB565 raw format, so the file will be 16960 bytes in size.
+```bash
+ffmpeg -vcodec png -i input.png -vcodec rawvideo -f rawvideo -pix_fmt rgb565 logo.bin
+```
+
+Logos for display on the OLED screen must be size 128x64 for normal sized or 128x32 for small screen size.
+OLED logos are in monochrome raw format.
+
+```bash
+convert ~/Downloads/logo.bmp -monochrome -colors 2 -type bilevel -write MONO:logo.bin
+```
diff --git a/logo/axis_tft.bin b/logo/axis_tft.bin
diff --git a/logo/betafpv.bin b/logo/betafpv.bin
diff --git a/logo/elrs32.bin b/logo/elrs32.bin
diff --git a/logo/elrs64.bin b/logo/elrs64.bin
diff --git a/logo/emax.bin b/logo/emax.bin
diff --git a/logo/geprc_tft.bin b/logo/geprc_tft.bin
diff --git a/logo/jumper.bin b/logo/jumper.bin
diff --git a/logo/namimno.bin b/logo/namimno.bin
diff --git a/logo/radiomaster.bin b/logo/radiomaster.bin