Browse Source

SensorManager: remove setSettingByKey

pull/971/head
Florent 8 months ago
parent
commit
37dc715a8e
  1. 2
      examples/simple_repeater/MyMesh.h
  2. 2
      examples/simple_room_server/MyMesh.h
  3. 2
      examples/simple_sensor/SensorMesh.h
  4. 6
      src/helpers/CommonCLI.cpp
  5. 10
      src/helpers/SensorManager.h

2
examples/simple_repeater/MyMesh.h

@ -137,7 +137,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

@ -151,7 +151,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

@ -151,7 +151,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

@ -545,7 +545,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");
@ -577,7 +577,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");
@ -585,7 +585,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

@ -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;
}
}; };

Loading…
Cancel
Save