Skip to content

Commit 9df34e0

Browse files
authored
Merge branch 'dev' into solar-watchdog
2 parents 9f38835 + b1094c2 commit 9df34e0

254 files changed

Lines changed: 5227 additions & 973 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.

.devcontainer/devcontainer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
},
1111
"runArgs": [
1212
"--privileged",
13-
// arch tty* is owned by uucp (986)
14-
// debian tty* is owned by uucp (20) - no change needed
15-
"--group-add=986",
1613
"--network=host",
17-
"--volume=/dev/bus/usb:/dev/bus/usb:ro"
14+
"--volume=/dev/bus/usb:/dev/bus/usb:ro",
15+
// arch tty* is owned by uucp (986)
16+
// debian tty* is owned by dialout (20)
17+
"--group-add=20",
18+
"--group-add=986"
1819
],
1920
"postCreateCommand": {
2021
"platformio": "pipx install platformio"

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ For developers;
3939
- Clone and open the MeshCore repository in Visual Studio Code.
4040
- See the example applications you can modify and run:
4141
- [Companion Radio](./examples/companion_radio) - For use with an external chat app, over BLE, USB or WiFi.
42+
- [KISS Modem](./examples/kiss_modem) - Serial KISS protocol bridge for host applications. ([protocol docs](./docs/kiss_modem_protocol.md))
4243
- [Simple Repeater](./examples/simple_repeater) - Extends network coverage by relaying messages.
4344
- [Simple Room Server](./examples/simple_room_server) - A simple BBS server for shared Posts.
4445
- [Simple Secure Chat](./examples/simple_secure_chat) - Secure terminal based text communication between devices.
46+
- [Simple Sensor](./examples/simple_sensor) - Remote sensor node with telemetry and alerting.
4547

4648
The Simple Secure Chat example can be interacted with through the Serial Monitor in Visual Studio Code, or with a Serial USB Terminal on Android.
4749

boards/meshtiny.json

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
6+
"core": "nRF5",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
9+
"f_cpu": "64000000L",
10+
"hwids": [
11+
[
12+
"0x239A",
13+
"0x8029"
14+
],
15+
[
16+
"0x239A",
17+
"0x0029"
18+
],
19+
[
20+
"0x239A",
21+
"0x002A"
22+
],
23+
[
24+
"0x239A",
25+
"0x802A"
26+
]
27+
],
28+
"usb_product": "Meshtiny",
29+
"mcu": "nrf52840",
30+
"variant": "meshtiny",
31+
"bsp": {
32+
"name": "adafruit"
33+
},
34+
"softdevice": {
35+
"sd_flags": "-DS140",
36+
"sd_name": "s140",
37+
"sd_version": "6.1.1",
38+
"sd_fwid": "0x00B6"
39+
},
40+
"bootloader": {
41+
"settings_addr": "0xFF000"
42+
}
43+
},
44+
"connectivity": [
45+
"bluetooth"
46+
],
47+
"debug": {
48+
"jlink_device": "nRF52840_xxAA",
49+
"svd_path": "nrf52840.svd",
50+
"openocd_target": "nrf52840-mdk-rs"
51+
},
52+
"frameworks": [
53+
"arduino",
54+
"freertos"
55+
],
56+
"name": "Meshtiny",
57+
"upload": {
58+
"maximum_ram_size": 248832,
59+
"maximum_size": 815104,
60+
"speed": 115200,
61+
"protocol": "nrfutil",
62+
"protocols": [
63+
"jlink",
64+
"nrfjprog",
65+
"nrfutil",
66+
"stlink"
67+
],
68+
"use_1200bps_touch": true,
69+
"require_upload_port": true,
70+
"wait_for_upload_port": true
71+
},
72+
"url": "https://shop.mtoolstec.com/product/meshtiny",
73+
"vendor": "MTools Tec"
74+
}

boards/t_beam_1w.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_opi"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DBOARD_HAS_PSRAM",
10+
"-DLILYGO_TBEAM_1W",
11+
"-DARDUINO_USB_CDC_ON_BOOT=1",
12+
"-DARDUINO_USB_MODE=0",
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": [
21+
[
22+
"0x303A",
23+
"0x1001"
24+
]
25+
],
26+
"mcu": "esp32s3",
27+
"variant": "lilygo_tbeam_1w"
28+
},
29+
"connectivity": [
30+
"wifi",
31+
"bluetooth",
32+
"lora"
33+
],
34+
"debug": {
35+
"openocd_target": "esp32s3.cfg"
36+
},
37+
"frameworks": [
38+
"arduino"
39+
],
40+
"name": "LilyGo TBeam-1W",
41+
"upload": {
42+
"flash_size": "16MB",
43+
"maximum_ram_size": 327680,
44+
"maximum_size": 16777216,
45+
"require_upload_port": true,
46+
"speed": 921600
47+
},
48+
"url": "http://www.lilygo.cn/",
49+
"vendor": "LilyGo"
50+
}

0 commit comments

Comments
 (0)