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

Merge branch 'mymesh-refactor2' of https://github.com/hank/MeshCore into mymesh-refactor2

Browse Source
This commit is contained in:
hank
2025-06-01 20:03:06 -07:00
parent 42efbda40a c13f676e57
commit 91134ecfa5
3 changed files with 426 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
examples/companion_radio/Button.cpp
View File

@@ -1,23 +1,27 @@
#include "Button.h"
Button::Button(uint8_t pin, bool activeState)
: _pin(pin), _activeState(activeState), _isAnalog(false), _analogThreshold(20) {
: _pin(pin), _activeState(activeState), _isAnalog(false), _analogThreshold(20)
{
_currentState = false; // Initialize as not pressed
_lastState = _currentState;
}
Button::Button(uint8_t pin, bool activeState, bool isAnalog, uint16_t analogThreshold)
: _pin(pin), _activeState(activeState), _isAnalog(isAnalog), _analogThreshold(analogThreshold) {
: _pin(pin), _activeState(activeState), _isAnalog(isAnalog), _analogThreshold(analogThreshold)
{
_currentState = false; // Initialize as not pressed
_lastState = _currentState;
}
void Button::begin() {
void Button::begin()
{
_currentState = readButton();
_lastState = _currentState;
}
void Button::update() {
void Button::update()
{
uint32_t now = millis();
// Read button at specified interval
@@ -48,9 +52,11 @@ void Button::update() {
// Timeout reached, process the clicks
if (_clickCount == 1) {
triggerEvent(SHORT_PRESS);
} else if (_clickCount == 2) {
}
else if (_clickCount == 2) {
triggerEvent(DOUBLE_PRESS);
} else if (_clickCount >= 3) {
}
else if (_clickCount >= 3) {
triggerEvent(TRIPLE_PRESS);
}
_clickCount = 0;
@@ -65,15 +71,18 @@ void Button::update() {
}
}
bool Button::readButton() {
bool Button::readButton()
{
if (_isAnalog) {
return (analogRead(_pin) < _analogThreshold);
} else {
}
else {
return (digitalRead(_pin) == _activeState);
}
}
void Button::handleStateChange() {
void Button::handleStateChange()
{
uint32_t now = millis();
if (_currentState) {
@@ -81,7 +90,8 @@ void Button::handleStateChange() {
_pressTime = now;
_state = PRESSED;
triggerEvent(ANY_PRESS);
} else {
}
else {
// Button released
if (_state == PRESSED) {
uint32_t pressDuration = now - _pressTime;
@@ -91,7 +101,8 @@ void Button::handleStateChange() {
_clickCount++;
_releaseTime = now;
_state = WAITING_FOR_MULTI_CLICK;
} else {
}
else {
// Long press already handled in update()
_state = IDLE;
_clickCount = 0;
@@ -100,24 +111,30 @@ void Button::handleStateChange() {
}
}
void Button::triggerEvent(EventType event) {
void Button::triggerEvent(EventType event)
{
_lastEvent = event;
switch (event) {
case ANY_PRESS:
if (_onAnyPress) _onAnyPress();
if (_onAnyPress)
_onAnyPress();
break;
case SHORT_PRESS:
if (_onShortPress) _onShortPress();
if (_onShortPress)
_onShortPress();
break;
case DOUBLE_PRESS:
if (_onDoublePress) _onDoublePress();
if (_onDoublePress)
_onDoublePress();
break;
case TRIPLE_PRESS:
if (_onTriplePress) _onTriplePress();
if (_onTriplePress)
_onTriplePress();
break;
case LONG_PRESS:
if (_onLongPress) _onLongPress();
if (_onLongPress)
_onLongPress();
break;
default:
break;

16
examples/companion_radio/Button.h
View File

@@ -11,14 +11,7 @@
class Button {
public:
enum EventType {
NONE,
SHORT_PRESS,
DOUBLE_PRESS,
TRIPLE_PRESS,
LONG_PRESS,
ANY_PRESS
};
enum EventType { NONE, SHORT_PRESS, DOUBLE_PRESS, TRIPLE_PRESS, LONG_PRESS, ANY_PRESS };
using EventCallback = std::function<void()>;
@@ -40,12 +33,7 @@ public:
EventType getLastEvent() const { return _lastEvent; }
private:
enum State {
IDLE,
PRESSED,
RELEASED,
WAITING_FOR_MULTI_CLICK
};
enum State { IDLE, PRESSED, RELEASED, WAITING_FOR_MULTI_CLICK };
uint8_t _pin;
bool _activeState;

258
examples/simple_secure_chat/main.cpp
View File

@@ -9,11 +9,11 @@
#include <SPIFFS.h>
#endif
#include <helpers/ArduinoHelpers.h>
#include <helpers/StaticPoolPacketManager.h>
#include <helpers/SimpleMeshTables.h>
#include <helpers/IdentityStore.h>
#include <RTClib.h>
#include <helpers/ArduinoHelpers.h>
#include <helpers/IdentityStore.h>
#include <helpers/SimpleMeshTables.h>
#include <helpers/StaticPoolPacketManager.h>
#include <target.h>
/* ---------------------------------- CONFIGURATION ------------------------------------- */
@@ -50,7 +50,8 @@
#define PUBLIC_GROUP_PSK "izOH6cXN6mrJ5e26oRXNcg=="
// Believe it or not, this std C function is busted on some platforms!
static uint32_t _atoi(const char* sp) {
static uint32_t _atoi(const char *sp)
{
uint32_t n = 0;
while (*sp && *sp >= '0' && *sp <= '9') {
n *= 10;
@@ -81,14 +82,19 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
uint8_t tmp_buf[256];
char hex_buf[512];
const char* getTypeName(uint8_t type) const {
if (type == ADV_TYPE_CHAT) return "Chat";
if (type == ADV_TYPE_REPEATER) return "Repeater";
if (type == ADV_TYPE_ROOM) return "Room";
const char *getTypeName(uint8_t type) const
{
if (type == ADV_TYPE_CHAT)
return "Chat";
if (type == ADV_TYPE_REPEATER)
return "Repeater";
if (type == ADV_TYPE_ROOM)
return "Room";
return "??"; // unknown
}
void loadContacts() {
void loadContacts()
{
if (_fs->exists("/contacts")) {
#if defined(RP2040_PLATFORM)
File file = _fs->open("/contacts", "r");
@@ -114,18 +120,21 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
success = success && (file.read(c.out_path, 64) == 64);
c.gps_lat = c.gps_lon = 0; // not yet supported
if (!success) break; // EOF
if (!success)
break; // EOF
c.id = mesh::Identity(pub_key);
c.lastmod = 0;
if (!addContact(c)) full = true;
if (!addContact(c))
full = true;
}
file.close();
}
}
}
void saveContacts() {
void saveContacts()
{
#if defined(NRF52_PLATFORM)
_fs->remove("/contacts");
File file = _fs->open("/contacts", FILE_O_WRITE);
@@ -151,30 +160,36 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
success = success && (file.write((uint8_t *)&c.last_advert_timestamp, 4) == 4);
success = success && (file.write(c.out_path, 64) == 64);
if (!success) break; // write failed
if (!success)
break; // write failed
}
file.close();
}
}
void setClock(uint32_t timestamp) {
void setClock(uint32_t timestamp)
{
uint32_t curr = getRTCClock()->getCurrentTime();
if (timestamp > curr) {
getRTCClock()->setCurrentTime(timestamp);
Serial.println(" (OK - clock set!)");
} else {
}
else {
Serial.println(" (ERR: clock cannot go backwards)");
}
}
void importCard(const char* command) {
while (*command == ' ') command++; // skip leading spaces
void importCard(const char *command)
{
while (*command == ' ')
command++; // skip leading spaces
if (memcmp(command, "meshcore://", 11) == 0) {
command += 11; // skip the prefix
char *ep = strchr(command, 0); // find end of string
while (ep > command) {
ep--;
if (mesh::Utils::isHexChar(*ep)) break; // found tail end of card
if (mesh::Utils::isHexChar(*ep))
break; // found tail end of card
*ep = 0; // remove trailing spaces and other junk
}
int len = strlen(command);
@@ -190,34 +205,36 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
}
protected:
float getAirtimeBudgetFactor() const override {
return _prefs.airtime_factor;
}
float getAirtimeBudgetFactor() const override { return _prefs.airtime_factor; }
int calcRxDelay(float score, uint32_t air_time) const override {
int calcRxDelay(float score, uint32_t air_time) const override
{
return 0; // disable rxdelay
}
bool allowPacketForward(const mesh::Packet* packet) override {
return true;
}
bool allowPacketForward(const mesh::Packet *packet) override { return true; }
void onDiscoveredContact(ContactInfo& contact, bool is_new) override {
void onDiscoveredContact(ContactInfo &contact, bool is_new) override
{
// TODO: if not in favs, prompt to add as fav(?)
Serial.printf("ADVERT from -> %s\n", contact.name);
Serial.printf(" type: %s\n", getTypeName(contact.type));
Serial.print(" public key: "); mesh::Utils::printHex(Serial, contact.id.pub_key, PUB_KEY_SIZE); Serial.println();
Serial.print(" public key: ");
mesh::Utils::printHex(Serial, contact.id.pub_key, PUB_KEY_SIZE);
Serial.println();
saveContacts();
}
void onContactPathUpdated(const ContactInfo& contact) override {
void onContactPathUpdated(const ContactInfo &contact) override
{
Serial.printf("PATH to: %s, path_len=%d\n", contact.name, (int32_t)contact.out_path_len);
saveContacts();
}
bool processAck(const uint8_t *data) override {
bool processAck(const uint8_t *data) override
{
if (memcmp(data, &expected_ack_crc, 4) == 0) { // got an ACK from recipient
Serial.printf(" Got ACK! (round trip: %d millis)\n", _ms->getMillis() - last_msg_sent);
// NOTE: the same ACK can be received multiple times!
@@ -231,7 +248,9 @@ protected:
return false;
}
void onMessageRecv(const ContactInfo& from, mesh::Packet* pkt, uint32_t sender_timestamp, const char *text) override {
void onMessageRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
const char *text) override
{
Serial.printf("(%s) MSG -> from %s\n", pkt->isRouteDirect() ? "DIRECT" : "FLOOD", from.name);
Serial.printf(" %s\n", text);
@@ -240,39 +259,50 @@ protected:
}
}
void onCommandDataRecv(const ContactInfo& from, mesh::Packet* pkt, uint32_t sender_timestamp, const char *text) override {
void onCommandDataRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
const char *text) override
{
}
void onSignedMessageRecv(const ContactInfo& from, mesh::Packet* pkt, uint32_t sender_timestamp, const uint8_t *sender_prefix, const char *text) override {
void onSignedMessageRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
const uint8_t *sender_prefix, const char *text) override
{
}
void onChannelMessageRecv(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t timestamp, const char *text) override {
void onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packet *pkt, uint32_t timestamp,
const char *text) override
{
if (pkt->isRouteDirect()) {
Serial.printf("PUBLIC CHANNEL MSG -> (Direct!)\n");
} else {
}
else {
Serial.printf("PUBLIC CHANNEL MSG -> (Flood) hops %d\n", pkt->path_len);
}
Serial.printf(" %s\n", text);
}
uint8_t onContactRequest(const ContactInfo& contact, uint32_t sender_timestamp, const uint8_t* data, uint8_t len, uint8_t* reply) override {
uint8_t onContactRequest(const ContactInfo &contact, uint32_t sender_timestamp, const uint8_t *data,
uint8_t len, uint8_t *reply) override
{
return 0; // unknown
}
void onContactResponse(const ContactInfo& contact, const uint8_t* data, uint8_t len) override {
void onContactResponse(const ContactInfo &contact, const uint8_t *data, uint8_t len) override
{
// not supported
}
uint32_t calcFloodTimeoutMillisFor(uint32_t pkt_airtime_millis) const override {
uint32_t calcFloodTimeoutMillisFor(uint32_t pkt_airtime_millis) const override
{
return SEND_TIMEOUT_BASE_MILLIS + (FLOOD_SEND_TIMEOUT_FACTOR * pkt_airtime_millis);
}
uint32_t calcDirectTimeoutMillisFor(uint32_t pkt_airtime_millis, uint8_t path_len) const override {
uint32_t calcDirectTimeoutMillisFor(uint32_t pkt_airtime_millis, uint8_t path_len) const override
{
return SEND_TIMEOUT_BASE_MILLIS +
( (pkt_airtime_millis*DIRECT_SEND_PERHOP_FACTOR + DIRECT_SEND_PERHOP_EXTRA_MILLIS) * (path_len + 1));
((pkt_airtime_millis * DIRECT_SEND_PERHOP_FACTOR + DIRECT_SEND_PERHOP_EXTRA_MILLIS) *
(path_len + 1));
}
void onSendTimeout() override {
Serial.println(" ERROR: timed out, no ACK.");
}
void onSendTimeout() override { Serial.println(" ERROR: timed out, no ACK."); }
public:
MyMesh(mesh::Radio &radio, StdRNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables)
@@ -292,7 +322,8 @@ public:
float getFreqPref() const { return _prefs.freq; }
uint8_t getTxPowerPref() const { return _prefs.tx_power_dbm; }
void begin(FILESYSTEM& fs) {
void begin(FILESYSTEM &fs)
{
_fs = &fs;
BaseChatMesh::begin();
@@ -305,19 +336,22 @@ public:
#else
IdentityStore store(fs, "/identity");
#endif
if (!store.load("_main", self_id, _prefs.node_name, sizeof(_prefs.node_name))) { // legacy: node_name was from identity file
if (!store.load("_main", self_id, _prefs.node_name,
sizeof(_prefs.node_name))) { // legacy: node_name was from identity file
// Need way to get some entropy to seed RNG
Serial.println("Press ENTER to generate key:");
char c = 0;
while (c != '\n') { // wait for ENTER to be pressed
if (Serial.available()) c = Serial.read();
if (Serial.available())
c = Serial.read();
}
((StdRNG *)getRNG())->begin(millis());
self_id = mesh::LocalIdentity(getRNG()); // create new random identity
int count = 0;
while (count < 10 && (self_id.pub_key[0] == 0x00 || self_id.pub_key[0] == 0xFF)) { // reserved id hashes
self_id = mesh::LocalIdentity(getRNG()); count++;
self_id = mesh::LocalIdentity(getRNG());
count++;
}
store.save("_main", self_id);
}
@@ -339,7 +373,8 @@ public:
_public = addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
}
void savePrefs() {
void savePrefs()
{
#if defined(NRF52_PLATFORM)
_fs->remove("/node_prefs");
File file = _fs->open("/node_prefs", FILE_O_WRITE);
@@ -354,7 +389,8 @@ public:
}
}
void showWelcome() {
void showWelcome()
{
Serial.println("===== MeshCore Chat Terminal =====");
Serial.println();
Serial.printf("WELCOME %s\n", _prefs.node_name);
@@ -364,7 +400,8 @@ public:
Serial.println();
}
void sendSelfAdvert(int delay_millis) {
void sendSelfAdvert(int delay_millis)
{
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
if (pkt) {
sendFlood(pkt, delay_millis);
@@ -372,7 +409,8 @@ public:
}
// ContactVisitor
void onContactVisit(const ContactInfo& contact) override {
void onContactVisit(const ContactInfo &contact) override
{
Serial.printf(" %s - ", contact.name);
char tmp[40];
int32_t secs = contact.last_advert_timestamp - getRTCClock()->getCurrentTime();
@@ -380,25 +418,31 @@ public:
Serial.println(tmp);
}
void handleCommand(const char* command) {
while (*command == ' ') command++; // skip leading spaces
void handleCommand(const char *command)
{
while (*command == ' ')
command++; // skip leading spaces
if (memcmp(command, "send ", 5) == 0) {
if (curr_recipient) {
const char *text = &command[5];
uint32_t est_timeout;
int result = sendMessage(*curr_recipient, getRTCClock()->getCurrentTime(), 0, text, expected_ack_crc, est_timeout);
int result = sendMessage(*curr_recipient, getRTCClock()->getCurrentTime(), 0, text, expected_ack_crc,
est_timeout);
if (result == MSG_SEND_FAILED) {
Serial.println(" ERROR: unable to send.");
} else {
}
else {
last_msg_sent = _ms->getMillis();
Serial.printf(" (message sent - %s)\n", result == MSG_SEND_SENT_FLOOD ? "FLOOD" : "DIRECT");
}
} else {
}
else {
Serial.println(" ERROR: no recipient selected (use 'to' cmd).");
}
} else if (memcmp(command, "public ", 7) == 0) { // send GroupChannel msg
}
else if (memcmp(command, "public ", 7) == 0) { // send GroupChannel msg
uint8_t temp[5 + MAX_TEXT_LEN + 32];
uint32_t timestamp = getRTCClock()->getCurrentTime();
memcpy(temp, &timestamp, 4); // mostly an extra blob to help make packet_hash unique
@@ -412,50 +456,62 @@ public:
if (pkt) {
sendFlood(pkt);
Serial.println(" Sent.");
} else {
}
else {
Serial.println(" ERROR: unable to send");
}
} else if (memcmp(command, "list", 4) == 0) { // show Contact list, by most recent
}
else if (memcmp(command, "list", 4) == 0) { // show Contact list, by most recent
int n = 0;
if (command[4] == ' ') { // optional param, last 'N'
n = atoi(&command[5]);
}
scanRecentContacts(n, this);
} else if (strcmp(command, "clock") == 0) { // show current time
}
else if (strcmp(command, "clock") == 0) { // show current time
uint32_t now = getRTCClock()->getCurrentTime();
DateTime dt = DateTime(now);
Serial.printf("%02d:%02d - %d/%d/%d UTC\n", dt.hour(), dt.minute(), dt.day(), dt.month(), dt.year());
} else if (memcmp(command, "time ", 5) == 0) { // set time (to epoch seconds)
}
else if (memcmp(command, "time ", 5) == 0) { // set time (to epoch seconds)
uint32_t secs = _atoi(&command[5]);
setClock(secs);
} else if (memcmp(command, "to ", 3) == 0) { // set current recipient
}
else if (memcmp(command, "to ", 3) == 0) { // set current recipient
curr_recipient = searchContactsByPrefix(&command[3]);
if (curr_recipient) {
Serial.printf(" Recipient %s now selected.\n", curr_recipient->name);
} else {
}
else {
Serial.println(" Error: Name prefix not found.");
}
} else if (strcmp(command, "to") == 0) { // show current recipient
}
else if (strcmp(command, "to") == 0) { // show current recipient
if (curr_recipient) {
Serial.printf(" Current: %s\n", curr_recipient->name);
} else {
}
else {
Serial.println(" Err: no recipient selected");
}
} else if (strcmp(command, "advert") == 0) {
}
else if (strcmp(command, "advert") == 0) {
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
if (pkt) {
sendZeroHop(pkt);
Serial.println(" (advert sent, zero hop).");
} else {
}
else {
Serial.println(" ERR: unable to send");
}
} else if (strcmp(command, "reset path") == 0) {
}
else if (strcmp(command, "reset path") == 0) {
if (curr_recipient) {
resetPathTo(*curr_recipient);
saveContacts();
Serial.println(" Done.");
}
} else if (memcmp(command, "card", 4) == 0) {
}
else if (memcmp(command, "card", 4) == 0) {
Serial.printf("Hello %s\n", _prefs.node_name);
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
if (pkt) {
@@ -464,45 +520,57 @@ public:
mesh::Utils::toHex(hex_buf, tmp_buf, len);
Serial.println("Your MeshCore biz card:");
Serial.print("meshcore://"); Serial.println(hex_buf);
Serial.print("meshcore://");
Serial.println(hex_buf);
Serial.println();
} else {
}
else {
Serial.println(" Error");
}
} else if (memcmp(command, "import ", 7) == 0) {
}
else if (memcmp(command, "import ", 7) == 0) {
importCard(&command[7]);
} else if (memcmp(command, "set ", 4) == 0) {
}
else if (memcmp(command, "set ", 4) == 0) {
const char *config = &command[4];
if (memcmp(config, "af ", 3) == 0) {
_prefs.airtime_factor = atof(&config[3]);
savePrefs();
Serial.println(" OK");
} else if (memcmp(config, "name ", 5) == 0) {
}
else if (memcmp(config, "name ", 5) == 0) {
StrHelper::strncpy(_prefs.node_name, &config[5], sizeof(_prefs.node_name));
savePrefs();
Serial.println(" OK");
} else if (memcmp(config, "lat ", 4) == 0) {
}
else if (memcmp(config, "lat ", 4) == 0) {
_prefs.node_lat = atof(&config[4]);
savePrefs();
Serial.println(" OK");
} else if (memcmp(config, "lon ", 4) == 0) {
}
else if (memcmp(config, "lon ", 4) == 0) {
_prefs.node_lon = atof(&config[4]);
savePrefs();
Serial.println(" OK");
} else if (memcmp(config, "tx ", 3) == 0) {
}
else if (memcmp(config, "tx ", 3) == 0) {
_prefs.tx_power_dbm = atoi(&config[3]);
savePrefs();
Serial.println(" OK - reboot to apply");
} else if (memcmp(config, "freq ", 5) == 0) {
}
else if (memcmp(config, "freq ", 5) == 0) {
_prefs.freq = atof(&config[5]);
savePrefs();
Serial.println(" OK - reboot to apply");
} else {
}
else {
Serial.printf(" ERROR: unknown config: %s\n", config);
}
} else if (memcmp(command, "ver", 3) == 0) {
}
else if (memcmp(command, "ver", 3) == 0) {
Serial.println(FIRMWARE_VER_TEXT);
} else if (memcmp(command, "help", 4) == 0) {
}
else if (memcmp(command, "help", 4) == 0) {
Serial.println("Commands:");
Serial.println(" set {name|lat|lon|freq|tx|af} {value}");
Serial.println(" card");
@@ -516,12 +584,15 @@ public:
Serial.println(" advert");
Serial.println(" reset path");
Serial.println(" public <text>");
} else {
Serial.print(" ERROR: unknown command: "); Serial.println(command);
}
else {
Serial.print(" ERROR: unknown command: ");
Serial.println(command);
}
}
void loop() {
void loop()
{
BaseChatMesh::loop();
int len = strlen(command);
@@ -548,18 +619,24 @@ public:
StdRNG fast_rng;
SimpleMeshTables tables;
MyMesh the_mesh(radio_driver, fast_rng, *new VolatileRTCClock(), tables); // TODO: test with 'rtc_clock' in target.cpp
MyMesh the_mesh(radio_driver, fast_rng, *new VolatileRTCClock(),
tables); // TODO: test with 'rtc_clock' in target.cpp
void halt() {
while (1) ;
void halt()
{
while (1)
;
}
void setup() {
void setup()
{
Serial.begin(115200);
board.begin();
if (!radio_init()) { halt(); }
if (!radio_init()) {
halt();
}
fast_rng.begin(radio_get_rng_seed());
@@ -585,6 +662,7 @@ void setup() {
the_mesh.sendSelfAdvert(1200); // add slight delay
}
void loop() {
void loop()
{
the_mesh.loop();
}