Add settings command and SD CS

esp32_marauder/CommandLine.cpp

@@ -107,6 +107,7 @@ void CommandLine::runCommand(String input) {
   if (cmd_args.get(0) == HELP_CMD) {
     Serial.println(HELP_HEAD);
     Serial.println(HELP_CH_CMD);
+    Serial.println(HELP_SETTINGS_CMD);
     Serial.println(HELP_CLEARAP_CMD_A);
     Serial.println(HELP_CLEARAP_CMD_B);
     Serial.println(HELP_REBOOT_CMD);
@@ -189,6 +190,14 @@ void CommandLine::runCommand(String input) {
       wifi_scan_obj.RunClearSSIDs();
   }
 
+  else if (cmd_args.get(0) == SETTINGS_CMD) {
+    int ss_sw = this->argSearch(&cmd_args, "-s"); // Set setting
+
+    if (ss_sw == -1) {
+      settings_obj.printJsonSettings(settings_obj.getSettingsString());
+    }
+  }
+
   else if (cmd_args.get(0) == REBOOT_CMD) {
     Serial.println("Rebooting...");
     ESP.restart();

esp32_marauder/CommandLine.h

@@ -11,6 +11,7 @@
 #include "WiFiScan.h"
 #include "Web.h"
 #include "SDInterface.h"
+#include "settings.h"
 
 #ifdef HAS_SCREEN
   extern MenuFunctions menu_function_obj;
@@ -20,6 +21,7 @@
 extern WiFiScan wifi_scan_obj;
 extern Web web_obj;
 extern SDInterface sd_obj;
+extern Settings settings_obj;
 extern LinkedList<AccessPoint>* access_points;
 extern LinkedList<ssid>* ssids;
 extern const String PROGMEM version_number;
@@ -32,6 +34,7 @@ const char PROGMEM CLEARAP_CMD[] = "clearlist";
 const char PROGMEM REBOOT_CMD[] = "reboot";
 const char PROGMEM UPDATE_CMD[] = "update";
 const char PROGMEM HELP_CMD[] = "help";
+const char PROGMEM SETTINGS_CMD[] = "settings";
 
 // WiFi sniff/scan
 const char PROGMEM SCANAP_CMD[] = "scanap";
@@ -69,6 +72,7 @@ const char PROGMEM HELP_CLEARAP_CMD_B[] = "clearlist -s";
 const char PROGMEM HELP_REBOOT_CMD[] = "reboot";
 const char PROGMEM HELP_UPDATE_CMD_A[] = "update -s";
 const char PROGMEM HELP_UPDATE_CMD_B[] = "update -w";
+const char PROGMEM HELP_SETTINGS_CMD[] = "settings [-s <setting> <value>]";
 
 // WiFi sniff/scan
 const char PROGMEM HELP_SCANAP_CMD[] = "scanap";

esp32_marauder/configs.h

@@ -11,7 +11,7 @@
   //#define GENERIC_ESP32
   #define MARAUDER_FLIPPER
 
-  #define MARAUDER_VERSION "v0.9.11"
+  #define MARAUDER_VERSION "v0.9.12"
 
   //// BUTTON DEFINITIONS
   #ifdef MARAUDER_MINI
@@ -351,7 +351,7 @@
   #endif
 
   #ifdef MARAUDER_FLIPPER
-    #define SD_CS -1
+    #define SD_CS 10
   #endif
   //// END SD DEFINITIONS
 

esp32_marauder/settings.h

@@ -20,7 +20,6 @@ class Settings {
   private:
     String json_settings_string;
     
-    void printJsonSettings(String json_string);
     bool createDefaultSettings(fs::FS &fs);
 
   public:
@@ -50,6 +49,7 @@ class Settings {
     //uint8_t loadSetting<uint8_t>(String key);
 
     String getSettingsString();
+    void printJsonSettings(String json_string);
     void main(uint32_t currentTime);
 };