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

gps_cli: gps also restored on sensors and rooms

Browse Source
This commit is contained in:
Florent de Lamotte
2025-10-06 15:30:18 +02:00
parent 6ed8e9d514
commit 9e3c2fc9d9
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/simple_repeater/MyMesh.cpp
View File

@@ -664,12 +664,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
#endif #endif
} }
#if ENV_INCLUDE_GPS == 1
void MyMesh::applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
}
#endif
void MyMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) { void MyMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) {
set_radio_at = futureMillis(2000); // give CLI reply some time to be sent back, before applying temp radio params set_radio_at = futureMillis(2000); // give CLI reply some time to be sent back, before applying temp radio params
pending_freq = freq; pending_freq = freq;

10
examples/simple_repeater/MyMesh.h
View File

@@ -135,6 +135,12 @@ protected:
return _prefs.multi_acks; return _prefs.multi_acks;
} }
#if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
}
#endif
void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override; void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
int searchPeersByHash(const uint8_t* hash) override; int searchPeersByHash(const uint8_t* hash) override;
void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override; void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override;
@@ -159,10 +165,6 @@ public:
_cli.savePrefs(_fs); _cli.savePrefs(_fs);
} }
#if ENV_INCLUDE_GPS == 1
void applyGpsPrefs();
#endif
void applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) override; void applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) override;
bool formatFileSystem() override; bool formatFileSystem() override;
void sendSelfAdvertisement(int delay_millis) override; void sendSelfAdvertisement(int delay_millis) override;

4
examples/simple_room_server/MyMesh.cpp
View File

@@ -632,6 +632,10 @@ void MyMesh::begin(FILESYSTEM *fs) {
updateAdvertTimer(); updateAdvertTimer();
updateFloodAdvertTimer(); updateFloodAdvertTimer();
#if ENV_INCLUDE_GPS == 1
applyGpsPrefs();
#endif
} }
void MyMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) { void MyMesh::applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) {

6
examples/simple_room_server/MyMesh.h
View File

@@ -149,6 +149,12 @@ protected:
bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override; bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
void onAckRecv(mesh::Packet* packet, uint32_t ack_crc) override; void onAckRecv(mesh::Packet* packet, uint32_t ack_crc) override;
#if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
}
#endif
public: public:
MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables); MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);

4
examples/simple_sensor/SensorMesh.cpp
View File

@@ -697,6 +697,10 @@ void SensorMesh::begin(FILESYSTEM* fs) {
updateAdvertTimer(); updateAdvertTimer();
updateFloodAdvertTimer(); updateFloodAdvertTimer();
#if ENV_INCLUDE_GPS == 1
applyGpsPrefs();
#endif
} }
bool SensorMesh::formatFileSystem() { bool SensorMesh::formatFileSystem() {

5
examples/simple_sensor/SensorMesh.h
View File

@@ -149,4 +149,9 @@ private:
void sendAlert(const ClientInfo* c, Trigger* t); void sendAlert(const ClientInfo* c, Trigger* t);
#if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
}
#endif
}; };