Skip to content

Commit 727fc05

Browse files
ripplebizripplebiz
committed
Merge branch 'dev'
# Conflicts: # docs/payloads.md
2 parents 03b6ef4 + 93b2db6 commit 727fc05

348 files changed

Lines changed: 11257 additions & 1639 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/pr-build-check.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ jobs:
3131
- Heltec_v3_room_server
3232
# nRF52
3333
- RAK_4631_companion_radio_ble
34+
- RAK_4631_companion_radio_ethernet
3435
- RAK_4631_repeater
36+
- RAK_4631_repeater_ethernet
3537
- RAK_4631_room_server
38+
- RAK_4631_room_server_ethernet
3639
# RP2040
3740
- PicoW_repeater
3841
# STM32

‎.github/workflows/run-unit-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: ./.github/actions/setup-build-environment
2121

2222
- name: Run Unit Tests
23-
run: pio test -e native -vv
23+
run: pio test -e native -e native_kiss_modem -vv
2424

2525
- name: Upload Test Results
2626
# Upload test results even if the test step failed.

‎.vscode/extensions.json‎

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

‎boards/heltec-rc32.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_16MB.csv",
6+
"memory_type": "qio_opi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DBOARD_HAS_PSRAM",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"psram_type": "opi",
20+
"hwids": [["0x303A", "0x1001"]],
21+
"mcu": "esp32s3",
22+
"variant": "heltec_rc32"
23+
},
24+
"connectivity": ["wifi", "bluetooth", "lora"],
25+
"debug": {
26+
"default_tool": "esp-builtin",
27+
"onboard_tools": ["esp-builtin"],
28+
"openocd_target": "esp32s3.cfg"
29+
},
30+
"frameworks": ["arduino", "espidf"],
31+
"name": "Heltec RC32 (16 MB FLASH, 8 MB PSRAM)",
32+
"upload": {
33+
"flash_size": "16MB",
34+
"maximum_ram_size": 327680,
35+
"maximum_size": 16777216,
36+
"use_1200bps_touch": true,
37+
"wait_for_upload_port": true,
38+
"require_upload_port": true,
39+
"speed": 921600
40+
},
41+
"url": "https://heltec.org/",
42+
"vendor": "Heltec"
43+
}

‎boards/heltec_tower_v2.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
6+
"core": "nRF5",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DNRF52840_XXAA",
9+
"f_cpu": "64000000L",
10+
"hwids": [
11+
["0x239A","0x4405"],
12+
["0x239A","0x0029"],
13+
["0x239A","0x002A"],
14+
["0x239A","0x0071"]
15+
],
16+
"usb_product": "HT-n5262",
17+
"mcu": "nrf52840",
18+
"variant": "heltec_tower_v2",
19+
"bsp": {
20+
"name": "adafruit"
21+
},
22+
"softdevice": {
23+
"sd_flags": "-DS140",
24+
"sd_name": "s140",
25+
"sd_version": "6.1.1",
26+
"sd_fwid": "0x00B6"
27+
},
28+
"bootloader": {
29+
"settings_addr": "0xFF000"
30+
}
31+
},
32+
"connectivity": [
33+
"bluetooth"
34+
],
35+
"debug": {
36+
"jlink_device": "nRF52840_xxAA",
37+
"svd_path": "nrf52840.svd",
38+
"openocd_target": "nrf52.cfg"
39+
},
40+
"frameworks": [
41+
"arduino"
42+
],
43+
"name": "Heltec Tower V2 Board",
44+
"upload": {
45+
"maximum_ram_size": 235520,
46+
"maximum_size": 815104,
47+
"speed": 115200,
48+
"protocol": "nrfutil",
49+
"protocols": [
50+
"jlink",
51+
"nrfjprog",
52+
"nrfutil",
53+
"stlink"
54+
],
55+
"use_1200bps_touch": true,
56+
"require_upload_port": true,
57+
"wait_for_upload_port": true
58+
},
59+
"url": "https://heltec.org/",
60+
"vendor": "Heltec"
61+
}

‎boards/heltec_v4.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"extra_flags": [
1010
"-DBOARD_HAS_PSRAM",
1111
"-DARDUINO_USB_CDC_ON_BOOT=1",
12-
"-DARDUINO_USB_MODE=0",
12+
"-DARDUINO_USB_MODE=1",
1313
"-DARDUINO_RUNNING_CORE=1",
1414
"-DARDUINO_EVENT_RUNNING_CORE=1"
1515
],
@@ -40,4 +40,4 @@
4040
},
4141
"url": "https://heltec.org/",
4242
"vendor": "heltec"
43-
}
43+
}

‎boards/heltec_v4_r8.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_16MB.csv",
6+
"memory_type": "qio_opi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DBOARD_HAS_PSRAM",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"psram_type": "opi",
20+
"hwids": [["0x303A", "0x1001"]],
21+
"mcu": "esp32s3",
22+
"variant": "heltec_v4_r8"
23+
},
24+
"connectivity": ["wifi", "bluetooth", "lora"],
25+
"debug": {
26+
"default_tool": "esp-builtin",
27+
"onboard_tools": ["esp-builtin"],
28+
"openocd_target": "esp32s3.cfg"
29+
},
30+
"frameworks": ["arduino", "espidf"],
31+
"name": "heltec_wifi_lora_32 v4 r8 (16 MB FLASH, 8 MB PSRAM)",
32+
"upload": {
33+
"flash_size": "16MB",
34+
"maximum_ram_size": 327680,
35+
"maximum_size": 16777216,
36+
"use_1200bps_touch": true,
37+
"wait_for_upload_port": true,
38+
"require_upload_port": true,
39+
"speed": 921600
40+
},
41+
"url": "https://heltec.org/",
42+
"vendor": "heltec"
43+
}

‎boards/meshnology_w12.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_16MB.csv",
6+
"memory_type": "qio_opi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DBOARD_HAS_PSRAM",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"psram_type": "opi",
20+
"hwids": [["0x303A", "0x0002"], ["0x303A", "0x1001"]],
21+
"mcu": "esp32s3",
22+
"variant": "meshnology_w12"
23+
},
24+
"connectivity": ["wifi", "bluetooth", "lora"],
25+
"debug": {
26+
"default_tool": "esp-builtin",
27+
"onboard_tools": ["esp-builtin"],
28+
"openocd_target": "esp32s3.cfg"
29+
},
30+
"frameworks": ["arduino", "espidf"],
31+
"name": "heltec_wifi_lora_32 v5 (16 MB FLASH, 8 MB PSRAM)",
32+
"upload": {
33+
"flash_size": "16MB",
34+
"maximum_ram_size": 327680,
35+
"maximum_size": 16777216,
36+
"use_1200bps_touch": true,
37+
"wait_for_upload_port": true,
38+
"require_upload_port": true,
39+
"speed": 921600
40+
},
41+
"url": "https://heltec.org/",
42+
"vendor": "heltec"
43+
}

‎boards/seeed-mesh-tracker-x1.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "nrf52840_s140_v7.ld"
5+
},
6+
"core": "nRF5",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
9+
"f_cpu": "64000000L",
10+
"hwids": [
11+
["0x239A", "0x8029"],
12+
["0x239A", "0x0029"],
13+
["0x239A", "0x002A"],
14+
["0x239A", "0x802A"],
15+
["0x2886", "0x0057"]
16+
],
17+
"usb_product": "X1-BOOT",
18+
"mcu": "nrf52840",
19+
"variant": "Seeed_Mesh-Tracker-X1",
20+
"bsp": {
21+
"name": "adafruit"
22+
},
23+
"softdevice": {
24+
"sd_flags": "-DS140",
25+
"sd_name": "s140",
26+
"sd_version": "7.3.0",
27+
"sd_fwid": "0x0123"
28+
},
29+
"bootloader": {
30+
"settings_addr": "0xFF000"
31+
}
32+
},
33+
"connectivity": ["bluetooth"],
34+
"debug": {
35+
"jlink_device": "nRF52840_xxAA",
36+
"svd_path": "nrf52840.svd",
37+
"openocd_target": "nrf52.cfg"
38+
},
39+
"frameworks": ["arduino"],
40+
"name": "Seeed SenseCAP MeshTracker X1",
41+
"upload": {
42+
"maximum_ram_size": 248832,
43+
"maximum_size": 815104,
44+
"speed": 115200,
45+
"protocol": "nrfutil",
46+
"protocols": [
47+
"jlink",
48+
"nrfjprog",
49+
"nrfutil",
50+
"stlink",
51+
"cmsis-dap",
52+
"blackmagic"
53+
],
54+
"use_1200bps_touch": true,
55+
"require_upload_port": true,
56+
"wait_for_upload_port": true
57+
},
58+
"url": "https://www.seeedstudio.com/SenseCAP-MeshTracker-X1-for-Meshtastic-p-6793.html",
59+
"vendor": "Seeed Studio"
60+
}

‎boards/thinknode_m7.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_opi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-D BOARD_HAS_PSRAM",
10+
"-D ARDUINO_USB_CDC_ON_BOOT=0",
11+
"-D ARDUINO_USB_MODE=0",
12+
"-D ARDUINO_RUNNING_CORE=1",
13+
"-D ARDUINO_EVENT_RUNNING_CORE=0"
14+
],
15+
"f_cpu": "240000000L",
16+
"f_flash": "80000000L",
17+
"flash_mode": "qio",
18+
"psram_type": "qio_opi",
19+
"hwids": [["0x303A", "0x1001"]],
20+
"mcu": "esp32s3",
21+
"variant": "ELECROW-ThinkNode-M7"
22+
},
23+
"connectivity": ["wifi", "bluetooth", "lora"],
24+
"debug": {
25+
"default_tool": "esp-builtin",
26+
"onboard_tools": ["esp-builtin"],
27+
"openocd_target": "esp32s3.cfg"
28+
},
29+
"frameworks": ["arduino", "espidf"],
30+
"name": "ELECROW ThinkNode M7",
31+
"upload": {
32+
"flash_size": "8MB",
33+
"maximum_ram_size": 524288,
34+
"maximum_size": 8388608,
35+
"use_1200bps_touch": true,
36+
"wait_for_upload_port": true,
37+
"require_upload_port": true,
38+
"speed": 921600
39+
},
40+
"url": "https://www.elecrow.com",
41+
"vendor": "ELECROW"
42+
}

0 commit comments

Comments
 (0)