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

Merge pull request #971 from fdlamotte/remove_set_setting_by_key

Browse Source 
SensorManager: remove setSettingByKey
This commit is contained in:
ripplebiz
2025-11-11 23:40:13 +11:00
committed by GitHub
parent b59d1999e6 90e26129ee
commit ba6b8535c9
5 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/simple_repeater/MyMesh.h
View File

@@ -148,7 +148,7 @@ protected:
#if ENV_INCLUDE_GPS == 1 #if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() { void applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0"); sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
} }
#endif #endif

2
examples/simple_room_server/MyMesh.h
View File

@@ -154,7 +154,7 @@ protected:
#if ENV_INCLUDE_GPS == 1 #if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() { void applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0"); sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
} }
#endif #endif

2
examples/simple_sensor/SensorMesh.h
View File

@@ -156,7 +156,7 @@ private:
#if ENV_INCLUDE_GPS == 1 #if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() { void applyGpsPrefs() {
sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0"); sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
} }
#endif #endif
}; };

6
src/helpers/CommonCLI.cpp
View File

@@ -547,7 +547,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
int num = mesh::Utils::parseTextParts(tmp, parts, 2, ' '); int num = mesh::Utils::parseTextParts(tmp, parts, 2, ' ');
const char *key = (num > 0) ? parts[0] : ""; const char *key = (num > 0) ? parts[0] : "";
const char *value = (num > 1) ? parts[1] : "null"; const char *value = (num > 1) ? parts[1] : "null";
if (_sensors->setSettingByKey(key, value)) { if (_sensors->setSettingValue(key, value)) {
strcpy(reply, "ok"); strcpy(reply, "ok");
} else { } else {
strcpy(reply, "can't find custom var"); strcpy(reply, "can't find custom var");
@@ -579,7 +579,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
} }
#if ENV_INCLUDE_GPS == 1 #if ENV_INCLUDE_GPS == 1
} else if (memcmp(command, "gps on", 6) == 0) { } else if (memcmp(command, "gps on", 6) == 0) {
if (_sensors->setSettingByKey("gps", "1")) { if (_sensors->setSettingValue("gps", "1")) {
_prefs->gps_enabled = 1; _prefs->gps_enabled = 1;
savePrefs(); savePrefs();
strcpy(reply, "ok"); strcpy(reply, "ok");
@@ -587,7 +587,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
strcpy(reply, "gps toggle not found"); strcpy(reply, "gps toggle not found");
} }
} else if (memcmp(command, "gps off", 7) == 0) { } else if (memcmp(command, "gps off", 7) == 0) {
if (_sensors->setSettingByKey("gps", "0")) { if (_sensors->setSettingValue("gps", "0")) {
_prefs->gps_enabled = 0; _prefs->gps_enabled = 0;
savePrefs(); savePrefs();
strcpy(reply, "ok"); strcpy(reply, "ok");

10
src/helpers/SensorManager.h
View File

@@ -34,14 +34,4 @@ public:
} }
return NULL; return NULL;
} }
bool setSettingByKey(const char* key, const char* value) {
int num = getNumSettings();
for (int i = 0; i < num; i++) {
if (strcmp(getSettingName(i), key) == 0) {
return setSettingValue(key, value);
}
}
return false;
}
}; };