shade/MeshCoreTel-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream/dev into develop

Browse Source
This commit is contained in:
Jared Dohrman
2026-04-17 17:54:47 +10:00
parent 006577bc00 d7a3d41843
commit e05c9bc09c
37 changed files with 2059 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/DataStore.cpp
+29 -7
View File
@@ -230,17 +230,37 @@ void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& no
file.read((uint8_t *)&_prefs.gps_interval, sizeof(_prefs.gps_interval)); // 86
file.read((uint8_t *)&_prefs.autoadd_config, sizeof(_prefs.autoadd_config)); // 87
file.read((uint8_t *)&_prefs.autoadd_max_hops, sizeof(_prefs.autoadd_max_hops)); // 88
file.read((uint8_t *)&_prefs.rx_boosted_gain, sizeof(_prefs.rx_boosted_gain)); // 89
if (file.available() >= (int)sizeof(_prefs.wifi_powersave)) {
file.read((uint8_t *)&_prefs.rx_boosted_gain, sizeof(_prefs.rx_boosted_gain)); // 89
const int wifi_bytes = sizeof(_prefs.wifi_powersave) + sizeof(_prefs.wifi_ssid) + sizeof(_prefs.wifi_pwd);
const int scope_bytes = sizeof(_prefs.default_scope_name) + sizeof(_prefs.default_scope_key);
const int remaining = file.available();
if (remaining >= wifi_bytes + scope_bytes) {
file.read((uint8_t *)&_prefs.wifi_powersave, sizeof(_prefs.wifi_powersave)); // 90
}
if (file.available() >= (int)sizeof(_prefs.wifi_ssid)) {
file.read((uint8_t *)_prefs.wifi_ssid, sizeof(_prefs.wifi_ssid)); // 91
_prefs.wifi_ssid[sizeof(_prefs.wifi_ssid) - 1] = 0;
}
if (file.available() >= (int)sizeof(_prefs.wifi_pwd)) {
file.read((uint8_t *)_prefs.wifi_pwd, sizeof(_prefs.wifi_pwd)); // 124
_prefs.wifi_pwd[sizeof(_prefs.wifi_pwd) - 1] = 0;
file.read((uint8_t *)_prefs.default_scope_name, sizeof(_prefs.default_scope_name)); // 189
_prefs.default_scope_name[sizeof(_prefs.default_scope_name) - 1] = 0;
file.read((uint8_t *)_prefs.default_scope_key, sizeof(_prefs.default_scope_key)); // 220
} else if (remaining >= scope_bytes) {
file.read((uint8_t *)_prefs.default_scope_name, sizeof(_prefs.default_scope_name)); // 90
_prefs.default_scope_name[sizeof(_prefs.default_scope_name) - 1] = 0;
file.read((uint8_t *)_prefs.default_scope_key, sizeof(_prefs.default_scope_key)); // 121
} else {
if (file.available() >= (int)sizeof(_prefs.wifi_powersave)) {
file.read((uint8_t *)&_prefs.wifi_powersave, sizeof(_prefs.wifi_powersave)); // 90
}
if (file.available() >= (int)sizeof(_prefs.wifi_ssid)) {
file.read((uint8_t *)_prefs.wifi_ssid, sizeof(_prefs.wifi_ssid)); // 91
_prefs.wifi_ssid[sizeof(_prefs.wifi_ssid) - 1] = 0;
}
if (file.available() >= (int)sizeof(_prefs.wifi_pwd)) {
file.read((uint8_t *)_prefs.wifi_pwd, sizeof(_prefs.wifi_pwd)); // 124
_prefs.wifi_pwd[sizeof(_prefs.wifi_pwd) - 1] = 0;
}
}
file.close();
@@ -279,10 +299,12 @@ void DataStore::savePrefs(const NodePrefs& _prefs, double node_lat, double node_
file.write((uint8_t *)&_prefs.gps_interval, sizeof(_prefs.gps_interval)); // 86
file.write((uint8_t *)&_prefs.autoadd_config, sizeof(_prefs.autoadd_config)); // 87
file.write((uint8_t *)&_prefs.autoadd_max_hops, sizeof(_prefs.autoadd_max_hops)); // 88
file.write((uint8_t *)&_prefs.rx_boosted_gain, sizeof(_prefs.rx_boosted_gain)); // 89
file.write((uint8_t *)&_prefs.rx_boosted_gain, sizeof(_prefs.rx_boosted_gain)); // 89
file.write((uint8_t *)&_prefs.wifi_powersave, sizeof(_prefs.wifi_powersave)); // 90
file.write((uint8_t *)_prefs.wifi_ssid, sizeof(_prefs.wifi_ssid)); // 91
file.write((uint8_t *)_prefs.wifi_pwd, sizeof(_prefs.wifi_pwd)); // 124
file.write((uint8_t *)_prefs.default_scope_name, sizeof(_prefs.default_scope_name)); // 189
file.write((uint8_t *)_prefs.default_scope_key, sizeof(_prefs.default_scope_key)); // 220
file.close();
}