meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

added new CommonCLI get commands: get role and get public.key

Browse source
This commit is contained in:
recrof 2025-03-29 19:40:35 +01:00
parent 0d5c17f7ed
commit b77701ced0
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/simple_repeater/main.cpp
View file

@ -66,6 +66,8 @@
static UITask ui_task(display); static UITask ui_task(display);
#endif #endif
#define FIRMWARE_ROLE "repeater"
#define PACKET_LOG_FILE "/packet_log" #define PACKET_LOG_FILE "/packet_log"
/* ------------------------------ Code -------------------------------- */ /* ------------------------------ Code -------------------------------- */
@ -512,6 +514,7 @@ public:
const char* getFirmwareVer() override { return FIRMWARE_VERSION; } const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; } const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
const char* getRole() override { return FIRMWARE_ROLE; }
const char* getNodeName() { return _prefs.node_name; } const char* getNodeName() { return _prefs.node_name; }
void savePrefs() override { void savePrefs() override {

3
examples/simple_room_server/main.cpp
View file

@ -74,6 +74,8 @@
static UITask ui_task(display); static UITask ui_task(display);
#endif #endif
#define FIRMWARE_ROLE "room_server"
#define PACKET_LOG_FILE "/packet_log" #define PACKET_LOG_FILE "/packet_log"
/* ------------------------------ Code -------------------------------- */ /* ------------------------------ Code -------------------------------- */
@ -701,6 +703,7 @@ public:
const char* getFirmwareVer() override { return FIRMWARE_VERSION; } const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; } const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
const char* getRole() override { return FIRMWARE_ROLE; }
const char* getNodeName() { return _prefs.node_name; } const char* getNodeName() { return _prefs.node_name; }
void savePrefs() override { void savePrefs() override {

6
src/helpers/CommonCLI.cpp
View file

@ -198,6 +198,12 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
sprintf(reply, "> %d", (uint32_t) _prefs->tx_power_dbm); sprintf(reply, "> %d", (uint32_t) _prefs->tx_power_dbm);
} else if (memcmp(config, "freq", 4) == 0) { } else if (memcmp(config, "freq", 4) == 0) {
sprintf(reply, "> %s", StrHelper::ftoa(_prefs->freq)); sprintf(reply, "> %s", StrHelper::ftoa(_prefs->freq));
} else if (memcmp(config, "public.key", 10) == 0) {
char pub_key_hex[PUB_KEY_SIZE * 2 + 1];
mesh::Utils::toHex(pub_key_hex, _mesh->self_id.pub_key, PUB_KEY_SIZE);
sprintf(reply, "> %s", pub_key_hex);
} else if (memcmp(config, "role", 4) == 0) {
sprintf(reply, "> %s", _callbacks->getRole());
} else { } else {
sprintf(reply, "??: %s", config); sprintf(reply, "??: %s", config);
} }

1
src/helpers/CommonCLI.h
View file

@ -31,6 +31,7 @@ public:
virtual void savePrefs() = 0; virtual void savePrefs() = 0;
virtual const char* getFirmwareVer() = 0; virtual const char* getFirmwareVer() = 0;
virtual const char* getBuildDate() = 0; virtual const char* getBuildDate() = 0;
virtual const char* getRole() = 0;
virtual bool formatFileSystem() = 0; virtual bool formatFileSystem() = 0;
virtual void sendSelfAdvertisement(int delay_millis) = 0; virtual void sendSelfAdvertisement(int delay_millis) = 0;
virtual void updateAdvertTimer() = 0; virtual void updateAdvertTimer() = 0;