Merge branch 'master' into lua-float

CapnBry · Sep 22, 2023 · 1e2fb75 · 1e2fb75
2 parents d26316e + 611b147
commit 1e2fb75
Show file tree

Hide file tree

Showing 169 changed files with 1,927 additions and 5,725 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,20 +41,6 @@ jobs:
         platformio pkg update
         PLATFORMIO_BUILD_FLAGS="-DRegulatory_Domain_ISM_2400" pio test -e native
 
-  validation:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Validate target files
-      run: |
-        cd src
-        python python/targets_validator.py
-
   targets:
     runs-on: ubuntu-latest
     outputs:
@@ -139,14 +125,20 @@ jobs:
       continue-on-error: true
 
   firmware:
-    needs: [build, validation, test]
+    needs: [build, test]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Checkout targets repo
+        uses: actions/checkout@v3
+        with:
+          repository: ExpressLRS/targets
+          path: src/hardware
+
       - name: Get firmware artifacts
         uses: actions/download-artifact@v3
         with:

diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ src/src/fhss_freqs.h
 src/.vscode
 src/data/*.ini
 src/data/*.json
+src/hardware
diff --git a/src/hardware/RX/DIY 900 TTGO V1.json b/src/hardware/RX/DIY 900 TTGO V1.json
diff --git a/src/hardware/RX/DIY 900 TTGO V2.json b/src/hardware/RX/DIY 900 TTGO V2.json
diff --git a/src/hardware/RX/DIY Huzzah RFM95.json b/src/hardware/RX/DIY Huzzah RFM95.json
diff --git a/src/hardware/RX/Frank 2400.json b/src/hardware/RX/Frank 2400.json
diff --git a/src/hardware/RX/Generic 2400 Diversity PA.json b/src/hardware/RX/Generic 2400 Diversity PA.json
diff --git a/src/hardware/RX/Generic 2400 PA RGB.json b/src/hardware/RX/Generic 2400 PA RGB.json
diff --git a/src/hardware/RX/Generic 2400 PA.json b/src/hardware/RX/Generic 2400 PA.json
diff --git a/src/hardware/RX/Generic 2400 PWMP5.json b/src/hardware/RX/Generic 2400 PWMP5.json
diff --git a/src/hardware/RX/Generic 2400 PWMP6.json b/src/hardware/RX/Generic 2400 PWMP6.json
diff --git a/src/hardware/RX/Generic 2400 PWMP7.json b/src/hardware/RX/Generic 2400 PWMP7.json
diff --git a/src/hardware/RX/Generic 2400 True Diversity PA PWM 14.json b/src/hardware/RX/Generic 2400 True Diversity PA PWM 14.json
diff --git a/src/hardware/RX/Generic 2400 True Diversity PA and VTx.json b/src/hardware/RX/Generic 2400 True Diversity PA and VTx.json