Remove special "DEVELOP" setting, is not supported anymore

- fixes #307

Author: amandel

docs/software/firmware/obs_cfg.md

@@ -32,8 +32,6 @@ relevant put the order of the array content.
             "bluetooth": true,
           // time window for overtake measurement confirmation
             "confirmationTimeSeconds": 4,
-          // Bitfield for some internal developer features 
-            "devConfig": 0,
           // Bitfield display config, see DisplayOptions for details, 
           // as noted all subject to change!
             "displayConfig": 15,

src/OpenBikeSensorFirmware.cpp

@@ -600,9 +600,6 @@ bool loadConfig(ObsConfig &cfg) {
   cfg.fill(config);
 
   // Setup display, this is not the right place ;)
-  if(config.devConfig & ShowGrid) {
-    displayTest->showGrid(true);
-  }
   if (config.displayConfig & DisplayInvert) {
     displayTest->invert();
   } else {

src/config.cpp

@@ -47,7 +47,6 @@ const String ObsConfig::PROPERTY_PORTAL_TOKEN = String("portalToken");
 const String ObsConfig::PROPERTY_DISPLAY_CONFIG = String("displayConfig");
 const String ObsConfig::PROPERTY_CONFIRMATION_TIME_SECONDS = String("confirmationTimeSeconds");
 const String ObsConfig::PROPERTY_PRIVACY_CONFIG = String("privacyConfig");
-const String ObsConfig::PROPERTY_DEVELOPER = String("devConfig");
 const String ObsConfig::PROPERTY_SELECTED_PRESET = String("selectedPreset");
 const String ObsConfig::PROPERTY_PRIVACY_AREA = String("privacyArea");
 const String ObsConfig::PROPERTY_PA_LAT = String("lat");
@@ -168,7 +167,6 @@ void ObsConfig::makeSureSystemDefaultsAreSet() {
   if (getProperty<int>(PROPERTY_CONFIRMATION_TIME_SECONDS) == 0) {
     data[PROPERTY_CONFIRMATION_TIME_SECONDS] = 5;
   }
-  ensureSet(data, PROPERTY_DEVELOPER, 0);
   ensureSet(data, PROPERTY_SELECTED_PRESET, 0);
   if (!data.containsKey(PROPERTY_PRIVACY_AREA)) {
     data.createNestedArray(PROPERTY_PRIVACY_AREA);
@@ -365,7 +363,6 @@ void ObsConfig::fill(Config &cfg) const {
   cfg.privacyConfig = getProperty<int>(PROPERTY_PRIVACY_CONFIG);
   cfg.bluetooth = getProperty<bool>(PROPERTY_BLUETOOTH);
   cfg.simRaMode = getProperty<bool>(PROPERTY_SIM_RA);
-  cfg.devConfig = getProperty<int>(PROPERTY_DEVELOPER);
   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++) {
@@ -412,7 +409,6 @@ void ObsConfig::parseOldJsonDocument(DynamicJsonDocument &doc) {
   setProperty(0, PROPERTY_PRIVACY_CONFIG, doc["privacyConfig"] | AbsolutePrivacy);
   setProperty(0, PROPERTY_BLUETOOTH, doc["bluetooth"] | false);
   setProperty(0, PROPERTY_SIM_RA, doc["simRaMode"] | false);
-  setProperty(0, PROPERTY_DEVELOPER, doc["devConfig"] | 0);
 
   int numPrivacyAreas = doc["numPrivacyAreas"] | 0;
   // Append new values to the privacy-vector

src/config.h

@@ -73,7 +73,6 @@ struct Config {
   uint displayConfig;
   bool bluetooth;
   bool simRaMode;
-  int devConfig;
   int privacyConfig;
   int confirmationTimeWindow;
   std::vector<PrivacyArea> privacyAreas;
@@ -135,7 +134,6 @@ class ObsConfig {
     static const String PROPERTY_DISPLAY_CONFIG;
     static const String PROPERTY_CONFIRMATION_TIME_SECONDS;
     static const String PROPERTY_PRIVACY_CONFIG;
-    static const String PROPERTY_DEVELOPER;
     static const String PROPERTY_SELECTED_PRESET;
     static const String PROPERTY_PRIVACY_AREA;
     static const String PROPERTY_PA_LAT;

src/configServer.cpp

@@ -197,8 +197,7 @@ static const char* const navigationIndex =
   "<input type=button onclick=\"window.location.href='/sd'\" class=btn value='Show SD Card Contents'>"
   "<input type=button onclick=\"window.location.href='/about'\" class=btn value='About'>"
   "<input type=button onclick=\"window.location.href='/delete'\" class=btn value='Delete'>"
-  "<input type=button onclick=\"window.location.href='/reboot'\" class=btn value='Reboot'>"
-  "{dev}";
+  "<input type=button onclick=\"window.location.href='/reboot'\" class=btn value='Reboot'>";
 
 static const char* const httpsRedirect =
   "<h3>HTTPS</h3>"
@@ -292,19 +291,6 @@ updateFirmwareList();
 <h3>File Upload</h3>
 )"""";
 
-
-
-// #########################################
-// Development Index
-// #########################################
-
-static const char* const devIndex =
-  "<h3>Display</h3>"
-  "Show Grid<br><input type='checkbox' name='showGrid' {showGrid}>"
-  "Print WLAN password to serial<br><input type='checkbox' name='printWifiPassword' {printWifiPassword}>"
-  "<input type=submit class=btn value=Save>"
-  "<hr>";
-
 // #########################################
 // Config
 // #########################################
@@ -561,10 +547,7 @@ void registerPages(HTTPServer * httpServer) {
   httpServer->registerNode(new ResourceNode("/updateSdUrl", HTTP_POST, handleFirmwareUpdateSdUrlAction));
   httpServer->registerNode(new ResourceNode("/delete", HTTP_GET, handleDelete));
   httpServer->registerNode(new ResourceNode("/delete", HTTP_POST, handleDeleteAction));
-#ifdef DEVELOP
-  httpServer->registerNode(new ResourceNode("/settings/development/action", HTTP_GET, handleDevAction));
-    httpServer->registerNode(new ResourceNode("/settings/development", HTTP_GET, handleDev));
-#endif
+  httpServer->registerNode(new ResourceNode("/privacy_action", HTTP_POST, handlePrivacyAction));
   httpServer->registerNode(new ResourceNode("/privacy_action", HTTP_POST, handlePrivacyAction));
   httpServer->registerNode(new ResourceNode("/gps", HTTP_GET, handleGps));
   httpServer->registerNode(new ResourceNode("/upload", HTTP_GET, handleUpload));
@@ -858,11 +841,6 @@ static void handleIndex(HTTPRequest *, HTTPResponse * res) {
 // ###############################################################
   String html = createPage(navigationIndex);
   html = replaceDefault(html, "Navigation");
-#ifdef DEVELOP
-  html.replace("{dev}", development);
-#else
-  html.replace("{dev}", "");
-#endif
   sendHtml(res, html);
 }
 
@@ -924,7 +902,7 @@ static void handleAbout(HTTPRequest *req, HTTPResponse * res) {
 #ifdef DEVELOP
     "true"
 #else
-                   "false"
+    "false"
 #endif
   );
 #ifdef CONFIG_LOG_DEFAULT_LEVEL
@@ -1272,34 +1250,6 @@ static void handleConfig(HTTPRequest *, HTTPResponse * res) {
   sendHtml(res, html);
 }
 
-#ifdef DEVELOP
-static void handleDevAction(HTTPRequest *req, HTTPResponse *res) {
-  auto params = req->getParams();
-  theObsConfig->setBitMaskProperty(0, ObsConfig::PROPERTY_DEVELOPER, ShowGrid,
-                                   getParameter(params, "showGrid") == "on");
-  theObsConfig->setBitMaskProperty(0, ObsConfig::PROPERTY_DEVELOPER, PrintWifiPassword,
-                                   getParameter(params, "printWifiPassword") == "on");
-  theObsConfig->saveConfig();
-  sendRedirect(res, "/settings/development");
-}
-
-static void handleDev(HTTPRequest *, HTTPResponse *res) {
-  String html = createPage(devIndex);
-  html = replaceDefault(html, "Development Setting", "/settings/development/action");
-
-  // SHOWGRID
-  bool showGrid = theObsConfig->getBitMaskProperty(
-    0, ObsConfig::PROPERTY_DEVELOPER, ShowGrid);
-  html.replace("{showGrid}", showGrid ? "checked" : "");
-
-  bool printWifiPassword = theObsConfig->getBitMaskProperty(
-    0, ObsConfig::PROPERTY_DEVELOPER, PrintWifiPassword);
-  html.replace("{printWifiPassword}", printWifiPassword ? "checked" : "");
-
-  sendHtml(res, html);
-}
-#endif
-
 /* Upload tracks found on SD card to the portal server->
  * This method also takes care to give appropriate feedback
  * to the user about the progress. If httpRequest is true