Reformatting code
This commit is contained in:
@@ -1,125 +1,142 @@
|
|||||||
#include "Button.h"
|
#include "Button.h"
|
||||||
|
|
||||||
Button::Button(uint8_t pin, bool activeState)
|
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;
|
_currentState = false; // Initialize as not pressed
|
||||||
|
_lastState = _currentState;
|
||||||
}
|
}
|
||||||
|
|
||||||
Button::Button(uint8_t pin, bool activeState, bool isAnalog, uint16_t analogThreshold)
|
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;
|
_currentState = false; // Initialize as not pressed
|
||||||
|
_lastState = _currentState;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Button::begin() {
|
void Button::begin()
|
||||||
_currentState = readButton();
|
{
|
||||||
_lastState = _currentState;
|
_currentState = readButton();
|
||||||
|
_lastState = _currentState;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Button::update() {
|
void Button::update()
|
||||||
uint32_t now = millis();
|
{
|
||||||
|
uint32_t now = millis();
|
||||||
// Read button at specified interval
|
|
||||||
if (now - _lastReadTime < BUTTON_READ_INTERVAL_MS) {
|
// Read button at specified interval
|
||||||
return;
|
if (now - _lastReadTime < BUTTON_READ_INTERVAL_MS) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_lastReadTime = now;
|
||||||
|
|
||||||
|
bool newState = readButton();
|
||||||
|
|
||||||
|
// Check if state has changed
|
||||||
|
if (newState != _lastState) {
|
||||||
|
_stateChangeTime = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debounce check
|
||||||
|
if ((now - _stateChangeTime) > BUTTON_DEBOUNCE_TIME_MS) {
|
||||||
|
if (newState != _currentState) {
|
||||||
|
_currentState = newState;
|
||||||
|
handleStateChange();
|
||||||
}
|
}
|
||||||
_lastReadTime = now;
|
}
|
||||||
|
|
||||||
bool newState = readButton();
|
_lastState = newState;
|
||||||
|
|
||||||
// Check if state has changed
|
// Handle multi-click timeout
|
||||||
if (newState != _lastState) {
|
if (_state == WAITING_FOR_MULTI_CLICK && (now - _releaseTime) > BUTTON_CLICK_TIMEOUT_MS) {
|
||||||
_stateChangeTime = now;
|
// Timeout reached, process the clicks
|
||||||
|
if (_clickCount == 1) {
|
||||||
|
triggerEvent(SHORT_PRESS);
|
||||||
}
|
}
|
||||||
|
else if (_clickCount == 2) {
|
||||||
// Debounce check
|
triggerEvent(DOUBLE_PRESS);
|
||||||
if ((now - _stateChangeTime) > BUTTON_DEBOUNCE_TIME_MS) {
|
|
||||||
if (newState != _currentState) {
|
|
||||||
_currentState = newState;
|
|
||||||
handleStateChange();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
else if (_clickCount >= 3) {
|
||||||
_lastState = newState;
|
triggerEvent(TRIPLE_PRESS);
|
||||||
|
}
|
||||||
// Handle multi-click timeout
|
_clickCount = 0;
|
||||||
if (_state == WAITING_FOR_MULTI_CLICK && (now - _releaseTime) > BUTTON_CLICK_TIMEOUT_MS) {
|
_state = IDLE;
|
||||||
// Timeout reached, process the clicks
|
}
|
||||||
if (_clickCount == 1) {
|
|
||||||
triggerEvent(SHORT_PRESS);
|
// Handle long press while button is held
|
||||||
} else if (_clickCount == 2) {
|
if (_state == PRESSED && (now - _pressTime) > BUTTON_LONG_PRESS_TIME_MS) {
|
||||||
triggerEvent(DOUBLE_PRESS);
|
triggerEvent(LONG_PRESS);
|
||||||
} else if (_clickCount >= 3) {
|
_state = IDLE; // Prevent multiple press events
|
||||||
triggerEvent(TRIPLE_PRESS);
|
_clickCount = 0;
|
||||||
}
|
}
|
||||||
_clickCount = 0;
|
}
|
||||||
|
|
||||||
|
bool Button::readButton()
|
||||||
|
{
|
||||||
|
if (_isAnalog) {
|
||||||
|
return (analogRead(_pin) < _analogThreshold);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return (digitalRead(_pin) == _activeState);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Button::handleStateChange()
|
||||||
|
{
|
||||||
|
uint32_t now = millis();
|
||||||
|
|
||||||
|
if (_currentState) {
|
||||||
|
// Button pressed
|
||||||
|
_pressTime = now;
|
||||||
|
_state = PRESSED;
|
||||||
|
triggerEvent(ANY_PRESS);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Button released
|
||||||
|
if (_state == PRESSED) {
|
||||||
|
uint32_t pressDuration = now - _pressTime;
|
||||||
|
|
||||||
|
if (pressDuration < BUTTON_LONG_PRESS_TIME_MS) {
|
||||||
|
// Short press detected
|
||||||
|
_clickCount++;
|
||||||
|
_releaseTime = now;
|
||||||
|
_state = WAITING_FOR_MULTI_CLICK;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Long press already handled in update()
|
||||||
_state = IDLE;
|
_state = IDLE;
|
||||||
}
|
|
||||||
|
|
||||||
// Handle long press while button is held
|
|
||||||
if (_state == PRESSED && (now - _pressTime) > BUTTON_LONG_PRESS_TIME_MS) {
|
|
||||||
triggerEvent(LONG_PRESS);
|
|
||||||
_state = IDLE; // Prevent multiple press events
|
|
||||||
_clickCount = 0;
|
_clickCount = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Button::readButton() {
|
void Button::triggerEvent(EventType event)
|
||||||
if (_isAnalog) {
|
{
|
||||||
return (analogRead(_pin) < _analogThreshold);
|
_lastEvent = event;
|
||||||
} else {
|
|
||||||
return (digitalRead(_pin) == _activeState);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Button::handleStateChange() {
|
switch (event) {
|
||||||
uint32_t now = millis();
|
case ANY_PRESS:
|
||||||
|
if (_onAnyPress)
|
||||||
if (_currentState) {
|
_onAnyPress();
|
||||||
// Button pressed
|
break;
|
||||||
_pressTime = now;
|
case SHORT_PRESS:
|
||||||
_state = PRESSED;
|
if (_onShortPress)
|
||||||
triggerEvent(ANY_PRESS);
|
_onShortPress();
|
||||||
} else {
|
break;
|
||||||
// Button released
|
case DOUBLE_PRESS:
|
||||||
if (_state == PRESSED) {
|
if (_onDoublePress)
|
||||||
uint32_t pressDuration = now - _pressTime;
|
_onDoublePress();
|
||||||
|
break;
|
||||||
if (pressDuration < BUTTON_LONG_PRESS_TIME_MS) {
|
case TRIPLE_PRESS:
|
||||||
// Short press detected
|
if (_onTriplePress)
|
||||||
_clickCount++;
|
_onTriplePress();
|
||||||
_releaseTime = now;
|
break;
|
||||||
_state = WAITING_FOR_MULTI_CLICK;
|
case LONG_PRESS:
|
||||||
} else {
|
if (_onLongPress)
|
||||||
// Long press already handled in update()
|
_onLongPress();
|
||||||
_state = IDLE;
|
break;
|
||||||
_clickCount = 0;
|
default:
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Button::triggerEvent(EventType event) {
|
|
||||||
_lastEvent = event;
|
|
||||||
|
|
||||||
switch (event) {
|
|
||||||
case ANY_PRESS:
|
|
||||||
if (_onAnyPress) _onAnyPress();
|
|
||||||
break;
|
|
||||||
case SHORT_PRESS:
|
|
||||||
if (_onShortPress) _onShortPress();
|
|
||||||
break;
|
|
||||||
case DOUBLE_PRESS:
|
|
||||||
if (_onDoublePress) _onDoublePress();
|
|
||||||
break;
|
|
||||||
case TRIPLE_PRESS:
|
|
||||||
if (_onTriplePress) _onTriplePress();
|
|
||||||
break;
|
|
||||||
case LONG_PRESS:
|
|
||||||
if (_onLongPress) _onLongPress();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -4,74 +4,62 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
// Button timing configuration
|
// Button timing configuration
|
||||||
#define BUTTON_DEBOUNCE_TIME_MS 50 // Debounce time in ms
|
#define BUTTON_DEBOUNCE_TIME_MS 50 // Debounce time in ms
|
||||||
#define BUTTON_CLICK_TIMEOUT_MS 500 // Max time between clicks for multi-click
|
#define BUTTON_CLICK_TIMEOUT_MS 500 // Max time between clicks for multi-click
|
||||||
#define BUTTON_LONG_PRESS_TIME_MS 3000 // Time to trigger long press (3 seconds)
|
#define BUTTON_LONG_PRESS_TIME_MS 3000 // Time to trigger long press (3 seconds)
|
||||||
#define BUTTON_READ_INTERVAL_MS 10 // How often to read the button
|
#define BUTTON_READ_INTERVAL_MS 10 // How often to read the button
|
||||||
|
|
||||||
class Button {
|
class Button {
|
||||||
public:
|
public:
|
||||||
enum EventType {
|
enum EventType { NONE, SHORT_PRESS, DOUBLE_PRESS, TRIPLE_PRESS, LONG_PRESS, ANY_PRESS };
|
||||||
NONE,
|
|
||||||
SHORT_PRESS,
|
|
||||||
DOUBLE_PRESS,
|
|
||||||
TRIPLE_PRESS,
|
|
||||||
LONG_PRESS,
|
|
||||||
ANY_PRESS
|
|
||||||
};
|
|
||||||
|
|
||||||
using EventCallback = std::function<void()>;
|
using EventCallback = std::function<void()>;
|
||||||
|
|
||||||
Button(uint8_t pin, bool activeState = LOW);
|
Button(uint8_t pin, bool activeState = LOW);
|
||||||
Button(uint8_t pin, bool activeState, bool isAnalog, uint16_t analogThreshold = 20);
|
Button(uint8_t pin, bool activeState, bool isAnalog, uint16_t analogThreshold = 20);
|
||||||
|
|
||||||
void begin();
|
void begin();
|
||||||
void update();
|
void update();
|
||||||
|
|
||||||
// Set callbacks for different events
|
// Set callbacks for different events
|
||||||
void onShortPress(EventCallback callback) { _onShortPress = callback; }
|
void onShortPress(EventCallback callback) { _onShortPress = callback; }
|
||||||
void onDoublePress(EventCallback callback) { _onDoublePress = callback; }
|
void onDoublePress(EventCallback callback) { _onDoublePress = callback; }
|
||||||
void onTriplePress(EventCallback callback) { _onTriplePress = callback; }
|
void onTriplePress(EventCallback callback) { _onTriplePress = callback; }
|
||||||
void onLongPress(EventCallback callback) { _onLongPress = callback; }
|
void onLongPress(EventCallback callback) { _onLongPress = callback; }
|
||||||
void onAnyPress(EventCallback callback) { _onAnyPress = callback; }
|
void onAnyPress(EventCallback callback) { _onAnyPress = callback; }
|
||||||
|
|
||||||
// State getters
|
// State getters
|
||||||
bool isPressed() const { return _currentState; }
|
bool isPressed() const { return _currentState; }
|
||||||
EventType getLastEvent() const { return _lastEvent; }
|
EventType getLastEvent() const { return _lastEvent; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum State {
|
enum State { IDLE, PRESSED, RELEASED, WAITING_FOR_MULTI_CLICK };
|
||||||
IDLE,
|
|
||||||
PRESSED,
|
|
||||||
RELEASED,
|
|
||||||
WAITING_FOR_MULTI_CLICK
|
|
||||||
};
|
|
||||||
|
|
||||||
uint8_t _pin;
|
uint8_t _pin;
|
||||||
bool _activeState;
|
bool _activeState;
|
||||||
bool _isAnalog;
|
bool _isAnalog;
|
||||||
uint16_t _analogThreshold;
|
uint16_t _analogThreshold;
|
||||||
|
|
||||||
State _state = IDLE;
|
State _state = IDLE;
|
||||||
bool _currentState;
|
bool _currentState;
|
||||||
bool _lastState;
|
bool _lastState;
|
||||||
|
|
||||||
uint32_t _stateChangeTime = 0;
|
uint32_t _stateChangeTime = 0;
|
||||||
uint32_t _pressTime = 0;
|
uint32_t _pressTime = 0;
|
||||||
uint32_t _releaseTime = 0;
|
uint32_t _releaseTime = 0;
|
||||||
uint32_t _lastReadTime = 0;
|
uint32_t _lastReadTime = 0;
|
||||||
|
|
||||||
uint8_t _clickCount = 0;
|
uint8_t _clickCount = 0;
|
||||||
EventType _lastEvent = NONE;
|
EventType _lastEvent = NONE;
|
||||||
|
|
||||||
// Callbacks
|
// Callbacks
|
||||||
EventCallback _onShortPress = nullptr;
|
EventCallback _onShortPress = nullptr;
|
||||||
EventCallback _onDoublePress = nullptr;
|
EventCallback _onDoublePress = nullptr;
|
||||||
EventCallback _onTriplePress = nullptr;
|
EventCallback _onTriplePress = nullptr;
|
||||||
EventCallback _onLongPress = nullptr;
|
EventCallback _onLongPress = nullptr;
|
||||||
EventCallback _onAnyPress = nullptr;
|
EventCallback _onAnyPress = nullptr;
|
||||||
|
|
||||||
bool readButton();
|
bool readButton();
|
||||||
void handleStateChange();
|
void handleStateChange();
|
||||||
void triggerEvent(EventType event);
|
void triggerEvent(EventType event);
|
||||||
};
|
};
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,21 +1,20 @@
|
|||||||
#ifndef MYMESH_H
|
#pragma once
|
||||||
#define MYMESH_H
|
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <Mesh.h>
|
#include <Mesh.h>
|
||||||
#ifdef DISPLAY_CLASS
|
#ifdef DISPLAY_CLASS
|
||||||
#include "UITask.h"
|
#include "UITask.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*------------ Frame Protocol --------------*/
|
/*------------ Frame Protocol --------------*/
|
||||||
#define FIRMWARE_VER_CODE 5
|
#define FIRMWARE_VER_CODE 5
|
||||||
|
|
||||||
#ifndef FIRMWARE_BUILD_DATE
|
#ifndef FIRMWARE_BUILD_DATE
|
||||||
#define FIRMWARE_BUILD_DATE "24 May 2025"
|
#define FIRMWARE_BUILD_DATE "24 May 2025"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef FIRMWARE_VERSION
|
#ifndef FIRMWARE_VERSION
|
||||||
#define FIRMWARE_VERSION "v1.6.2"
|
#define FIRMWARE_VERSION "v1.6.2"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
|
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
|
||||||
@@ -26,258 +25,197 @@
|
|||||||
#include <SPIFFS.h>
|
#include <SPIFFS.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <helpers/ArduinoHelpers.h>
|
|
||||||
#include <helpers/StaticPoolPacketManager.h>
|
|
||||||
#include <helpers/SimpleMeshTables.h>
|
|
||||||
#include <helpers/IdentityStore.h>
|
|
||||||
#include <helpers/BaseSerialInterface.h>
|
|
||||||
#include "NodePrefs.h"
|
#include "NodePrefs.h"
|
||||||
|
|
||||||
#include <RTClib.h>
|
#include <RTClib.h>
|
||||||
|
#include <helpers/ArduinoHelpers.h>
|
||||||
|
#include <helpers/BaseSerialInterface.h>
|
||||||
|
#include <helpers/IdentityStore.h>
|
||||||
|
#include <helpers/SimpleMeshTables.h>
|
||||||
|
#include <helpers/StaticPoolPacketManager.h>
|
||||||
#include <target.h>
|
#include <target.h>
|
||||||
|
|
||||||
/* ---------------------------------- CONFIGURATION ------------------------------------- */
|
/* ---------------------------------- CONFIGURATION ------------------------------------- */
|
||||||
|
|
||||||
#ifndef LORA_FREQ
|
#ifndef LORA_FREQ
|
||||||
#define LORA_FREQ 915.0
|
#define LORA_FREQ 915.0
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_BW
|
#ifndef LORA_BW
|
||||||
#define LORA_BW 250
|
#define LORA_BW 250
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_SF
|
#ifndef LORA_SF
|
||||||
#define LORA_SF 10
|
#define LORA_SF 10
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_CR
|
#ifndef LORA_CR
|
||||||
#define LORA_CR 5
|
#define LORA_CR 5
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_TX_POWER
|
#ifndef LORA_TX_POWER
|
||||||
#define LORA_TX_POWER 20
|
#define LORA_TX_POWER 20
|
||||||
#endif
|
#endif
|
||||||
#ifndef MAX_LORA_TX_POWER
|
#ifndef MAX_LORA_TX_POWER
|
||||||
#define MAX_LORA_TX_POWER LORA_TX_POWER
|
#define MAX_LORA_TX_POWER LORA_TX_POWER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MAX_CONTACTS
|
#ifndef MAX_CONTACTS
|
||||||
#define MAX_CONTACTS 100
|
#define MAX_CONTACTS 100
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef OFFLINE_QUEUE_SIZE
|
#ifndef OFFLINE_QUEUE_SIZE
|
||||||
#define OFFLINE_QUEUE_SIZE 16
|
#define OFFLINE_QUEUE_SIZE 16
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef BLE_NAME_PREFIX
|
#ifndef BLE_NAME_PREFIX
|
||||||
#define BLE_NAME_PREFIX "MeshCore-"
|
#define BLE_NAME_PREFIX "MeshCore-"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <helpers/BaseChatMesh.h>
|
#include <helpers/BaseChatMesh.h>
|
||||||
|
|
||||||
#define SEND_TIMEOUT_BASE_MILLIS 500
|
#define SEND_TIMEOUT_BASE_MILLIS 500
|
||||||
#define FLOOD_SEND_TIMEOUT_FACTOR 16.0f
|
#define FLOOD_SEND_TIMEOUT_FACTOR 16.0f
|
||||||
#define DIRECT_SEND_PERHOP_FACTOR 6.0f
|
#define DIRECT_SEND_PERHOP_FACTOR 6.0f
|
||||||
#define DIRECT_SEND_PERHOP_EXTRA_MILLIS 250
|
#define DIRECT_SEND_PERHOP_EXTRA_MILLIS 250
|
||||||
#define LAZY_CONTACTS_WRITE_DELAY 5000
|
#define LAZY_CONTACTS_WRITE_DELAY 5000
|
||||||
|
|
||||||
#define PUBLIC_GROUP_PSK "izOH6cXN6mrJ5e26oRXNcg=="
|
#define PUBLIC_GROUP_PSK "izOH6cXN6mrJ5e26oRXNcg=="
|
||||||
|
|
||||||
#define CMD_APP_START 1
|
|
||||||
#define CMD_SEND_TXT_MSG 2
|
|
||||||
#define CMD_SEND_CHANNEL_TXT_MSG 3
|
|
||||||
#define CMD_GET_CONTACTS 4 // with optional 'since' (for efficient sync)
|
|
||||||
#define CMD_GET_DEVICE_TIME 5
|
|
||||||
#define CMD_SET_DEVICE_TIME 6
|
|
||||||
#define CMD_SEND_SELF_ADVERT 7
|
|
||||||
#define CMD_SET_ADVERT_NAME 8
|
|
||||||
#define CMD_ADD_UPDATE_CONTACT 9
|
|
||||||
#define CMD_SYNC_NEXT_MESSAGE 10
|
|
||||||
#define CMD_SET_RADIO_PARAMS 11
|
|
||||||
#define CMD_SET_RADIO_TX_POWER 12
|
|
||||||
#define CMD_RESET_PATH 13
|
|
||||||
#define CMD_SET_ADVERT_LATLON 14
|
|
||||||
#define CMD_REMOVE_CONTACT 15
|
|
||||||
#define CMD_SHARE_CONTACT 16
|
|
||||||
#define CMD_EXPORT_CONTACT 17
|
|
||||||
#define CMD_IMPORT_CONTACT 18
|
|
||||||
#define CMD_REBOOT 19
|
|
||||||
#define CMD_GET_BATTERY_VOLTAGE 20
|
|
||||||
#define CMD_SET_TUNING_PARAMS 21
|
|
||||||
#define CMD_DEVICE_QEURY 22
|
|
||||||
#define CMD_EXPORT_PRIVATE_KEY 23
|
|
||||||
#define CMD_IMPORT_PRIVATE_KEY 24
|
|
||||||
#define CMD_SEND_RAW_DATA 25
|
|
||||||
#define CMD_SEND_LOGIN 26
|
|
||||||
#define CMD_SEND_STATUS_REQ 27
|
|
||||||
#define CMD_HAS_CONNECTION 28
|
|
||||||
#define CMD_LOGOUT 29 // 'Disconnect'
|
|
||||||
#define CMD_GET_CONTACT_BY_KEY 30
|
|
||||||
#define CMD_GET_CHANNEL 31
|
|
||||||
#define CMD_SET_CHANNEL 32
|
|
||||||
#define CMD_SIGN_START 33
|
|
||||||
#define CMD_SIGN_DATA 34
|
|
||||||
#define CMD_SIGN_FINISH 35
|
|
||||||
#define CMD_SEND_TRACE_PATH 36
|
|
||||||
#define CMD_SET_DEVICE_PIN 37
|
|
||||||
#define CMD_SET_OTHER_PARAMS 38
|
|
||||||
#define CMD_SEND_TELEMETRY_REQ 39
|
|
||||||
#define CMD_GET_CUSTOM_VARS 40
|
|
||||||
#define CMD_SET_CUSTOM_VAR 41
|
|
||||||
|
|
||||||
#define RESP_CODE_OK 0
|
|
||||||
#define RESP_CODE_ERR 1
|
|
||||||
#define RESP_CODE_CONTACTS_START 2 // first reply to CMD_GET_CONTACTS
|
|
||||||
#define RESP_CODE_CONTACT 3 // multiple of these (after CMD_GET_CONTACTS)
|
|
||||||
#define RESP_CODE_END_OF_CONTACTS 4 // last reply to CMD_GET_CONTACTS
|
|
||||||
#define RESP_CODE_SELF_INFO 5 // reply to CMD_APP_START
|
|
||||||
#define RESP_CODE_SENT 6 // reply to CMD_SEND_TXT_MSG
|
|
||||||
#define RESP_CODE_CONTACT_MSG_RECV 7 // a reply to CMD_SYNC_NEXT_MESSAGE (ver < 3)
|
|
||||||
#define RESP_CODE_CHANNEL_MSG_RECV 8 // a reply to CMD_SYNC_NEXT_MESSAGE (ver < 3)
|
|
||||||
#define RESP_CODE_CURR_TIME 9 // a reply to CMD_GET_DEVICE_TIME
|
|
||||||
#define RESP_CODE_NO_MORE_MESSAGES 10 // a reply to CMD_SYNC_NEXT_MESSAGE
|
|
||||||
#define RESP_CODE_EXPORT_CONTACT 11
|
|
||||||
#define RESP_CODE_BATTERY_VOLTAGE 12 // a reply to a CMD_GET_BATTERY_VOLTAGE
|
|
||||||
#define RESP_CODE_DEVICE_INFO 13 // a reply to CMD_DEVICE_QEURY
|
|
||||||
#define RESP_CODE_PRIVATE_KEY 14 // a reply to CMD_EXPORT_PRIVATE_KEY
|
|
||||||
#define RESP_CODE_DISABLED 15
|
|
||||||
#define RESP_CODE_CONTACT_MSG_RECV_V3 16 // a reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
|
|
||||||
#define RESP_CODE_CHANNEL_MSG_RECV_V3 17 // a reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
|
|
||||||
#define RESP_CODE_CHANNEL_INFO 18 // a reply to CMD_GET_CHANNEL
|
|
||||||
#define RESP_CODE_SIGN_START 19
|
|
||||||
#define RESP_CODE_SIGNATURE 20
|
|
||||||
#define RESP_CODE_CUSTOM_VARS 21
|
|
||||||
|
|
||||||
// these are _pushed_ to client app at any time
|
// these are _pushed_ to client app at any time
|
||||||
#define PUSH_CODE_ADVERT 0x80
|
#define PUSH_CODE_ADVERT 0x80
|
||||||
#define PUSH_CODE_PATH_UPDATED 0x81
|
#define PUSH_CODE_PATH_UPDATED 0x81
|
||||||
#define PUSH_CODE_SEND_CONFIRMED 0x82
|
#define PUSH_CODE_SEND_CONFIRMED 0x82
|
||||||
#define PUSH_CODE_MSG_WAITING 0x83
|
#define PUSH_CODE_MSG_WAITING 0x83
|
||||||
#define PUSH_CODE_RAW_DATA 0x84
|
#define PUSH_CODE_RAW_DATA 0x84
|
||||||
#define PUSH_CODE_LOGIN_SUCCESS 0x85
|
#define PUSH_CODE_LOGIN_SUCCESS 0x85
|
||||||
#define PUSH_CODE_LOGIN_FAIL 0x86
|
#define PUSH_CODE_LOGIN_FAIL 0x86
|
||||||
#define PUSH_CODE_STATUS_RESPONSE 0x87
|
#define PUSH_CODE_STATUS_RESPONSE 0x87
|
||||||
#define PUSH_CODE_LOG_RX_DATA 0x88
|
#define PUSH_CODE_LOG_RX_DATA 0x88
|
||||||
#define PUSH_CODE_TRACE_DATA 0x89
|
#define PUSH_CODE_TRACE_DATA 0x89
|
||||||
#define PUSH_CODE_NEW_ADVERT 0x8A
|
#define PUSH_CODE_NEW_ADVERT 0x8A
|
||||||
#define PUSH_CODE_TELEMETRY_RESPONSE 0x8B
|
#define PUSH_CODE_TELEMETRY_RESPONSE 0x8B
|
||||||
|
|
||||||
#define ERR_CODE_UNSUPPORTED_CMD 1
|
#define ERR_CODE_UNSUPPORTED_CMD 1
|
||||||
#define ERR_CODE_NOT_FOUND 2
|
#define ERR_CODE_NOT_FOUND 2
|
||||||
#define ERR_CODE_TABLE_FULL 3
|
#define ERR_CODE_TABLE_FULL 3
|
||||||
#define ERR_CODE_BAD_STATE 4
|
#define ERR_CODE_BAD_STATE 4
|
||||||
#define ERR_CODE_FILE_IO_ERROR 5
|
#define ERR_CODE_FILE_IO_ERROR 5
|
||||||
#define ERR_CODE_ILLEGAL_ARG 6
|
#define ERR_CODE_ILLEGAL_ARG 6
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------------------------- */
|
||||||
|
|
||||||
#define REQ_TYPE_GET_STATUS 0x01 // same as _GET_STATS
|
#define REQ_TYPE_GET_STATUS 0x01 // same as _GET_STATS
|
||||||
#define REQ_TYPE_KEEP_ALIVE 0x02
|
#define REQ_TYPE_KEEP_ALIVE 0x02
|
||||||
#define REQ_TYPE_GET_TELEMETRY_DATA 0x03
|
#define REQ_TYPE_GET_TELEMETRY_DATA 0x03
|
||||||
|
|
||||||
#define MAX_SIGN_DATA_LEN (8*1024) // 8K
|
#define MAX_SIGN_DATA_LEN (8 * 1024) // 8K
|
||||||
|
|
||||||
class MyMesh : public BaseChatMesh {
|
class MyMesh : public BaseChatMesh {
|
||||||
public:
|
public:
|
||||||
MyMesh(mesh::Radio& radio, mesh::RNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables);
|
MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables);
|
||||||
|
|
||||||
void begin(FILESYSTEM& fs, bool has_display);
|
|
||||||
void startInterface(BaseSerialInterface& serial);
|
|
||||||
void loadPrefsInt(const char* filename);
|
|
||||||
void savePrefs();
|
|
||||||
|
|
||||||
const char* getNodeName();
|
|
||||||
NodePrefs* getNodePrefs();
|
|
||||||
uint32_t getBLEPin();
|
|
||||||
|
|
||||||
void loop();
|
void begin(FILESYSTEM &fs, bool has_display);
|
||||||
void handleCmdFrame(size_t len);
|
void startInterface(BaseSerialInterface &serial);
|
||||||
bool advert();
|
void loadPrefsInt(const char *filename);
|
||||||
|
void savePrefs();
|
||||||
|
|
||||||
|
const char *getNodeName();
|
||||||
|
NodePrefs *getNodePrefs();
|
||||||
|
uint32_t getBLEPin();
|
||||||
|
|
||||||
|
void loop();
|
||||||
|
void handleCmdFrame(size_t len);
|
||||||
|
bool advert();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
float getAirtimeBudgetFactor() const override;
|
float getAirtimeBudgetFactor() const override;
|
||||||
int getInterferenceThreshold() const override;
|
int getInterferenceThreshold() const override;
|
||||||
int calcRxDelay(float score, uint32_t air_time) const override;
|
int calcRxDelay(float score, uint32_t air_time) const override;
|
||||||
|
|
||||||
void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override;
|
void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override;
|
||||||
bool isAutoAddEnabled() const override;
|
bool isAutoAddEnabled() const override;
|
||||||
void onDiscoveredContact(ContactInfo& contact, bool is_new) override;
|
void onDiscoveredContact(ContactInfo &contact, bool is_new) override;
|
||||||
void onContactPathUpdated(const ContactInfo& contact) override;
|
void onContactPathUpdated(const ContactInfo &contact) override;
|
||||||
bool processAck(const uint8_t *data) override;
|
bool processAck(const uint8_t *data) override;
|
||||||
void queueMessage(const ContactInfo& from, uint8_t txt_type, mesh::Packet* pkt,
|
void queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packet *pkt, uint32_t sender_timestamp,
|
||||||
uint32_t sender_timestamp, const uint8_t* extra, int extra_len, const char *text);
|
const uint8_t *extra, int extra_len, const char *text);
|
||||||
|
|
||||||
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,
|
||||||
void onCommandDataRecv(const ContactInfo& from, mesh::Packet* pkt, uint32_t sender_timestamp, const char *text) override;
|
const char *text) override;
|
||||||
void onSignedMessageRecv(const ContactInfo& from, mesh::Packet* pkt, uint32_t sender_timestamp,
|
void onCommandDataRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
|
||||||
const uint8_t *sender_prefix, const char *text) override;
|
const char *text) override;
|
||||||
void onChannelMessageRecv(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t 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 onChannelMessageRecv(const mesh::GroupChannel &channel, mesh::Packet *pkt, uint32_t timestamp,
|
||||||
|
const char *text) override;
|
||||||
|
|
||||||
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,
|
||||||
void onContactResponse(const ContactInfo& contact, const uint8_t* data, uint8_t len) override;
|
uint8_t len, uint8_t *reply) override;
|
||||||
void onRawDataRecv(mesh::Packet* packet) override;
|
void onContactResponse(const ContactInfo &contact, const uint8_t *data, uint8_t len) override;
|
||||||
void onTraceRecv(mesh::Packet* packet, uint32_t tag, uint32_t auth_code, uint8_t flags, const uint8_t* path_snrs,
|
void onRawDataRecv(mesh::Packet *packet) override;
|
||||||
const uint8_t* path_hashes, uint8_t path_len) override;
|
void onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code, uint8_t flags,
|
||||||
|
const uint8_t *path_snrs, const uint8_t *path_hashes, uint8_t path_len) override;
|
||||||
|
|
||||||
uint32_t calcFloodTimeoutMillisFor(uint32_t pkt_airtime_millis) const override;
|
uint32_t calcFloodTimeoutMillisFor(uint32_t pkt_airtime_millis) const override;
|
||||||
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;
|
||||||
void onSendTimeout() override;
|
void onSendTimeout() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void writeOKFrame();
|
void writeOKFrame();
|
||||||
void writeErrFrame(uint8_t err_code);
|
void writeErrFrame(uint8_t err_code);
|
||||||
void writeDisabledFrame();
|
void writeDisabledFrame();
|
||||||
void writeContactRespFrame(uint8_t code, const ContactInfo& contact);
|
void writeContactRespFrame(uint8_t code, const ContactInfo &contact);
|
||||||
void updateContactFromFrame(ContactInfo& contact, const uint8_t* frame, int len);
|
void updateContactFromFrame(ContactInfo &contact, const uint8_t *frame, int len);
|
||||||
void addToOfflineQueue(const uint8_t frame[], int len);
|
void addToOfflineQueue(const uint8_t frame[], int len);
|
||||||
int getFromOfflineQueue(uint8_t frame[]);
|
int getFromOfflineQueue(uint8_t frame[]);
|
||||||
void loadMainIdentity();
|
void loadMainIdentity();
|
||||||
bool saveMainIdentity(const mesh::LocalIdentity& identity);
|
bool saveMainIdentity(const mesh::LocalIdentity &identity);
|
||||||
void loadContacts();
|
void loadContacts();
|
||||||
void saveContacts();
|
void saveContacts();
|
||||||
void loadChannels();
|
void loadChannels();
|
||||||
void saveChannels();
|
void saveChannels();
|
||||||
int getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) override;
|
int getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) override;
|
||||||
bool putBlobByKey(const uint8_t key[], int key_len, const uint8_t src_buf[], int len) override;
|
bool putBlobByKey(const uint8_t key[], int key_len, const uint8_t src_buf[], int len) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
FILESYSTEM* _fs;
|
FILESYSTEM *_fs;
|
||||||
IdentityStore* _identity_store;
|
IdentityStore *_identity_store;
|
||||||
NodePrefs _prefs;
|
NodePrefs _prefs;
|
||||||
uint32_t pending_login;
|
uint32_t pending_login;
|
||||||
uint32_t pending_status;
|
uint32_t pending_status;
|
||||||
uint32_t pending_telemetry;
|
uint32_t pending_telemetry;
|
||||||
BaseSerialInterface* _serial;
|
BaseSerialInterface *_serial;
|
||||||
|
|
||||||
ContactsIterator _iter;
|
ContactsIterator _iter;
|
||||||
uint32_t _iter_filter_since;
|
uint32_t _iter_filter_since;
|
||||||
uint32_t _most_recent_lastmod;
|
uint32_t _most_recent_lastmod;
|
||||||
uint32_t _active_ble_pin;
|
uint32_t _active_ble_pin;
|
||||||
bool _iter_started;
|
bool _iter_started;
|
||||||
uint8_t app_target_ver;
|
uint8_t app_target_ver;
|
||||||
uint8_t* sign_data;
|
uint8_t *sign_data;
|
||||||
uint32_t sign_data_len;
|
uint32_t sign_data_len;
|
||||||
unsigned long dirty_contacts_expiry;
|
unsigned long dirty_contacts_expiry;
|
||||||
|
|
||||||
uint8_t cmd_frame[MAX_FRAME_SIZE + 1];
|
uint8_t cmd_frame[MAX_FRAME_SIZE + 1];
|
||||||
uint8_t out_frame[MAX_FRAME_SIZE + 1];
|
uint8_t out_frame[MAX_FRAME_SIZE + 1];
|
||||||
CayenneLPP telemetry;
|
CayenneLPP telemetry;
|
||||||
|
|
||||||
struct Frame {
|
struct Frame {
|
||||||
uint8_t len;
|
uint8_t len;
|
||||||
uint8_t buf[MAX_FRAME_SIZE];
|
uint8_t buf[MAX_FRAME_SIZE];
|
||||||
};
|
};
|
||||||
int offline_queue_len;
|
int offline_queue_len;
|
||||||
Frame offline_queue[OFFLINE_QUEUE_SIZE];
|
Frame offline_queue[OFFLINE_QUEUE_SIZE];
|
||||||
|
|
||||||
struct AckTableEntry {
|
struct AckTableEntry {
|
||||||
unsigned long msg_sent;
|
unsigned long msg_sent;
|
||||||
uint32_t ack;
|
uint32_t ack;
|
||||||
};
|
};
|
||||||
#define EXPECTED_ACK_TABLE_SIZE 8
|
#define EXPECTED_ACK_TABLE_SIZE 8
|
||||||
AckTableEntry expected_ack_table[EXPECTED_ACK_TABLE_SIZE]; // circular table
|
AckTableEntry expected_ack_table[EXPECTED_ACK_TABLE_SIZE]; // circular table
|
||||||
int next_ack_idx;
|
int next_ack_idx;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern StdRNG fast_rng;
|
extern StdRNG fast_rng;
|
||||||
extern SimpleMeshTables tables;
|
extern SimpleMeshTables tables;
|
||||||
extern MyMesh the_mesh;
|
extern MyMesh the_mesh;
|
||||||
#ifdef DISPLAY_CLASS
|
#ifdef DISPLAY_CLASS
|
||||||
extern UITask ui_task;
|
extern UITask ui_task;
|
||||||
#endif
|
#endif
|
||||||
#endif // MYMESH_H
|
|
||||||
@@ -1,13 +1,11 @@
|
|||||||
#ifndef NODE_PREFS_H
|
#pragma once
|
||||||
#define NODE_PREFS_H
|
|
||||||
|
|
||||||
#include <cstdint> // For uint8_t, uint32_t
|
#include <cstdint> // For uint8_t, uint32_t
|
||||||
|
|
||||||
#define TELEM_MODE_DENY 0
|
#define TELEM_MODE_DENY 0
|
||||||
#define TELEM_MODE_ALLOW_FLAGS 1 // use contact.flags
|
#define TELEM_MODE_ALLOW_FLAGS 1 // use contact.flags
|
||||||
#define TELEM_MODE_ALLOW_ALL 2
|
#define TELEM_MODE_ALLOW_ALL 2
|
||||||
|
|
||||||
struct NodePrefs { // persisted to file
|
struct NodePrefs { // persisted to file
|
||||||
float airtime_factor;
|
float airtime_factor;
|
||||||
char node_name[32];
|
char node_name[32];
|
||||||
float freq;
|
float freq;
|
||||||
@@ -22,6 +20,4 @@ struct NodePrefs { // persisted to file
|
|||||||
uint8_t telemetry_mode_env;
|
uint8_t telemetry_mode_env;
|
||||||
float rx_delay_base;
|
float rx_delay_base;
|
||||||
uint32_t ble_pin;
|
uint32_t ble_pin;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // NODE_PREFS_H
|
|
||||||
@@ -1,53 +1,43 @@
|
|||||||
#ifndef UI_TASK_H
|
#pragma once
|
||||||
#define UI_TASK_H
|
|
||||||
|
|
||||||
#include <MeshCore.h>
|
#include <MeshCore.h>
|
||||||
#include <helpers/ui/DisplayDriver.h>
|
#include <helpers/ui/DisplayDriver.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#ifdef PIN_BUZZER
|
#ifdef PIN_BUZZER
|
||||||
#include <helpers/ui/buzzer.h>
|
#include <helpers/ui/buzzer.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "NodePrefs.h"
|
|
||||||
#include "Button.h"
|
#include "Button.h"
|
||||||
|
#include "NodePrefs.h"
|
||||||
|
|
||||||
enum class UIEventType
|
enum class UIEventType { none, contactMessage, channelMessage, roomMessage, newContactMessage, ack };
|
||||||
{
|
|
||||||
none,
|
|
||||||
contactMessage,
|
|
||||||
channelMessage,
|
|
||||||
roomMessage,
|
|
||||||
newContactMessage,
|
|
||||||
ack
|
|
||||||
};
|
|
||||||
|
|
||||||
class UITask {
|
class UITask {
|
||||||
DisplayDriver* _display;
|
DisplayDriver *_display;
|
||||||
mesh::MainBoard* _board;
|
mesh::MainBoard *_board;
|
||||||
#ifdef PIN_BUZZER
|
#ifdef PIN_BUZZER
|
||||||
genericBuzzer buzzer;
|
genericBuzzer buzzer;
|
||||||
#endif
|
#endif
|
||||||
unsigned long _next_refresh, _auto_off;
|
unsigned long _next_refresh, _auto_off;
|
||||||
bool _connected;
|
bool _connected;
|
||||||
uint32_t _pin_code;
|
uint32_t _pin_code;
|
||||||
NodePrefs* _node_prefs;
|
NodePrefs *_node_prefs;
|
||||||
char _version_info[32];
|
char _version_info[32];
|
||||||
char _origin[62];
|
char _origin[62];
|
||||||
char _msg[80];
|
char _msg[80];
|
||||||
int _msgcount;
|
int _msgcount;
|
||||||
bool _need_refresh = true;
|
bool _need_refresh = true;
|
||||||
bool _displayWasOn = false; // Track display state before button press
|
bool _displayWasOn = false; // Track display state before button press
|
||||||
|
|
||||||
// Button handlers
|
// Button handlers
|
||||||
#if defined(PIN_USER_BTN) || defined(PIN_USER_BTN_ANA)
|
#if defined(PIN_USER_BTN) || defined(PIN_USER_BTN_ANA)
|
||||||
Button* _userButton = nullptr;
|
Button *_userButton = nullptr;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void renderCurrScreen();
|
void renderCurrScreen();
|
||||||
void userLedHandler();
|
void userLedHandler();
|
||||||
void renderBatteryIndicator(uint16_t batteryMilliVolts);
|
void renderBatteryIndicator(uint16_t batteryMilliVolts);
|
||||||
|
|
||||||
// Button action handlers
|
// Button action handlers
|
||||||
void handleButtonAnyPress();
|
void handleButtonAnyPress();
|
||||||
void handleButtonShortPress();
|
void handleButtonShortPress();
|
||||||
@@ -55,22 +45,21 @@ class UITask {
|
|||||||
void handleButtonTriplePress();
|
void handleButtonTriplePress();
|
||||||
void handleButtonLongPress();
|
void handleButtonLongPress();
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
UITask(mesh::MainBoard *board) : _board(board), _display(NULL)
|
||||||
UITask(mesh::MainBoard* board) : _board(board), _display(NULL) {
|
{
|
||||||
_next_refresh = 0;
|
_next_refresh = 0;
|
||||||
_connected = false;
|
_connected = false;
|
||||||
}
|
}
|
||||||
void begin(DisplayDriver* display, NodePrefs* node_prefs, const char* build_date, const char* firmware_version, uint32_t pin_code);
|
void begin(DisplayDriver *display, NodePrefs *node_prefs, const char *build_date,
|
||||||
|
const char *firmware_version, uint32_t pin_code);
|
||||||
|
|
||||||
void setHasConnection(bool connected) { _connected = connected; }
|
void setHasConnection(bool connected) { _connected = connected; }
|
||||||
bool hasDisplay() const { return _display != NULL; }
|
bool hasDisplay() const { return _display != NULL; }
|
||||||
void clearMsgPreview();
|
void clearMsgPreview();
|
||||||
void msgRead(int msgcount);
|
void msgRead(int msgcount);
|
||||||
void newMsg(uint8_t path_len, const char* from_name, const char* text, int msgcount);
|
void newMsg(uint8_t path_len, const char *from_name, const char *text, int msgcount);
|
||||||
void soundBuzzer(UIEventType bet = UIEventType::none);
|
void soundBuzzer(UIEventType bet = UIEventType::none);
|
||||||
void shutdown(bool restart = false);
|
void shutdown(bool restart = false);
|
||||||
void loop();
|
void loop();
|
||||||
};
|
};
|
||||||
#endif //UI_TASK_H
|
|
||||||
@@ -1,56 +1,57 @@
|
|||||||
#include <Arduino.h> // needed for PlatformIO
|
#include <Arduino.h> // needed for PlatformIO
|
||||||
#include <Mesh.h>
|
#include <Mesh.h>
|
||||||
|
|
||||||
#if defined(NRF52_PLATFORM)
|
#if defined(NRF52_PLATFORM)
|
||||||
#include <InternalFileSystem.h>
|
#include <InternalFileSystem.h>
|
||||||
#elif defined(RP2040_PLATFORM)
|
#elif defined(RP2040_PLATFORM)
|
||||||
#include <LittleFS.h>
|
#include <LittleFS.h>
|
||||||
#elif defined(ESP32)
|
#elif defined(ESP32)
|
||||||
#include <SPIFFS.h>
|
#include <SPIFFS.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <helpers/ArduinoHelpers.h>
|
|
||||||
#include <helpers/StaticPoolPacketManager.h>
|
|
||||||
#include <helpers/SimpleMeshTables.h>
|
|
||||||
#include <helpers/IdentityStore.h>
|
|
||||||
#include <RTClib.h>
|
#include <RTClib.h>
|
||||||
|
#include <helpers/ArduinoHelpers.h>
|
||||||
|
#include <helpers/IdentityStore.h>
|
||||||
|
#include <helpers/SimpleMeshTables.h>
|
||||||
|
#include <helpers/StaticPoolPacketManager.h>
|
||||||
#include <target.h>
|
#include <target.h>
|
||||||
|
|
||||||
/* ---------------------------------- CONFIGURATION ------------------------------------- */
|
/* ---------------------------------- CONFIGURATION ------------------------------------- */
|
||||||
|
|
||||||
#define FIRMWARE_VER_TEXT "v2 (build: 4 Feb 2025)"
|
#define FIRMWARE_VER_TEXT "v2 (build: 4 Feb 2025)"
|
||||||
|
|
||||||
#ifndef LORA_FREQ
|
#ifndef LORA_FREQ
|
||||||
#define LORA_FREQ 915.0
|
#define LORA_FREQ 915.0
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_BW
|
#ifndef LORA_BW
|
||||||
#define LORA_BW 250
|
#define LORA_BW 250
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_SF
|
#ifndef LORA_SF
|
||||||
#define LORA_SF 10
|
#define LORA_SF 10
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_CR
|
#ifndef LORA_CR
|
||||||
#define LORA_CR 5
|
#define LORA_CR 5
|
||||||
#endif
|
#endif
|
||||||
#ifndef LORA_TX_POWER
|
#ifndef LORA_TX_POWER
|
||||||
#define LORA_TX_POWER 20
|
#define LORA_TX_POWER 20
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MAX_CONTACTS
|
#ifndef MAX_CONTACTS
|
||||||
#define MAX_CONTACTS 100
|
#define MAX_CONTACTS 100
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <helpers/BaseChatMesh.h>
|
#include <helpers/BaseChatMesh.h>
|
||||||
|
|
||||||
#define SEND_TIMEOUT_BASE_MILLIS 500
|
#define SEND_TIMEOUT_BASE_MILLIS 500
|
||||||
#define FLOOD_SEND_TIMEOUT_FACTOR 16.0f
|
#define FLOOD_SEND_TIMEOUT_FACTOR 16.0f
|
||||||
#define DIRECT_SEND_PERHOP_FACTOR 6.0f
|
#define DIRECT_SEND_PERHOP_FACTOR 6.0f
|
||||||
#define DIRECT_SEND_PERHOP_EXTRA_MILLIS 250
|
#define DIRECT_SEND_PERHOP_EXTRA_MILLIS 250
|
||||||
|
|
||||||
#define PUBLIC_GROUP_PSK "izOH6cXN6mrJ5e26oRXNcg=="
|
#define PUBLIC_GROUP_PSK "izOH6cXN6mrJ5e26oRXNcg=="
|
||||||
|
|
||||||
// Believe it or not, this std C function is busted on some platforms!
|
// 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;
|
uint32_t n = 0;
|
||||||
while (*sp && *sp >= '0' && *sp <= '9') {
|
while (*sp && *sp >= '0' && *sp <= '9') {
|
||||||
n *= 10;
|
n *= 10;
|
||||||
@@ -61,7 +62,7 @@ static uint32_t _atoi(const char* sp) {
|
|||||||
|
|
||||||
/* -------------------------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------------------------- */
|
||||||
|
|
||||||
struct NodePrefs { // persisted to file
|
struct NodePrefs { // persisted to file
|
||||||
float airtime_factor;
|
float airtime_factor;
|
||||||
char node_name[32];
|
char node_name[32];
|
||||||
double node_lat, node_lon;
|
double node_lat, node_lon;
|
||||||
@@ -71,30 +72,35 @@ struct NodePrefs { // persisted to file
|
|||||||
};
|
};
|
||||||
|
|
||||||
class MyMesh : public BaseChatMesh, ContactVisitor {
|
class MyMesh : public BaseChatMesh, ContactVisitor {
|
||||||
FILESYSTEM* _fs;
|
FILESYSTEM *_fs;
|
||||||
NodePrefs _prefs;
|
NodePrefs _prefs;
|
||||||
uint32_t expected_ack_crc;
|
uint32_t expected_ack_crc;
|
||||||
ChannelDetails* _public;
|
ChannelDetails *_public;
|
||||||
unsigned long last_msg_sent;
|
unsigned long last_msg_sent;
|
||||||
ContactInfo* curr_recipient;
|
ContactInfo *curr_recipient;
|
||||||
char command[512+10];
|
char command[512 + 10];
|
||||||
uint8_t tmp_buf[256];
|
uint8_t tmp_buf[256];
|
||||||
char hex_buf[512];
|
char hex_buf[512];
|
||||||
|
|
||||||
const char* getTypeName(uint8_t type) const {
|
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_CHAT)
|
||||||
if (type == ADV_TYPE_ROOM) return "Room";
|
return "Chat";
|
||||||
return "??"; // unknown
|
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 (_fs->exists("/contacts")) {
|
||||||
#if defined(RP2040_PLATFORM)
|
#if defined(RP2040_PLATFORM)
|
||||||
File file = _fs->open("/contacts", "r");
|
File file = _fs->open("/contacts", "r");
|
||||||
#else
|
#else
|
||||||
File file = _fs->open("/contacts");
|
File file = _fs->open("/contacts");
|
||||||
#endif
|
#endif
|
||||||
if (file) {
|
if (file) {
|
||||||
bool full = false;
|
bool full = false;
|
||||||
while (!full) {
|
while (!full) {
|
||||||
@@ -104,28 +110,31 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
|
|||||||
uint32_t reserved;
|
uint32_t reserved;
|
||||||
|
|
||||||
bool success = (file.read(pub_key, 32) == 32);
|
bool success = (file.read(pub_key, 32) == 32);
|
||||||
success = success && (file.read((uint8_t *) &c.name, 32) == 32);
|
success = success && (file.read((uint8_t *)&c.name, 32) == 32);
|
||||||
success = success && (file.read(&c.type, 1) == 1);
|
success = success && (file.read(&c.type, 1) == 1);
|
||||||
success = success && (file.read(&c.flags, 1) == 1);
|
success = success && (file.read(&c.flags, 1) == 1);
|
||||||
success = success && (file.read(&unused, 1) == 1);
|
success = success && (file.read(&unused, 1) == 1);
|
||||||
success = success && (file.read((uint8_t *) &reserved, 4) == 4);
|
success = success && (file.read((uint8_t *)&reserved, 4) == 4);
|
||||||
success = success && (file.read((uint8_t *) &c.out_path_len, 1) == 1);
|
success = success && (file.read((uint8_t *)&c.out_path_len, 1) == 1);
|
||||||
success = success && (file.read((uint8_t *) &c.last_advert_timestamp, 4) == 4);
|
success = success && (file.read((uint8_t *)&c.last_advert_timestamp, 4) == 4);
|
||||||
success = success && (file.read(c.out_path, 64) == 64);
|
success = success && (file.read(c.out_path, 64) == 64);
|
||||||
c.gps_lat = c.gps_lon = 0; // not yet supported
|
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.id = mesh::Identity(pub_key);
|
||||||
c.lastmod = 0;
|
c.lastmod = 0;
|
||||||
if (!addContact(c)) full = true;
|
if (!addContact(c))
|
||||||
|
full = true;
|
||||||
}
|
}
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void saveContacts() {
|
void saveContacts()
|
||||||
|
{
|
||||||
#if defined(NRF52_PLATFORM)
|
#if defined(NRF52_PLATFORM)
|
||||||
_fs->remove("/contacts");
|
_fs->remove("/contacts");
|
||||||
File file = _fs->open("/contacts", FILE_O_WRITE);
|
File file = _fs->open("/contacts", FILE_O_WRITE);
|
||||||
@@ -142,44 +151,50 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
|
|||||||
|
|
||||||
while (iter.hasNext(this, c)) {
|
while (iter.hasNext(this, c)) {
|
||||||
bool success = (file.write(c.id.pub_key, 32) == 32);
|
bool success = (file.write(c.id.pub_key, 32) == 32);
|
||||||
success = success && (file.write((uint8_t *) &c.name, 32) == 32);
|
success = success && (file.write((uint8_t *)&c.name, 32) == 32);
|
||||||
success = success && (file.write(&c.type, 1) == 1);
|
success = success && (file.write(&c.type, 1) == 1);
|
||||||
success = success && (file.write(&c.flags, 1) == 1);
|
success = success && (file.write(&c.flags, 1) == 1);
|
||||||
success = success && (file.write(&unused, 1) == 1);
|
success = success && (file.write(&unused, 1) == 1);
|
||||||
success = success && (file.write((uint8_t *) &reserved, 4) == 4);
|
success = success && (file.write((uint8_t *)&reserved, 4) == 4);
|
||||||
success = success && (file.write((uint8_t *) &c.out_path_len, 1) == 1);
|
success = success && (file.write((uint8_t *)&c.out_path_len, 1) == 1);
|
||||||
success = success && (file.write((uint8_t *) &c.last_advert_timestamp, 4) == 4);
|
success = success && (file.write((uint8_t *)&c.last_advert_timestamp, 4) == 4);
|
||||||
success = success && (file.write(c.out_path, 64) == 64);
|
success = success && (file.write(c.out_path, 64) == 64);
|
||||||
|
|
||||||
if (!success) break; // write failed
|
if (!success)
|
||||||
|
break; // write failed
|
||||||
}
|
}
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void setClock(uint32_t timestamp) {
|
void setClock(uint32_t timestamp)
|
||||||
|
{
|
||||||
uint32_t curr = getRTCClock()->getCurrentTime();
|
uint32_t curr = getRTCClock()->getCurrentTime();
|
||||||
if (timestamp > curr) {
|
if (timestamp > curr) {
|
||||||
getRTCClock()->setCurrentTime(timestamp);
|
getRTCClock()->setCurrentTime(timestamp);
|
||||||
Serial.println(" (OK - clock set!)");
|
Serial.println(" (OK - clock set!)");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.println(" (ERR: clock cannot go backwards)");
|
Serial.println(" (ERR: clock cannot go backwards)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void importCard(const char* command) {
|
void importCard(const char *command)
|
||||||
while (*command == ' ') command++; // skip leading spaces
|
{
|
||||||
|
while (*command == ' ')
|
||||||
|
command++; // skip leading spaces
|
||||||
if (memcmp(command, "meshcore://", 11) == 0) {
|
if (memcmp(command, "meshcore://", 11) == 0) {
|
||||||
command += 11; // skip the prefix
|
command += 11; // skip the prefix
|
||||||
char *ep = strchr(command, 0); // find end of string
|
char *ep = strchr(command, 0); // find end of string
|
||||||
while (ep > command) {
|
while (ep > command) {
|
||||||
ep--;
|
ep--;
|
||||||
if (mesh::Utils::isHexChar(*ep)) break; // found tail end of card
|
if (mesh::Utils::isHexChar(*ep))
|
||||||
*ep = 0; // remove trailing spaces and other junk
|
break; // found tail end of card
|
||||||
|
*ep = 0; // remove trailing spaces and other junk
|
||||||
}
|
}
|
||||||
int len = strlen(command);
|
int len = strlen(command);
|
||||||
if (len % 2 == 0) {
|
if (len % 2 == 0) {
|
||||||
len >>= 1; // halve, for num bytes
|
len >>= 1; // halve, for num bytes
|
||||||
if (mesh::Utils::fromHex(tmp_buf, len, command)) {
|
if (mesh::Utils::fromHex(tmp_buf, len, command)) {
|
||||||
importContact(tmp_buf, len);
|
importContact(tmp_buf, len);
|
||||||
return;
|
return;
|
||||||
@@ -190,97 +205,112 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
float getAirtimeBudgetFactor() const override {
|
float getAirtimeBudgetFactor() const override { return _prefs.airtime_factor; }
|
||||||
return _prefs.airtime_factor;
|
|
||||||
|
int calcRxDelay(float score, uint32_t air_time) const override
|
||||||
|
{
|
||||||
|
return 0; // disable rxdelay
|
||||||
}
|
}
|
||||||
|
|
||||||
int calcRxDelay(float score, uint32_t air_time) const override {
|
bool allowPacketForward(const mesh::Packet *packet) override { return true; }
|
||||||
return 0; // disable rxdelay
|
|
||||||
}
|
|
||||||
|
|
||||||
bool allowPacketForward(const mesh::Packet* packet) override {
|
void onDiscoveredContact(ContactInfo &contact, bool is_new) override
|
||||||
return true;
|
{
|
||||||
}
|
|
||||||
|
|
||||||
void onDiscoveredContact(ContactInfo& contact, bool is_new) override {
|
|
||||||
// TODO: if not in favs, prompt to add as fav(?)
|
// TODO: if not in favs, prompt to add as fav(?)
|
||||||
|
|
||||||
Serial.printf("ADVERT from -> %s\n", contact.name);
|
Serial.printf("ADVERT from -> %s\n", contact.name);
|
||||||
Serial.printf(" type: %s\n", getTypeName(contact.type));
|
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();
|
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);
|
{
|
||||||
|
Serial.printf("PATH to: %s, path_len=%d\n", contact.name, (int32_t)contact.out_path_len);
|
||||||
saveContacts();
|
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
|
{
|
||||||
|
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);
|
Serial.printf(" Got ACK! (round trip: %d millis)\n", _ms->getMillis() - last_msg_sent);
|
||||||
// NOTE: the same ACK can be received multiple times!
|
// NOTE: the same ACK can be received multiple times!
|
||||||
expected_ack_crc = 0; // reset our expected hash, now that we have received ACK
|
expected_ack_crc = 0; // reset our expected hash, now that we have received ACK
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//uint32_t crc;
|
// uint32_t crc;
|
||||||
//memcpy(&crc, data, 4);
|
// memcpy(&crc, data, 4);
|
||||||
//MESH_DEBUG_PRINTLN("unknown ACK received: %08X (expected: %08X)", crc, expected_ack_crc);
|
// MESH_DEBUG_PRINTLN("unknown ACK received: %08X (expected: %08X)", crc, expected_ack_crc);
|
||||||
return false;
|
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) MSG -> from %s\n", pkt->isRouteDirect() ? "DIRECT" : "FLOOD", from.name);
|
||||||
Serial.printf(" %s\n", text);
|
Serial.printf(" %s\n", text);
|
||||||
|
|
||||||
if (strcmp(text, "clock sync") == 0) { // special text command
|
if (strcmp(text, "clock sync") == 0) { // special text command
|
||||||
setClock(sender_timestamp + 1);
|
setClock(sender_timestamp + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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()) {
|
if (pkt->isRouteDirect()) {
|
||||||
Serial.printf("PUBLIC CHANNEL MSG -> (Direct!)\n");
|
Serial.printf("PUBLIC CHANNEL MSG -> (Direct!)\n");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.printf("PUBLIC CHANNEL MSG -> (Flood) hops %d\n", pkt->path_len);
|
Serial.printf("PUBLIC CHANNEL MSG -> (Flood) hops %d\n", pkt->path_len);
|
||||||
}
|
}
|
||||||
Serial.printf(" %s\n", text);
|
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,
|
||||||
return 0; // unknown
|
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
|
// 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);
|
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));
|
return SEND_TIMEOUT_BASE_MILLIS +
|
||||||
|
((pkt_airtime_millis * DIRECT_SEND_PERHOP_FACTOR + DIRECT_SEND_PERHOP_EXTRA_MILLIS) *
|
||||||
|
(path_len + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
void onSendTimeout() override {
|
void onSendTimeout() override { Serial.println(" ERROR: timed out, no ACK."); }
|
||||||
Serial.println(" ERROR: timed out, no ACK.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MyMesh(mesh::Radio& radio, StdRNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables)
|
MyMesh(mesh::Radio &radio, StdRNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables)
|
||||||
: BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables)
|
: BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables)
|
||||||
{
|
{
|
||||||
// defaults
|
// defaults
|
||||||
memset(&_prefs, 0, sizeof(_prefs));
|
memset(&_prefs, 0, sizeof(_prefs));
|
||||||
_prefs.airtime_factor = 2.0; // one third
|
_prefs.airtime_factor = 2.0; // one third
|
||||||
strcpy(_prefs.node_name, "NONAME");
|
strcpy(_prefs.node_name, "NONAME");
|
||||||
_prefs.freq = LORA_FREQ;
|
_prefs.freq = LORA_FREQ;
|
||||||
_prefs.tx_power_dbm = LORA_TX_POWER;
|
_prefs.tx_power_dbm = LORA_TX_POWER;
|
||||||
@@ -292,45 +322,49 @@ public:
|
|||||||
float getFreqPref() const { return _prefs.freq; }
|
float getFreqPref() const { return _prefs.freq; }
|
||||||
uint8_t getTxPowerPref() const { return _prefs.tx_power_dbm; }
|
uint8_t getTxPowerPref() const { return _prefs.tx_power_dbm; }
|
||||||
|
|
||||||
void begin(FILESYSTEM& fs) {
|
void begin(FILESYSTEM &fs)
|
||||||
|
{
|
||||||
_fs = &fs;
|
_fs = &fs;
|
||||||
|
|
||||||
BaseChatMesh::begin();
|
BaseChatMesh::begin();
|
||||||
|
|
||||||
#if defined(NRF52_PLATFORM)
|
#if defined(NRF52_PLATFORM)
|
||||||
IdentityStore store(fs, "");
|
IdentityStore store(fs, "");
|
||||||
#elif defined(RP2040_PLATFORM)
|
#elif defined(RP2040_PLATFORM)
|
||||||
IdentityStore store(fs, "/identity");
|
IdentityStore store(fs, "/identity");
|
||||||
store.begin();
|
store.begin();
|
||||||
#else
|
#else
|
||||||
IdentityStore store(fs, "/identity");
|
IdentityStore store(fs, "/identity");
|
||||||
#endif
|
#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
|
// Need way to get some entropy to seed RNG
|
||||||
Serial.println("Press ENTER to generate key:");
|
Serial.println("Press ENTER to generate key:");
|
||||||
char c = 0;
|
char c = 0;
|
||||||
while (c != '\n') { // wait for ENTER to be pressed
|
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());
|
((StdRNG *)getRNG())->begin(millis());
|
||||||
|
|
||||||
self_id = mesh::LocalIdentity(getRNG()); // create new random identity
|
self_id = mesh::LocalIdentity(getRNG()); // create new random identity
|
||||||
int count = 0;
|
int count = 0;
|
||||||
while (count < 10 && (self_id.pub_key[0] == 0x00 || self_id.pub_key[0] == 0xFF)) { // reserved id hashes
|
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);
|
store.save("_main", self_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
// load persisted prefs
|
// load persisted prefs
|
||||||
if (_fs->exists("/node_prefs")) {
|
if (_fs->exists("/node_prefs")) {
|
||||||
#if defined(RP2040_PLATFORM)
|
#if defined(RP2040_PLATFORM)
|
||||||
File file = _fs->open("/node_prefs", "r");
|
File file = _fs->open("/node_prefs", "r");
|
||||||
#else
|
#else
|
||||||
File file = _fs->open("/node_prefs");
|
File file = _fs->open("/node_prefs");
|
||||||
#endif
|
#endif
|
||||||
if (file) {
|
if (file) {
|
||||||
file.read((uint8_t *) &_prefs, sizeof(_prefs));
|
file.read((uint8_t *)&_prefs, sizeof(_prefs));
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -339,7 +373,8 @@ public:
|
|||||||
_public = addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
|
_public = addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
|
||||||
}
|
}
|
||||||
|
|
||||||
void savePrefs() {
|
void savePrefs()
|
||||||
|
{
|
||||||
#if defined(NRF52_PLATFORM)
|
#if defined(NRF52_PLATFORM)
|
||||||
_fs->remove("/node_prefs");
|
_fs->remove("/node_prefs");
|
||||||
File file = _fs->open("/node_prefs", FILE_O_WRITE);
|
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("===== MeshCore Chat Terminal =====");
|
||||||
Serial.println();
|
Serial.println();
|
||||||
Serial.printf("WELCOME %s\n", _prefs.node_name);
|
Serial.printf("WELCOME %s\n", _prefs.node_name);
|
||||||
@@ -364,7 +400,8 @@ public:
|
|||||||
Serial.println();
|
Serial.println();
|
||||||
}
|
}
|
||||||
|
|
||||||
void sendSelfAdvert(int delay_millis) {
|
void sendSelfAdvert(int delay_millis)
|
||||||
|
{
|
||||||
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
|
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
sendFlood(pkt, delay_millis);
|
sendFlood(pkt, delay_millis);
|
||||||
@@ -372,7 +409,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ContactVisitor
|
// ContactVisitor
|
||||||
void onContactVisit(const ContactInfo& contact) override {
|
void onContactVisit(const ContactInfo &contact) override
|
||||||
|
{
|
||||||
Serial.printf(" %s - ", contact.name);
|
Serial.printf(" %s - ", contact.name);
|
||||||
char tmp[40];
|
char tmp[40];
|
||||||
int32_t secs = contact.last_advert_timestamp - getRTCClock()->getCurrentTime();
|
int32_t secs = contact.last_advert_timestamp - getRTCClock()->getCurrentTime();
|
||||||
@@ -380,129 +418,159 @@ public:
|
|||||||
Serial.println(tmp);
|
Serial.println(tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleCommand(const char* command) {
|
void handleCommand(const char *command)
|
||||||
while (*command == ' ') command++; // skip leading spaces
|
{
|
||||||
|
while (*command == ' ')
|
||||||
|
command++; // skip leading spaces
|
||||||
|
|
||||||
if (memcmp(command, "send ", 5) == 0) {
|
if (memcmp(command, "send ", 5) == 0) {
|
||||||
if (curr_recipient) {
|
if (curr_recipient) {
|
||||||
const char *text = &command[5];
|
const char *text = &command[5];
|
||||||
uint32_t est_timeout;
|
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) {
|
if (result == MSG_SEND_FAILED) {
|
||||||
Serial.println(" ERROR: unable to send.");
|
Serial.println(" ERROR: unable to send.");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
last_msg_sent = _ms->getMillis();
|
last_msg_sent = _ms->getMillis();
|
||||||
Serial.printf(" (message sent - %s)\n", result == MSG_SEND_SENT_FLOOD ? "FLOOD" : "DIRECT");
|
Serial.printf(" (message sent - %s)\n", result == MSG_SEND_SENT_FLOOD ? "FLOOD" : "DIRECT");
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.println(" ERROR: no recipient selected (use 'to' cmd).");
|
Serial.println(" ERROR: no recipient selected (use 'to' cmd).");
|
||||||
}
|
}
|
||||||
} else if (memcmp(command, "public ", 7) == 0) { // send GroupChannel msg
|
}
|
||||||
uint8_t temp[5+MAX_TEXT_LEN+32];
|
else if (memcmp(command, "public ", 7) == 0) { // send GroupChannel msg
|
||||||
|
uint8_t temp[5 + MAX_TEXT_LEN + 32];
|
||||||
uint32_t timestamp = getRTCClock()->getCurrentTime();
|
uint32_t timestamp = getRTCClock()->getCurrentTime();
|
||||||
memcpy(temp, ×tamp, 4); // mostly an extra blob to help make packet_hash unique
|
memcpy(temp, ×tamp, 4); // mostly an extra blob to help make packet_hash unique
|
||||||
temp[4] = 0; // attempt and flags
|
temp[4] = 0; // attempt and flags
|
||||||
|
|
||||||
sprintf((char *) &temp[5], "%s: %s", _prefs.node_name, &command[7]); // <sender>: <msg>
|
sprintf((char *)&temp[5], "%s: %s", _prefs.node_name, &command[7]); // <sender>: <msg>
|
||||||
temp[5 + MAX_TEXT_LEN] = 0; // truncate if too long
|
temp[5 + MAX_TEXT_LEN] = 0; // truncate if too long
|
||||||
|
|
||||||
int len = strlen((char *) &temp[5]);
|
int len = strlen((char *)&temp[5]);
|
||||||
auto pkt = createGroupDatagram(PAYLOAD_TYPE_GRP_TXT, _public->channel, temp, 5 + len);
|
auto pkt = createGroupDatagram(PAYLOAD_TYPE_GRP_TXT, _public->channel, temp, 5 + len);
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
sendFlood(pkt);
|
sendFlood(pkt);
|
||||||
Serial.println(" Sent.");
|
Serial.println(" Sent.");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.println(" ERROR: unable to send");
|
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;
|
int n = 0;
|
||||||
if (command[4] == ' ') { // optional param, last 'N'
|
if (command[4] == ' ') { // optional param, last 'N'
|
||||||
n = atoi(&command[5]);
|
n = atoi(&command[5]);
|
||||||
}
|
}
|
||||||
scanRecentContacts(n, this);
|
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();
|
uint32_t now = getRTCClock()->getCurrentTime();
|
||||||
DateTime dt = DateTime(now);
|
DateTime dt = DateTime(now);
|
||||||
Serial.printf( "%02d:%02d - %d/%d/%d UTC\n", dt.hour(), dt.minute(), dt.day(), dt.month(), dt.year());
|
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]);
|
uint32_t secs = _atoi(&command[5]);
|
||||||
setClock(secs);
|
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]);
|
curr_recipient = searchContactsByPrefix(&command[3]);
|
||||||
if (curr_recipient) {
|
if (curr_recipient) {
|
||||||
Serial.printf(" Recipient %s now selected.\n", curr_recipient->name);
|
Serial.printf(" Recipient %s now selected.\n", curr_recipient->name);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.println(" Error: Name prefix not found.");
|
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) {
|
if (curr_recipient) {
|
||||||
Serial.printf(" Current: %s\n", curr_recipient->name);
|
Serial.printf(" Current: %s\n", curr_recipient->name);
|
||||||
} else {
|
|
||||||
Serial.println(" Err: no recipient selected");
|
|
||||||
}
|
}
|
||||||
} else if (strcmp(command, "advert") == 0) {
|
else {
|
||||||
|
Serial.println(" Err: no recipient selected");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (strcmp(command, "advert") == 0) {
|
||||||
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
|
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
sendZeroHop(pkt);
|
sendZeroHop(pkt);
|
||||||
Serial.println(" (advert sent, zero hop).");
|
Serial.println(" (advert sent, zero hop).");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.println(" ERR: unable to send");
|
Serial.println(" ERR: unable to send");
|
||||||
}
|
}
|
||||||
} else if (strcmp(command, "reset path") == 0) {
|
}
|
||||||
|
else if (strcmp(command, "reset path") == 0) {
|
||||||
if (curr_recipient) {
|
if (curr_recipient) {
|
||||||
resetPathTo(*curr_recipient);
|
resetPathTo(*curr_recipient);
|
||||||
saveContacts();
|
saveContacts();
|
||||||
Serial.println(" Done.");
|
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);
|
Serial.printf("Hello %s\n", _prefs.node_name);
|
||||||
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
|
auto pkt = createSelfAdvert(_prefs.node_name, _prefs.node_lat, _prefs.node_lon);
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
uint8_t len = pkt->writeTo(tmp_buf);
|
uint8_t len = pkt->writeTo(tmp_buf);
|
||||||
releasePacket(pkt); // undo the obtainNewPacket()
|
releasePacket(pkt); // undo the obtainNewPacket()
|
||||||
|
|
||||||
mesh::Utils::toHex(hex_buf, tmp_buf, len);
|
mesh::Utils::toHex(hex_buf, tmp_buf, len);
|
||||||
Serial.println("Your MeshCore biz card:");
|
Serial.println("Your MeshCore biz card:");
|
||||||
Serial.print("meshcore://"); Serial.println(hex_buf);
|
Serial.print("meshcore://");
|
||||||
|
Serial.println(hex_buf);
|
||||||
Serial.println();
|
Serial.println();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.println(" Error");
|
Serial.println(" Error");
|
||||||
}
|
}
|
||||||
} else if (memcmp(command, "import ", 7) == 0) {
|
}
|
||||||
|
else if (memcmp(command, "import ", 7) == 0) {
|
||||||
importCard(&command[7]);
|
importCard(&command[7]);
|
||||||
} else if (memcmp(command, "set ", 4) == 0) {
|
}
|
||||||
const char* config = &command[4];
|
else if (memcmp(command, "set ", 4) == 0) {
|
||||||
|
const char *config = &command[4];
|
||||||
if (memcmp(config, "af ", 3) == 0) {
|
if (memcmp(config, "af ", 3) == 0) {
|
||||||
_prefs.airtime_factor = atof(&config[3]);
|
_prefs.airtime_factor = atof(&config[3]);
|
||||||
savePrefs();
|
savePrefs();
|
||||||
Serial.println(" OK");
|
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));
|
StrHelper::strncpy(_prefs.node_name, &config[5], sizeof(_prefs.node_name));
|
||||||
savePrefs();
|
savePrefs();
|
||||||
Serial.println(" OK");
|
Serial.println(" OK");
|
||||||
} else if (memcmp(config, "lat ", 4) == 0) {
|
}
|
||||||
|
else if (memcmp(config, "lat ", 4) == 0) {
|
||||||
_prefs.node_lat = atof(&config[4]);
|
_prefs.node_lat = atof(&config[4]);
|
||||||
savePrefs();
|
savePrefs();
|
||||||
Serial.println(" OK");
|
Serial.println(" OK");
|
||||||
} else if (memcmp(config, "lon ", 4) == 0) {
|
}
|
||||||
|
else if (memcmp(config, "lon ", 4) == 0) {
|
||||||
_prefs.node_lon = atof(&config[4]);
|
_prefs.node_lon = atof(&config[4]);
|
||||||
savePrefs();
|
savePrefs();
|
||||||
Serial.println(" OK");
|
Serial.println(" OK");
|
||||||
} else if (memcmp(config, "tx ", 3) == 0) {
|
}
|
||||||
|
else if (memcmp(config, "tx ", 3) == 0) {
|
||||||
_prefs.tx_power_dbm = atoi(&config[3]);
|
_prefs.tx_power_dbm = atoi(&config[3]);
|
||||||
savePrefs();
|
savePrefs();
|
||||||
Serial.println(" OK - reboot to apply");
|
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]);
|
_prefs.freq = atof(&config[5]);
|
||||||
savePrefs();
|
savePrefs();
|
||||||
Serial.println(" OK - reboot to apply");
|
Serial.println(" OK - reboot to apply");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
Serial.printf(" ERROR: unknown config: %s\n", config);
|
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);
|
Serial.println(FIRMWARE_VER_TEXT);
|
||||||
} else if (memcmp(command, "help", 4) == 0) {
|
}
|
||||||
|
else if (memcmp(command, "help", 4) == 0) {
|
||||||
Serial.println("Commands:");
|
Serial.println("Commands:");
|
||||||
Serial.println(" set {name|lat|lon|freq|tx|af} {value}");
|
Serial.println(" set {name|lat|lon|freq|tx|af} {value}");
|
||||||
Serial.println(" card");
|
Serial.println(" card");
|
||||||
@@ -516,50 +584,59 @@ public:
|
|||||||
Serial.println(" advert");
|
Serial.println(" advert");
|
||||||
Serial.println(" reset path");
|
Serial.println(" reset path");
|
||||||
Serial.println(" public <text>");
|
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();
|
BaseChatMesh::loop();
|
||||||
|
|
||||||
int len = strlen(command);
|
int len = strlen(command);
|
||||||
while (Serial.available() && len < sizeof(command)-1) {
|
while (Serial.available() && len < sizeof(command) - 1) {
|
||||||
char c = Serial.read();
|
char c = Serial.read();
|
||||||
if (c != '\n') {
|
if (c != '\n') {
|
||||||
command[len++] = c;
|
command[len++] = c;
|
||||||
command[len] = 0;
|
command[len] = 0;
|
||||||
}
|
}
|
||||||
Serial.print(c);
|
Serial.print(c);
|
||||||
}
|
}
|
||||||
if (len == sizeof(command)-1) { // command buffer full
|
if (len == sizeof(command) - 1) { // command buffer full
|
||||||
command[sizeof(command)-1] = '\r';
|
command[sizeof(command) - 1] = '\r';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len > 0 && command[len - 1] == '\r') { // received complete line
|
if (len > 0 && command[len - 1] == '\r') { // received complete line
|
||||||
command[len - 1] = 0; // replace newline with C string null terminator
|
command[len - 1] = 0; // replace newline with C string null terminator
|
||||||
|
|
||||||
handleCommand(command);
|
handleCommand(command);
|
||||||
command[0] = 0; // reset command buffer
|
command[0] = 0; // reset command buffer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
StdRNG fast_rng;
|
StdRNG fast_rng;
|
||||||
SimpleMeshTables tables;
|
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() {
|
void halt()
|
||||||
while (1) ;
|
{
|
||||||
|
while (1)
|
||||||
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setup() {
|
void setup()
|
||||||
|
{
|
||||||
Serial.begin(115200);
|
Serial.begin(115200);
|
||||||
|
|
||||||
board.begin();
|
board.begin();
|
||||||
|
|
||||||
if (!radio_init()) { halt(); }
|
if (!radio_init()) {
|
||||||
|
halt();
|
||||||
|
}
|
||||||
|
|
||||||
fast_rng.begin(radio_get_rng_seed());
|
fast_rng.begin(radio_get_rng_seed());
|
||||||
|
|
||||||
@@ -573,7 +650,7 @@ void setup() {
|
|||||||
SPIFFS.begin(true);
|
SPIFFS.begin(true);
|
||||||
the_mesh.begin(SPIFFS);
|
the_mesh.begin(SPIFFS);
|
||||||
#else
|
#else
|
||||||
#error "need to define filesystem"
|
#error "need to define filesystem"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
radio_set_params(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
|
radio_set_params(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
|
||||||
@@ -582,9 +659,10 @@ void setup() {
|
|||||||
the_mesh.showWelcome();
|
the_mesh.showWelcome();
|
||||||
|
|
||||||
// send out initial Advertisement to the mesh
|
// send out initial Advertisement to the mesh
|
||||||
the_mesh.sendSelfAdvert(1200); // add slight delay
|
the_mesh.sendSelfAdvert(1200); // add slight delay
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop() {
|
void loop()
|
||||||
|
{
|
||||||
the_mesh.loop();
|
the_mesh.loop();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user