Drop dedicated SimRa mode, simply enable Bluetooth for SimRa (#327)

Implements #325

Author: amandel

docs/software/firmware/obs_cfg.md

@@ -72,8 +72,6 @@ relevant put the order of the array content.
             "privacyConfig": 10,
           // Active preset - always 0 as of today
             "selectedPreset": 0,
-          // Selects if the SimRa mode is activated
-            "simRa": false,
           // Password of your Wi-Fi where the OBS should log into in server mode
             "wifiPassword": "swordfish",
           // SSID of your Wi-Fi where the OBS should log into in server mode

src/OpenBikeSensorFirmware.cpp

@@ -249,7 +249,7 @@ void setup() {
     sdCount++;
     obsDisplay->showTextOnGrid(2,
                                obsDisplay->currentLine(), "SD... error " + String(sdCount));
-    if (config.simRaMode || button.read() == HIGH || sdCount > 10) {
+    if (button.read() == HIGH || sdCount > 10) {
       break;
     }
     delay(200);
@@ -280,7 +280,7 @@ void setup() {
     triggerServerMode = true;
   }
 
-  if (button.read() == HIGH || (!config.simRaMode && displayError != 0) || triggerServerMode) {
+  if (button.read() == HIGH || triggerServerMode) {
     obsDisplay->showTextOnGrid(2, obsDisplay->newLine(), "Start Server");
     ESP_ERROR_CHECK_WITHOUT_ABORT(
       esp_bt_mem_release(ESP_BT_MODE_BTDM)); // no bluetooth at all here.
@@ -339,9 +339,7 @@ void setup() {
     sensorManager->pollDistancesAlternating();
     reportBluetooth();
     gps.showWaitStatus(obsDisplay);
-    if (button.read() == HIGH
-        || (config.simRaMode && !gps.moduleIsAlive()) // no module && simRaMode
-      ) {
+    if (button.read() == HIGH) {
       log_d("Skipped get GPS...");
       obsDisplay->showTextOnGrid(2, obsDisplay->currentLine(), "...skipped");
       break;

src/config.cpp

@@ -39,7 +39,6 @@ const String ObsConfig::PROPERTY_OBS_NAME = String("obsName");
 const String ObsConfig::PROPERTY_NAME = String("name");
 const String ObsConfig::PROPERTY_BLUETOOTH = String("bluetooth");
 const String ObsConfig::PROPERTY_OFFSET = String("offset");
-const String ObsConfig::PROPERTY_SIM_RA = String("simRa");
 const String ObsConfig::PROPERTY_WIFI_SSID = String("wifiSsid");
 const String ObsConfig::PROPERTY_WIFI_PASSWORD = String("wifiPassword");
 const String ObsConfig::PROPERTY_PORTAL_URL = String("portalUrl");
@@ -139,7 +138,6 @@ void ObsConfig::makeSureSystemDefaultsAreSet() {
   JsonObject data = jsonData["obs"][0];
   ensureSet(data, PROPERTY_OBS_NAME, "OpenBikeSensor-" + String((uint16_t)(ESP.getEfuseMac() >> 32), 16));
   ensureSet(data, PROPERTY_NAME, "default");
-  ensureSet(data, PROPERTY_SIM_RA, false);
   ensureSet(data, PROPERTY_BLUETOOTH, false);
   data[PROPERTY_OFFSET][0] = data[PROPERTY_OFFSET][0] | 35;
   data[PROPERTY_OFFSET][1] = data[PROPERTY_OFFSET][1] | 35;
@@ -207,6 +205,12 @@ bool ObsConfig::setProperty(int profile, String const &key, T const &value) {
   return true; // value == oldValue;
 }
 
+bool ObsConfig::setProperty(int profile, String const &key, bool const &value) {
+  auto oldValue = jsonData["obs"][profile][key];
+  jsonData["obs"][profile][key] = value;
+  return value == oldValue;
+}
+
 bool ObsConfig::setProperty(int profile, String const &key, int const &value) {
   auto oldValue = jsonData["obs"][profile][key];
   jsonData["obs"][profile][key] = value;
@@ -368,7 +372,6 @@ void ObsConfig::fill(Config &cfg) const {
   cfg.confirmationTimeWindow = getProperty<int>(PROPERTY_CONFIRMATION_TIME_SECONDS);
   cfg.privacyConfig = getProperty<int>(PROPERTY_PRIVACY_CONFIG);
   cfg.bluetooth = getProperty<bool>(PROPERTY_BLUETOOTH);
-  cfg.simRaMode = getProperty<bool>(PROPERTY_SIM_RA);
   cfg.privacyAreas.clear();
   if (selectedProfile != 0) { // not sure if we ever support PAs per profile.
     for (int i = 0; i < jsonData["obs"][selectedProfile][PROPERTY_PRIVACY_AREA].size(); i++) {
@@ -414,7 +417,6 @@ void ObsConfig::parseOldJsonDocument(DynamicJsonDocument &doc) {
   setProperty(0, PROPERTY_CONFIRMATION_TIME_SECONDS, doc["confirmationTimeWindow"] | 5);
   setProperty(0, PROPERTY_PRIVACY_CONFIG, doc["privacyConfig"] | AbsolutePrivacy);
   setProperty(0, PROPERTY_BLUETOOTH, doc["bluetooth"] | false);
-  setProperty(0, PROPERTY_SIM_RA, doc["simRaMode"] | false);
 
   int numPrivacyAreas = doc["numPrivacyAreas"] | 0;
   // Append new values to the privacy-vector

src/config.h

@@ -72,7 +72,6 @@ struct Config {
   char obsUserID[64];
   uint displayConfig;
   bool bluetooth;
-  bool simRaMode;
   int privacyConfig;
   int confirmationTimeWindow;
   std::vector<PrivacyArea> privacyAreas;
@@ -100,6 +99,7 @@ class ObsConfig {
 
     bool setProperty(int profile, const String &key, std::string const &value);
     bool setProperty(int profile, const String &key, String const &value);
+    bool setProperty(int profile, const String &key, bool const &value);
     bool setProperty(int profile, const String &key, int const &value);
     template<typename T> bool setProperty(int profile, const String &key, T const &value);
     bool setOffsets(int profile, std::vector<int> const &value);

src/configServer.cpp

@@ -343,8 +343,6 @@ static const char* const configIndex =
   "<input name='obsUserID' placeholder='API Key' value='{userId}' >"
   "<h3>Operation</h3>"
   "Enable Bluetooth <input type='checkbox' name='bluetooth' {bluetooth}>"
-  "<hr>"
-  "SimRa Mode <input type='checkbox' name='simRaMode' {simRaMode}>"
   "<input type=submit class=btn value=Save>";
 
 static const char* const privacyIndexPostfix =
@@ -1155,8 +1153,6 @@ static void handleConfigSave(HTTPRequest * req, HTTPResponse * res) {
                             atoi(getParameter(params, "confirmationTimeWindow").c_str()));
   theObsConfig->setProperty(0, ObsConfig::PROPERTY_BLUETOOTH,
                             (bool) (getParameter(params, "bluetooth") == "on"));
-  theObsConfig->setProperty(0, ObsConfig::PROPERTY_SIM_RA,
-                            (bool) (getParameter(params, "simRaMode") == "on"));
   theObsConfig->setProperty(0, ObsConfig::PROPERTY_PORTAL_TOKEN,
                             getParameter(params, "obsUserID"));
   theObsConfig->setProperty(0, ObsConfig::PROPERTY_PORTAL_URL,
@@ -1227,8 +1223,6 @@ static void handleConfig(HTTPRequest *, HTTPResponse * res) {
 
   html = replaceHtml(html, "{bluetooth}",
                theObsConfig->getProperty<bool>(ObsConfig::PROPERTY_BLUETOOTH) ? "checked" : "");
-  html = replaceHtml(html, "{simRaMode}",
-               theObsConfig->getProperty<bool>(ObsConfig::PROPERTY_SIM_RA) ? "checked" : "");
 
   const uint privacyConfig = (uint) theObsConfig->getProperty<int>(
     ObsConfig::PROPERTY_PRIVACY_CONFIG);