DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Scott Powell
2025-10-02 12:52:48 +10:00
parent 86225cd24a 8d8b9a6141
commit f5f5886327
11 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/companion_radio/MyMesh.h
View File

@@ -8,11 +8,11 @@
#define FIRMWARE_VER_CODE 7 #define FIRMWARE_VER_CODE 7
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "28 Sep 2025" #define FIRMWARE_BUILD_DATE "2 Oct 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.9.0" #define FIRMWARE_VERSION "v1.9.1"
#endif #endif
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM) #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

1
examples/simple_repeater/MyMesh.cpp
View File

@@ -405,6 +405,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
uint32_t timestamp; uint32_t timestamp;
memcpy(&timestamp, data, 4); memcpy(&timestamp, data, 4);
data[len] = 0; // ensure null terminator
uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]); uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);
if (reply_len == 0) return; // invalid request if (reply_len == 0) return; // invalid request

4
examples/simple_repeater/MyMesh.h
View File

@@ -65,11 +65,11 @@ struct NeighbourInfo {
}; };
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "28 Sep 2025" #define FIRMWARE_BUILD_DATE "2 Oct 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.9.0" #define FIRMWARE_VERSION "v1.9.1"
#endif #endif
#define FIRMWARE_ROLE "repeater" #define FIRMWARE_ROLE "repeater"

4
examples/simple_room_server/MyMesh.h
View File

@@ -25,11 +25,11 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "28 Sep 2025" #define FIRMWARE_BUILD_DATE "2 Oct 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.9.0" #define FIRMWARE_VERSION "v1.9.1"
#endif #endif
#ifndef LORA_FREQ #ifndef LORA_FREQ

4
examples/simple_sensor/SensorMesh.h
View File

@@ -32,11 +32,11 @@
#define PERM_RECV_ALERTS_HI (1 << 7) // high priority alerts #define PERM_RECV_ALERTS_HI (1 << 7) // high priority alerts
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "28 Sep 2025" #define FIRMWARE_BUILD_DATE "2 Oct 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.9.0" #define FIRMWARE_VERSION "v1.9.1"
#endif #endif
#define FIRMWARE_ROLE "sensor" #define FIRMWARE_ROLE "sensor"

2
src/helpers/CommonCLI.cpp
View File

@@ -399,6 +399,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
sprintf(reply, "File system erase: %s", s ? "OK" : "Err"); sprintf(reply, "File system erase: %s", s ? "OK" : "Err");
} else if (memcmp(command, "ver", 3) == 0) { } else if (memcmp(command, "ver", 3) == 0) {
sprintf(reply, "%s (Build: %s)", _callbacks->getFirmwareVer(), _callbacks->getBuildDate()); sprintf(reply, "%s (Build: %s)", _callbacks->getFirmwareVer(), _callbacks->getBuildDate());
} else if (memcmp(command, "board", 5) == 0) {
sprintf(reply, "%s", _board->getManufacturerName());
} else if (memcmp(command, "log start", 9) == 0) { } else if (memcmp(command, "log start", 9) == 0) {
_callbacks->setLoggingOn(true); _callbacks->setLoggingOn(true);
strcpy(reply, " logging on"); strcpy(reply, " logging on");

2
variants/heltec_e213/platformio.ini
View File

@@ -86,6 +86,8 @@ build_flags =
-D ADVERT_NAME='"Heltec E213 Repeater"' -D ADVERT_NAME='"Heltec E213 Repeater"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
build_src_filter = ${Heltec_E213_base.build_src_filter} build_src_filter = ${Heltec_E213_base.build_src_filter}
+<helpers/ui/E213Display.cpp> +<helpers/ui/E213Display.cpp>
+<../examples/simple_repeater> +<../examples/simple_repeater>

2
variants/heltec_e290/platformio.ini
View File

@@ -82,6 +82,8 @@ build_flags =
-D ADVERT_NAME='"Heltec E290 Repeater"' -D ADVERT_NAME='"Heltec E290 Repeater"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
build_src_filter = ${Heltec_E290_base.build_src_filter} build_src_filter = ${Heltec_E290_base.build_src_filter}
+<helpers/ui/E290Display.cpp> +<helpers/ui/E290Display.cpp>
+<../examples/simple_repeater> +<../examples/simple_repeater>

2
variants/heltec_t190/platformio.ini
View File

@@ -88,6 +88,8 @@ build_flags =
-D ADVERT_NAME='"Heltec T190 Repeater"' -D ADVERT_NAME='"Heltec T190 Repeater"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
build_src_filter = ${Heltec_T190_base.build_src_filter} build_src_filter = ${Heltec_T190_base.build_src_filter}
+<../examples/simple_repeater> +<../examples/simple_repeater>
lib_deps = lib_deps =

2
variants/heltec_wireless_paper/platformio.ini
View File

@@ -61,6 +61,8 @@ build_flags =
-D ADVERT_NAME='"Heltec WP Repeater"' -D ADVERT_NAME='"Heltec WP Repeater"'
-D ADVERT_LAT=0.0 -D ADVERT_LAT=0.0
-D ADVERT_LON=0.0 -D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter} build_src_filter = ${Heltec_Wireless_Paper_base.build_src_filter}
+<helpers/ui/E213Display.cpp> +<helpers/ui/E213Display.cpp>
+<../examples/simple_repeater> +<../examples/simple_repeater>

8
variants/tiny_relay/platformio.ini
View File

@@ -19,15 +19,21 @@ build_src_filter = ${stm32_base.build_src_filter}
extends = Tiny_Relay extends = Tiny_Relay
build_flags = ${Tiny_Relay.build_flags} build_flags = ${Tiny_Relay.build_flags}
-D ADVERT_NAME='"tiny_relay Repeater"' -D ADVERT_NAME='"tiny_relay Repeater"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
build_src_filter = ${Tiny_Relay.build_src_filter} build_src_filter = ${Tiny_Relay.build_src_filter}
+<../examples/simple_repeater/main.cpp> +<../examples/simple_repeater>
[env:Tiny_Relay_sensor] [env:Tiny_Relay_sensor]
extends = Tiny_Relay extends = Tiny_Relay
build_flags = ${Tiny_Relay.build_flags} build_flags = ${Tiny_Relay.build_flags}
-D ADVERT_NAME='"tiny_relay Sensor"' -D ADVERT_NAME='"tiny_relay Sensor"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
-D ADMIN_PASSWORD='"password"' -D ADMIN_PASSWORD='"password"'
-D MAX_NEIGHBOURS=50
build_src_filter = ${Tiny_Relay.build_src_filter} build_src_filter = ${Tiny_Relay.build_src_filter}
+<../examples/simple_sensor> +<../examples/simple_sensor>