Merge branch 'master' into head-tracker · ExpressLRS/Backpack@a76d1d6 · GitHub
Skip to content

Commit a76d1d6

Browse files
pkendall64pkendall64
committed
Merge branch 'master' into head-tracker
# Conflicts: # lib/WIFI/devWIFI.cpp # python/build_html.py # src/module_base.cpp # targets/common.ini # targets/debug.ini
2 parents 0097ccf + 74552f5 commit a76d1d6

35 files changed

Lines changed: 1031 additions & 175 deletions

‎.github/workflows/artifacts.yml‎

Lines changed: 1 addition & 1 deletion

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
targets: ${{ steps.set-targets.outputs.targets }}
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111
- id: set-targets
1212
run: echo "targets=[$(grep -r "\[env:" targets | sed 's/.*://' | sed s/.$// | egrep "UART" | tr '\n' ',' | sed 's/,$/"\n/' | sed 's/,/","/'g | sed 's/^/"/')]" >> $GITHUB_OUTPUT
1313

@@ -24,15 +24,15 @@ jobs:
2424
uses: rlespinasse/github-slug-action@v4
2525

2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Set up Python
30-
uses: actions/setup-python@v4
30+
uses: actions/setup-python@v5
3131
with:
3232
python-version: '3.10'
3333

3434
- name: Cache pip
35-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3636
with:
3737
path: ~/.cache/pip
3838
key: ${{ runner.os }}-pip-${{ matrix.target }}
@@ -44,7 +44,7 @@ jobs:
4444
pip install wheel
4545
4646
- name: Cache PlatformIO
47-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4848
with:
4949
path: ~/.platformio
5050
key: ${{ runner.os }}-platformio
@@ -59,9 +59,9 @@ jobs:
5959
cp -r hardware ~/artifacts/firmware
6060
6161
- name: Store Artifacts
62-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
6363
with:
64-
name: firmware
64+
name: temp-${{ matrix.target }}
6565
path: |
6666
~/artifacts/**/*.bin
6767
~/artifacts/**/*.json
@@ -72,20 +72,20 @@ jobs:
7272
runs-on: ubuntu-latest
7373
steps:
7474
- name: Checkout code
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676
with:
7777
fetch-depth: 0
7878

7979
- name: Set up Python
80-
uses: actions/setup-python@v4
80+
uses: actions/setup-python@v5
8181
with:
8282
python-version: '3.10'
8383

8484
- name: Get firmware artifacts
85-
uses: actions/download-artifact@v3
85+
uses: actions/download-artifact@v4
8686
with:
87-
name: firmware
8887
path: dist
88+
merge-multiple: true
8989

9090
- name: Build flasher "binary" with shiv
9191
run: |
@@ -94,7 +94,7 @@ jobs:
9494
shiv -c flash -o ../dist/firmware/flasher.pyz pyserial .
9595
9696
- name: Update firmware artifact
97-
uses: actions/upload-artifact@v3
97+
uses: actions/upload-artifact@v4
9898
with:
9999
name: firmware
100100
path: dist/**/*

‎hardware/targets.json‎

Lines changed: 101 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22
"generic": {
33
"name": "Generic backpack for any TX module",
44
"txbp": {
5-
"esp": {
6-
"product_name": "Backpack for ESP32-based TX module",
5+
"esp8285": {
6+
"product_name": "ESP8285 Backpack for ESP32-based TX module",
77
"firmware": "ESP_TX_Backpack",
88
"upload_methods": ["uart", "etx", "passthru", "wifi"],
99
"platform": "esp8285"
1010
},
11+
"esp32-c3": {
12+
"product_name": "ESP32-C3 Backpack for ESP32-based TX module",
13+
"firmware": "ESP32C3_TX_Backpack",
14+
"upload_methods": ["uart", "etx", "passthru", "wifi"],
15+
"platform": "esp32-c3"
16+
},
1117
"stm": {
12-
"product_name": "Backpack for STM32-based TX module",
18+
"product_name": "ESP8285 Backpack for STM32-based TX module",
1319
"firmware": "STM_TX_Backpack",
1420
"upload_methods": ["uart", "wifi"],
1521
"platform": "esp8285"
@@ -143,6 +149,29 @@
143149
}
144150
}
145151
},
152+
"jumper": {
153+
"name": "Jumper",
154+
"txbp": {
155+
"t12-max": {
156+
"product_name": "Jumper T-12 Max Internal TX Modules",
157+
"firmware": "ESP_TX_Backpack",
158+
"platform": "esp8285",
159+
"upload_methods": ["uart", "wifi"]
160+
},
161+
"t15": {
162+
"product_name": "Jumper T-15 Internal TX Modules",
163+
"firmware": "ESP_TX_Backpack",
164+
"platform": "esp8285",
165+
"upload_methods": ["uart", "wifi"]
166+
},
167+
"t20": {
168+
"product_name": "Jumper T-20 Internal TX Modules with Backpack extension",
169+
"firmware": "ESP_TX_Backpack",
170+
"platform": "esp8285",
171+
"upload_methods": ["uart", "wifi"]
172+
}
173+
}
174+
},
146175
"namimnorc": {
147176
"name": "NamimnoRC",
148177
"txbp": {
@@ -311,7 +340,7 @@
311340
"vrx": {
312341
"esp32": {
313342
"product_name": "Built-in ESP32 Backpack",
314-
"firmware": "HDZero_RX51_ESP32_Backpack",
343+
"firmware": "HDZero_Goggle_ESP32_Backpack",
315344
"upload_methods": ["wifi"],
316345
"platform": "esp32"
317346
}
@@ -439,7 +468,7 @@
439468
}
440469
}
441470
},
442-
"timer": {
471+
"generic-timer": {
443472
"name": "Generic backpack for any Race Timer",
444473
"timer": {
445474
"esp32": {
@@ -459,11 +488,23 @@
459488
"firmware": "TIMER_ESP12F_Backpack",
460489
"upload_methods": ["uart", "wifi"],
461490
"platform": "esp8285"
491+
},
492+
"esp32c3": {
493+
"product_name": "Backpack for Race Timer with ESP32C3",
494+
"firmware": "TIMER_ESP32C3_Backpack",
495+
"upload_methods": ["uart", "wifi"],
496+
"platform": "esp32-c3"
497+
},
498+
"esp32s3": {
499+
"product_name": "Backpack for Race Timer with ESP32S3",
500+
"firmware": "TIMER_ESP32S3_Backpack",
501+
"upload_methods": ["uart", "wifi"],
502+
"platform": "esp32-s3"
462503
}
463504
}
464505
},
465506
"rotorhazard": {
466-
"name": "RotorHazard",
507+
"name": "RotorHazard Timer Backpack",
467508
"timer": {
468509
"esp32": {
469510
"product_name": "ESP32 Module (DIY)",
@@ -479,10 +520,62 @@
479520
},
480521
"NuclearHazard": {
481522
"product_name": "NuclearHazard",
482-
"firmware": "TIMER_ESP32_Backpack",
523+
"firmware": "NuclearHazard_Backpack",
483524
"upload_methods": ["wifi"],
484525
"platform": "esp32"
526+
},
527+
"esp32c3": {
528+
"product_name": "ESP32C3 Module (DIY)",
529+
"firmware": "TIMER_ESP32C3_Backpack",
530+
"upload_methods": ["uart", "wifi"],
531+
"platform": "esp32-c3"
532+
},
533+
"esp32s3": {
534+
"product_name": "ESP32S3 Module (DIY)",
535+
"firmware": "TIMER_ESP32S3_Backpack",
536+
"upload_methods": ["uart", "wifi"],
537+
"platform": "esp32-s3"
538+
}
539+
}
540+
},
541+
"diy-aat": {
542+
"name": "DIY Automatic Antenna Tracker Backpack",
543+
"aat": {
544+
"pwmrx": {
545+
"product_name": "5xPWM Receiver",
546+
"firmware": "AAT_ESP_Backpack",
547+
"upload_methods": ["uart", "wifi"],
548+
"platform": "esp8285"
549+
}
550+
}
551+
},
552+
"mfd-crossbow": {
553+
"name": "MFD Crossbow Antenna Tracker Backpack",
554+
"aat": {
555+
"esp82": {
556+
"product_name": "Generic ESP8285 / ESP8266 Receiver",
557+
"firmware": "MFD_Crossbow_ESP8285_Backpack",
558+
"upload_methods": ["uart", "wifi"],
559+
"platform": "esp8285"
560+
},
561+
"esp32": {
562+
"product_name": "Generic ESP32 Receiver",
563+
"firmware": "MFD_Crossbow_ESP32_Backpack",
564+
"upload_methods": ["uart", "wifi"],
565+
"platform": "esp32"
566+
},
567+
"esp32c3": {
568+
"product_name": "Generic ESP32C3 Receiver",
569+
"firmware": "MFD_Crossbow_ESP32C3_Backpack",
570+
"upload_methods": ["uart", "wifi"],
571+
"platform": "esp32-c3"
572+
},
573+
"esp32s3": {
574+
"product_name": "Generic ESP32S3 Receiver",
575+
"firmware": "MFD_Crossbow_ESP32S3_Backpack",
576+
"upload_methods": ["uart", "wifi"],
577+
"platform": "esp32-s3"
485578
}
486579
}
487580
}
488-
}
581+
}

‎html/log.html‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎html/log.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎html/scan.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function updateConfig(data) {
5959
mui.tabs.activate('pane-justified-2');
6060
_('tx_tab').style.display = 'none';
6161
}
62-
if(config['product_name']) _('product_name').textContent = config['product_name'];
62+
if(config['product_name'] && _('product-name')) _('product_name').textContent = config['product_name'];
6363

6464
updateAatConfig(config);
6565
}

‎lib/BUTTON/devButton.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <Arduino.h>
22
#include "common.h"
33
#include "device.h"
4+
#include "config.h"
45

56
#if defined(PIN_BUTTON)
67
#include "logging.h"
@@ -9,7 +10,7 @@
910
static Button<PIN_BUTTON, false> button;
1011

1112
extern unsigned long rebootTime;
12-
void RebootIntoWifi();
13+
void RebootIntoWifi(wifi_service_t service);
1314

1415
static void shortPress()
1516
{
@@ -19,7 +20,7 @@ static void shortPress()
1920
}
2021
else
2122
{
22-
RebootIntoWifi();
23+
RebootIntoWifi(WIFI_SERVICE_UPDATE);
2324
}
2425
}
2526

‎lib/LED/devLED.cpp‎

Lines changed: 8 additions & 1 deletion

0 commit comments

Comments
 (0)