Skip to content

Commit 1849bce

Browse files
weebl2000weebl2000
committed
Merge remote-tracking branch 'origin/dev' into dev_plus
2 parents 3c3ee8c + 8c0d5c5 commit 1849bce

59 files changed

Lines changed: 676 additions & 517 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The companion firmware can be connected to via BLE, USB or Wi-Fi depending on th
7272

7373
**Repeater and Room Server Firmware**
7474

75-
The repeater and room server firmwares can be setup via USB in the web config tool.
75+
The repeater and room server firmware can be set up via USB in the web config tool.
7676

7777
- https://config.meshcore.io
7878

@@ -89,7 +89,7 @@ MeshCore is open-source software released under the MIT License. You are free to
8989
## Contributing
9090

9191
Please submit PR's using 'dev' as the base branch!
92-
For minor changes just submit your PR and we'll try to review it, but for anything more 'impactful' please open an Issue first and start a discussion. Is better to sound out what it is you want to achieve first, and try to come to a consensus on what the best approach is, especially when it impacts the structure or architecture of this codebase.
92+
For minor changes just submit your PR and we'll try to review it, but for anything more 'impactful' please open an Issue first and start a discussion. It is better to sound out what it is you want to achieve first, and try to come to a consensus on what the best approach is, especially when it impacts the structure or architecture of this codebase.
9393

9494
Here are some general principles you should try to adhere to:
9595
* Keep it simple. Please, don't think like a high-level lang programmer. Think embedded, and keep code concise, without any unnecessary layers.

‎boards/esp32-s3-zero.json‎

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

‎boards/minewsemi_me25ls01.json‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
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-
],
16-
"usb_product": "me25ls01-BOOT",
17-
"mcu": "nrf52840",
18-
"variant": "minewsemi_me25ls01",
19-
"bsp": {
20-
"name": "adafruit"
21-
},
22-
"softdevice": {
23-
"sd_flags": "-DS140",
24-
"sd_name": "s140",
25-
"sd_version": "7.3.0",
26-
"sd_fwid": "0x0123"
27-
},
28-
"bootloader": {
29-
"settings_addr": "0xFF000"
30-
}
31-
},
32-
"connectivity": ["bluetooth"],
33-
"debug": {
34-
"jlink_device": "nRF52840_xxAA",
35-
"svd_path": "nrf52840.svd",
36-
"openocd_target": "nrf52.cfg"
37-
},
38-
"frameworks": ["arduino"],
39-
"name": "Minewsemi ME25LS01",
40-
"upload": {
41-
"maximum_ram_size": 235520,
42-
"maximum_size": 811008,
43-
"speed": 115200,
44-
"protocol": "nrfutil",
45-
"protocols": [
46-
"jlink",
47-
"nrfjprog",
48-
"nrfutil",
49-
"stlink",
50-
"cmsis-dap",
51-
"blackmagic"
52-
],
53-
"use_1200bps_touch": true,
54-
"require_upload_port": true,
55-
"wait_for_upload_port": true
56-
},
57-
"url": "https://en.minewsemi.com/lora-module/lr1110-nrf52840-me25LS01",
58-
"vendor": "MINEWSEMI"
59-
}
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+
],
16+
"usb_product": "me25ls01-BOOT",
17+
"mcu": "nrf52840",
18+
"variant": "minewsemi_me25ls01",
19+
"bsp": {
20+
"name": "adafruit"
21+
},
22+
"softdevice": {
23+
"sd_flags": "-DS140",
24+
"sd_name": "s140",
25+
"sd_version": "7.3.0",
26+
"sd_fwid": "0x0123"
27+
},
28+
"bootloader": {
29+
"settings_addr": "0xFF000"
30+
}
31+
},
32+
"connectivity": ["bluetooth"],
33+
"debug": {
34+
"jlink_device": "nRF52840_xxAA",
35+
"svd_path": "nrf52840.svd",
36+
"openocd_target": "nrf52.cfg"
37+
},
38+
"frameworks": ["arduino"],
39+
"name": "Minewsemi ME25LS01",
40+
"upload": {
41+
"maximum_ram_size": 235520,
42+
"maximum_size": 811008,
43+
"speed": 115200,
44+
"protocol": "nrfutil",
45+
"protocols": [
46+
"jlink",
47+
"nrfjprog",
48+
"nrfutil",
49+
"stlink",
50+
"cmsis-dap",
51+
"blackmagic"
52+
],
53+
"use_1200bps_touch": true,
54+
"require_upload_port": true,
55+
"wait_for_upload_port": true
56+
},
57+
"url": "https://en.minewsemi.com/lora-module/lr1110-nrf52840-me25LS01",
58+
"vendor": "MINEWSEMI"
59+
}

‎docs/cli_commands.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore
406406
- `on`: enable power saving
407407
- `off`: disable power saving
408408

409-
**Default:** `on`
409+
**Default:** `off`
410410

411411
**Note:** When enabled, device enters sleep mode between radio transmissions
412412

0 commit comments

Comments
 (0)