Skip to content

Commit f5f5886

Browse files
author
Scott Powell
committed
Merge branch 'dev'
2 parents 86225cd + 8d8b9a6 commit f5f5886

File tree

11 files changed

+26
-9
lines changed

11 files changed

+26
-9
lines changed

examples/companion_radio/MyMesh.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#define FIRMWARE_VER_CODE 7
99

1010
#ifndef FIRMWARE_BUILD_DATE
11-
#define FIRMWARE_BUILD_DATE "28 Sep 2025"
11+
#define FIRMWARE_BUILD_DATE "2 Oct 2025"
1212
#endif
1313

1414
#ifndef FIRMWARE_VERSION
15-
#define FIRMWARE_VERSION "v1.9.0"
15+
#define FIRMWARE_VERSION "v1.9.1"
1616
#endif
1717

1818
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

examples/simple_repeater/MyMesh.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
405405
uint32_t timestamp;
406406
memcpy(&timestamp, data, 4);
407407

408+
data[len] = 0; // ensure null terminator
408409
uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);
409410

410411
if (reply_len == 0) return; // invalid request

examples/simple_repeater/MyMesh.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ struct NeighbourInfo {
6565
};
6666

6767
#ifndef FIRMWARE_BUILD_DATE
68-
#define FIRMWARE_BUILD_DATE "28 Sep 2025"
68+
#define FIRMWARE_BUILD_DATE "2 Oct 2025"
6969
#endif
7070

7171
#ifndef FIRMWARE_VERSION
72-
#define FIRMWARE_VERSION "v1.9.0"
72+
#define FIRMWARE_VERSION "v1.9.1"
7373
#endif
7474

7575
#define FIRMWARE_ROLE "repeater"

examples/simple_room_server/MyMesh.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
/* ------------------------------ Config -------------------------------- */
2626

2727
#ifndef FIRMWARE_BUILD_DATE
28-
#define FIRMWARE_BUILD_DATE "28 Sep 2025"
28+
#define FIRMWARE_BUILD_DATE "2 Oct 2025"
2929
#endif
3030

3131
#ifndef FIRMWARE_VERSION
32-
#define FIRMWARE_VERSION "v1.9.0"
32+
#define FIRMWARE_VERSION "v1.9.1"
3333
#endif
3434

3535
#ifndef LORA_FREQ

examples/simple_sensor/SensorMesh.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
#define PERM_RECV_ALERTS_HI (1 << 7) // high priority alerts
3333

3434
#ifndef FIRMWARE_BUILD_DATE
35-
#define FIRMWARE_BUILD_DATE "28 Sep 2025"
35+
#define FIRMWARE_BUILD_DATE "2 Oct 2025"
3636
#endif
3737

3838
#ifndef FIRMWARE_VERSION
39-
#define FIRMWARE_VERSION "v1.9.0"
39+
#define FIRMWARE_VERSION "v1.9.1"
4040
#endif
4141

4242
#define FIRMWARE_ROLE "sensor"

src/helpers/CommonCLI.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
399399
sprintf(reply, "File system erase: %s", s ? "OK" : "Err");
400400
} else if (memcmp(command, "ver", 3) == 0) {
401401
sprintf(reply, "%s (Build: %s)", _callbacks->getFirmwareVer(), _callbacks->getBuildDate());
402+
} else if (memcmp(command, "board", 5) == 0) {
403+
sprintf(reply, "%s", _board->getManufacturerName());
402404
} else if (memcmp(command, "log start", 9) == 0) {
403405
_callbacks->setLoggingOn(true);
404406
strcpy(reply, " logging on");

variants/heltec_e213/platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ build_flags =
8686
-D ADVERT_NAME='"Heltec E213 Repeater"'
8787
-D ADVERT_LAT=0.0
8888
-D ADVERT_LON=0.0
89+
-D ADMIN_PASSWORD='"password"'
90+
-D MAX_NEIGHBOURS=50
8991
build_src_filter = ${Heltec_E213_base.build_src_filter}
9092
+<helpers/ui/E213Display.cpp>
9193
+<../examples/simple_repeater>

variants/heltec_e290/platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ build_flags =
8282
-D ADVERT_NAME='"Heltec E290 Repeater"'
8383
-D ADVERT_LAT=0.0
8484
-D ADVERT_LON=0.0
85+
-D ADMIN_PASSWORD='"password"'
86+
-D MAX_NEIGHBOURS=50
8587
build_src_filter = ${Heltec_E290_base.build_src_filter}
8688
+<helpers/ui/E290Display.cpp>
8789
+<../examples/simple_repeater>

variants/heltec_t190/platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ build_flags =
8888
-D ADVERT_NAME='"Heltec T190 Repeater"'
8989
-D ADVERT_LAT=0.0
9090
-D ADVERT_LON=0.0
91+
-D ADMIN_PASSWORD='"password"'
92+
-D MAX_NEIGHBOURS=50
9193
build_src_filter = ${Heltec_T190_base.build_src_filter}
9294
+<../examples/simple_repeater>
9395
lib_deps =

variants/heltec_wireless_paper/platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ build_flags =
6161
-D ADVERT_NAME='"Heltec WP Repeater"'
6262
-D ADVERT_LAT=0.0
6363
-D ADVERT_LON=0.0
64+
-D ADMIN_PASSWORD='"password"'
65+
-D MAX_NEIGHBOURS=50
6466
build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter}
6567
+<helpers/ui/E213Display.cpp>
6668
+<../examples/simple_repeater>

0 commit comments

Comments
 (0)