Diff: cfg.cpp

Revision:

6:be97d38e0b01

Parent:

2:06fa34661f19

diff -r 6226f3c566ef -r be97d38e0b01 cfg.cpp
--- a/cfg.cpp	Wed May 11 16:42:35 2016 +0000
+++ b/cfg.cpp	Tue May 31 07:35:28 2016 +0000
@@ -7,6 +7,9 @@
 char  *CfgPassword;
 char  *CfgNtpIp;
 int    CfgBaud;
+int    CfgLogNetwork;
+char   CfgTankRom[8];
+char   CfgInletRom[8];
 
 static void saveString(char *value, char  **dest) {
     *dest = (char*)realloc(*dest, strlen(value) + 1); //strlen does not include the null so add 1
@@ -20,6 +23,10 @@
 static void saveInt   (char *value, int    *dest) {
     *dest = atoi(value);
 }
+static void saveRom (char *value, char* dest) {
+    char* p = value;
+    for (int i = 0; i < 8; i++) dest[i] = (char)strtoul(p, &p, 16);
+}
 static void rtrim     (int i, char *s) { //i is the length of the thing to trim
     while(1)
     {
@@ -32,17 +39,23 @@
 static void handleLine(int n, int v, char *name, char *value) {
     rtrim(n, name);
     rtrim(v, value);
-    if (strcmp(name, "ssid")                == 0) saveString   (value, &CfgSsid);
-    if (strcmp(name, "password")            == 0) saveString   (value, &CfgPassword);
-    if (strcmp(name, "ntp ip")              == 0) saveString   (value, &CfgNtpIp);
-    if (strcmp(name, "baud")                == 0) saveInt      (value, &CfgBaud);
+    if (strcmp(name, "ssid")                == 0) saveString(value, &CfgSsid);
+    if (strcmp(name, "password")            == 0) saveString(value, &CfgPassword);
+    if (strcmp(name, "ntp ip")              == 0) saveString(value, &CfgNtpIp);
+    if (strcmp(name, "baud")                == 0) saveInt   (value, &CfgBaud);
+    if (strcmp(name, "log network")         == 0) saveInt   (value, &CfgLogNetwork);
+    if (strcmp(name, "tank")                == 0) saveRom   (value,  CfgTankRom);
+    if (strcmp(name, "inlet")               == 0) saveRom   (value,  CfgInletRom);
 }
 static void resetValues(void) {
     
-    free(CfgSsid);     CfgSsid     = NULL;
-    free(CfgPassword); CfgPassword = NULL;
-    free(CfgNtpIp);    CfgNtpIp    = NULL;
-                       CfgBaud     = 0;
+    free(CfgSsid);     CfgSsid       = NULL;
+    free(CfgPassword); CfgPassword   = NULL;
+    free(CfgNtpIp);    CfgNtpIp      = NULL;
+                       CfgBaud       = 0;
+                       CfgLogNetwork = 0;
+                       memset(CfgTankRom,  0, 8);
+                       memset(CfgInletRom, 0, 8);
 }
 int CfgInit()   {