Refactor Settings_t to Settings

amalabey · Dec 6, 2020 · c7aa506 · c7aa506
1 parent 2dc7632
commit c7aa506
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -5,7 +5,7 @@
 #include "FS.h"
 #include "SPIFFS.h"
 
-struct Settings_t
+struct Settings
 {
  char *wifiSsid;
  char *wifiPassword;
@@ -19,10 +19,10 @@ struct Settings_t
 class Configuration
 {
 private:
- Settings_t readFromSerial(HardwareSerial &serial);
- Settings_t readFromFileSystem(fs::FS &fs);
+ Settings readFromSerial(HardwareSerial &serial);
+ Settings readFromFileSystem(fs::FS &fs);
 public:
- Settings_t getSettings(fs::FS &fs, HardwareSerial &serial);
+ Settings getSettings(fs::FS &fs, HardwareSerial &serial);
  bool isPersisted(fs::FS &fs);
- void persistSettings(fs::FS &fs, Settings_t settings);
+ void persistSettings(fs::FS &fs, Settings settings);
 };
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -34,12 +34,12 @@ int readLine(HardwareSerial &serial, const char* prompt, char* line, int maxSize
  }
 }
 
-Settings_t Configuration:: readFromSerial(HardwareSerial &serial)
+Settings Configuration:: readFromSerial(HardwareSerial &serial)
 {
  char *buffer = new char[1024];
  readLine(serial, "Enter connection parameters (wifi-ssid,wifi-psk,host,tenant,user,pwd,clientid):", buffer, 1024);
 
- Settings_t settings;
+ Settings settings;
  settings.wifiSsid = strtok(buffer, ",");
  settings.wifiPassword = strtok(NULL, ",");
  settings.hostName = strtok(NULL, ",");
@@ -51,7 +51,7 @@ Settings_t Configuration:: readFromSerial(HardwareSerial &serial)
  return settings;
 }
 
-Settings_t Configuration::getSettings(fs::FS &fs, HardwareSerial &serial)
+Settings Configuration::getSettings(fs::FS &fs, HardwareSerial &serial)
 {
  if(this->isPersisted(fs))
  {
@@ -66,7 +66,7 @@ bool Configuration::isPersisted(fs::FS &fs)
  return fs.exists(CONFIG_FILE_NAME);
 }
 
-void Configuration::persistSettings(fs::FS &fs, Settings_t settings)
+void Configuration::persistSettings(fs::FS &fs, Settings settings)
 {
  Serial.printf("Writing file: %s\r\n", CONFIG_FILE_NAME);
 
@@ -88,7 +88,7 @@ void Configuration::persistSettings(fs::FS &fs, Settings_t settings)
 }
 
 
-Settings_t Configuration::readFromFileSystem(fs::FS &fs)
+Settings Configuration::readFromFileSystem(fs::FS &fs)
 {
  Serial.printf("Reading file: %s\r\n", CONFIG_FILE_NAME);
 
@@ -109,7 +109,7 @@ Settings_t Configuration::readFromFileSystem(fs::FS &fs)
  }
  buffer[length] = '\0';
 
- Settings_t settings;
+ Settings settings;
  settings.wifiSsid = strtok(buffer, "\r\n");
  settings.wifiPassword = strtok(NULL, "\r\n");
  settings.hostName = strtok(NULL, "\r\n");

diff --git a/src/main.cpp b/src/main.cpp
@@ -20,7 +20,7 @@ DHT dht(DHTPIN, DHTTYPE);
 WiFiClientSecure _wifiClient = WiFiClientSecure();
 CumulocityClient _client = CumulocityClient(_wifiClient, (char *)"00000000");
 
-void connectCumulocityServer(Settings_t settings, bool requestDeviceCreds)
+void connectCumulocityServer(Settings settings, bool requestDeviceCreds)
 {
  Serial.println("Connecting to Cumulocity...");
  _client.setDeviceId(settings.clientId);
@@ -56,7 +56,7 @@ void setup()
  //SPIFFS.format();
 
  Configuration _config;
- Settings_t settings = _config.getSettings(SPIFFS, Serial);
+ Settings settings = _config.getSettings(SPIFFS, Serial);
 
  // Connect to Wifi
  WiFi.begin(settings.wifiSsid, settings.wifiPassword);