Skip to content

Commit 3c363fe

Browse files
committed
Merge origin/main into feature/companion-battery-charging-flag
2 parents f339514 + 792f299 commit 3c363fe

74 files changed

Lines changed: 1204 additions & 463 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: PR Build Check
2+
3+
on:
4+
pull_request:
5+
branches: [main, dev]
6+
paths:
7+
- 'src/**'
8+
- 'examples/**'
9+
- 'variants/**'
10+
- 'platformio.ini'
11+
- '.github/workflows/pr-build-check.yml'
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
environment:
20+
# ESP32-S3 (most common platform)
21+
- Heltec_v3_companion_radio_ble
22+
- Heltec_v3_repeater
23+
- Heltec_v3_room_server
24+
# nRF52
25+
- RAK_4631_companion_radio_ble
26+
- RAK_4631_repeater
27+
- RAK_4631_room_server
28+
# RP2040
29+
- PicoW_repeater
30+
# STM32
31+
- wio-e5-mini_repeater
32+
# ESP32-C6
33+
- LilyGo_Tlora_C6_repeater_
34+
35+
steps:
36+
- name: Clone Repo
37+
uses: actions/checkout@v4
38+
39+
- name: Setup Build Environment
40+
uses: ./.github/actions/setup-build-environment
41+
42+
- name: Build ${{ matrix.environment }}
43+
run: pio run -e ${{ matrix.environment }}

boards/t_beams3_supreme.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"name": "LilyGo T-Beam supreme (8MB Flash 8MB PSRAM)",
4242
"upload": {
4343
"flash_size": "8MB",
44-
"maximum_ram_size": 327680,
44+
"maximum_ram_size": 8388608,
4545
"maximum_size": 8388608,
4646
"require_upload_port": true,
4747
"speed": 460800

docs/cli_commands.md

Lines changed: 109 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore
5353
- `time <epoch_seconds>`
5454

5555
**Parameters:**
56-
- `epoc_seconds`: Unix epoc time
56+
- `epoch_seconds`: Unix epoch time
5757

5858
---
5959

@@ -63,6 +63,12 @@ This document provides an overview of CLI commands that can be sent to MeshCore
6363

6464
---
6565

66+
### Send a zero-hop advert
67+
**Usage:**
68+
- `advert.zerohop`
69+
70+
---
71+
6672
### Start an Over-The-Air (OTA) firmware update
6773
**Usage:**
6874
- `start ota`
@@ -136,7 +142,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore
136142

137143
---
138144

139-
### End capture of rx log to node sotrage
145+
### End capture of rx log to node storage
140146
**Usage:** `log stop`
141147

142148
---
@@ -200,7 +206,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore
200206

201207
**Default:** Varies by board
202208

203-
**Notes:** This setting only controls the power level of the LoRa chip. Some nodes have an additional power amplifier stage which increases the total output. Referr to the node's manual for the correct setting to use. **Setting a value too high may violate the laws in your country.**
209+
**Notes:** This setting only controls the power level of the LoRa chip. Some nodes have an additional power amplifier stage which increases the total output. Refer to the node's manual for the correct setting to use. **Setting a value too high may violate the laws in your country.**
204210

205211
---
206212

@@ -230,6 +236,7 @@ This document provides an overview of CLI commands that can be sent to MeshCore
230236
**Default:** `869.525`
231237

232238
**Note:** Requires reboot to apply
239+
**Serial Only:** `set freq <frequency>`
233240

234241
### System
235242

@@ -293,19 +300,18 @@ This document provides an overview of CLI commands that can be sent to MeshCore
293300

294301
---
295302

296-
#### View or change this node's admin password
303+
#### Change this node's admin password
297304
**Usage:**
298-
- `get password`
299-
- `set password <password>`
305+
- `password <new_password>`
300306

301307
**Parameters:**
302-
- `password`: Admin password
308+
- `new_password`: New admin password
303309

304310
**Set by build flag:** `ADMIN_PASSWORD`
305311

306312
**Default:** `password`
307313

308-
**Note:** Echoed back for confirmation
314+
**Note:** Command reply echoes the updated password for confirmation.
309315

310316
**Note:** Any node using this password will be added to the admin ACL list.
311317

@@ -355,13 +361,25 @@ This document provides an overview of CLI commands that can be sent to MeshCore
355361

356362
---
357363

364+
#### View this node's public key
365+
**Usage:** `get public.key`
366+
367+
---
368+
369+
#### View this node's configured role
370+
**Usage:** `get role`
371+
372+
---
373+
358374
#### View or change this node's power saving flag (Repeater Only)
359375
**Usage:**
360-
- `powersaving <state>`
361376
- `powersaving`
377+
- `powersaving on`
378+
- `powersaving off`
362379

363380
**Parameters:**
364-
- `state`: `on`|`off`
381+
- `on`: enable power saving
382+
- `off`: disable power saving
365383

366384
**Default:** `on`
367385

@@ -383,6 +401,46 @@ This document provides an overview of CLI commands that can be sent to MeshCore
383401

384402
---
385403

404+
#### View or change this node's advert path hash size
405+
**Usage:**
406+
- `get path.hash.mode`
407+
- `set path.hash.mode <value>`
408+
409+
**Parameters:**
410+
- `value`: Path hash size (0-2)
411+
- `0`: 1 Byte hash size (256 unique ids)[64 max flood]
412+
- `1`: 2 Byte hash size (65,536 unique ids)[32 max flood]
413+
- `2`: 3 Byte hash size (16,777,216 unique ids)[21 max flood]
414+
- `3`: DO NOT USE (Reserved)
415+
416+
**Default:** `0`
417+
418+
**Note:** the 'path.hash.mode' sets the low-level ID/hash encoding size used when the repeater adverts. This setting has no impact on what packet ID/hash size this repeater forwards, all sizes should be forwarded on firmware >= 1.14. This feature was added in firmware 1.14
419+
420+
**Temporary Note:** adverts with ID/hash sizes of 2 or 3 bytes may have limited flood propogation in your network while this feature is new as v1.13.0 firmware and older will drop packets with multibyte path ID/hashes as only 1-byte hashes are suppored. Consider your install base of firmware >=1.14 has reached a criticality for effective network flooding before implementing higher ID/hash sizes.
421+
422+
---
423+
424+
#### View or change this node's loop detection
425+
**Usage:**
426+
- `get loop.detect`
427+
- `set loop.detect <state>`
428+
429+
**Parameters:**
430+
- `state`:
431+
- `off`: no loop detection is performed
432+
- `minimal`: packets are dropped if repeater's ID/hash appears 4 or more times (1-byte), 2 or more (2-byte), 1 or more (3-byte)
433+
- `moderate`: packets are dropped if repeater's ID/hash appears 2 or more times (1-byte), 1 or more (2-byte), 1 or more (3-byte)
434+
- `strict`: packets are dropped if repeater's ID/hash appears 1 or more times (1-byte), 1 or more (2-byte), 1 or more (3-byte)
435+
436+
**Default:** `off`
437+
438+
**Note:** When it is enabled, repeaters will now reject flood packets which look like they are in a loop. This has been happening recently in some meshes when there is just a single 'bad' repeater firmware out there (prob some forked or custom firmware). If the payload is messed with, then forwarded, the same packet ends up causing a packet storm, repeated up to the max 64 hops. This feature was added in firmware 1.14
439+
440+
**Example:** If preference is `loop.detect minimal`, and a 1-byte path size packet is received, the repeater will see if its own ID/hash is already in the path. If it's already encoded 4 times, it will reject the packet. If the packet uses 2-byte path size, and repeater's own ID/hash is already encoded 2 times, it rejects. If the packet uses 3-byte path size, and the repeater's own ID/hash is already encoded 1 time, it rejects.
441+
442+
---
443+
386444
#### View or change the retransmit delay factor for flood traffic
387445
**Usage:**
388446
- `get txdelay`
@@ -770,7 +828,7 @@ region save
770828
- `gps advert <policy>`
771829

772830
**Parameters:**
773-
- `policy`: `none`|`shared`|`prefs`
831+
- `policy`: `none`|`share`|`prefs`
774832
- `none`: don't include location in adverts
775833
- `share`: share gps location (from SensorManager)
776834
- `prefs`: location stored in node's lat and lon settings
@@ -804,6 +862,11 @@ region save
804862

805863
### Bridge (When bridge support is compiled in)
806864

865+
#### View the compiled bridge type
866+
**Usage:** `get bridge.type`
867+
868+
---
869+
807870
#### View or change the bridge enabled flag
808871
**Usage:**
809872
- `get bridge.enabled`
@@ -841,10 +904,10 @@ region save
841904

842905
**Parameters:**
843906
- `source`:
844-
- `rx`: bridges received packets
845-
- `tx`: bridges transmitted packets
907+
- `logRx`: bridges received packets
908+
- `logTx`: bridges transmitted packets
846909

847-
**Default:** `tx`
910+
**Default:** `logTx`
848911

849912
---
850913

@@ -876,8 +939,39 @@ region save
876939
- `set bridge.secret <secret>`
877940

878941
**Parameters:**
879-
- `secret`: 16-character encryption secret
942+
- `secret`: ESP-NOW bridge secret, up to 15 characters
880943

881944
**Default:** Varies by board
882945

883946
---
947+
948+
#### View the bootloader version (nRF52 only)
949+
**Usage:** `get bootloader.ver`
950+
951+
---
952+
953+
#### View power management support
954+
**Usage:** `get pwrmgt.support`
955+
956+
---
957+
958+
#### View the current power source
959+
**Usage:** `get pwrmgt.source`
960+
961+
**Note:** Returns an error on boards without power management support.
962+
963+
---
964+
965+
#### View the boot reset and shutdown reasons
966+
**Usage:** `get pwrmgt.bootreason`
967+
968+
**Note:** Returns an error on boards without power management support.
969+
970+
---
971+
972+
#### View the boot voltage
973+
**Usage:** `get pwrmgt.bootmv`
974+
975+
**Note:** Returns an error on boards without power management support.
976+
977+
---

0 commit comments

Comments
 (0)