Diff: Simple-MQTT/SimpleMQTT.h

Revision:

33:5b90257d2d57

Parent:

32:8226837c56ae

Child:

34:601effb7b7fe

--- a/Simple-MQTT/SimpleMQTT.h	Mon Jan 08 18:07:56 2018 +0000
+++ b/Simple-MQTT/SimpleMQTT.h	Sun Jan 21 13:04:06 2018 +0000
@@ -47,8 +47,10 @@
     float SENSOR_PHVal;
     float SENSOR_D0Val;
     
-    int   RELAY_State_1;
-    int   RELAY_State_2;
+    uint8_t   RELAY_State_1;
+    uint8_t   RELAY_State_2;
+    
+    uint32_t CONFIG_Time;
 	
 	uint8_t  CONFIG_Mode;
 	uint8_t  CONFIG_MinOxi;
@@ -62,6 +64,7 @@
 static char type[30]        = TYPE;
 static char auth_token[30]  = AUTH_TOKEN;       // Auth_token is only used in non-quickstart mode
 static int  connack_rc      = 0;                // MQTT connack return code
+static bool wifiConnected   = true;
 static bool netConnecting   = false;
 static bool mqttConnecting  = false;
 static bool netConnected    = false;
@@ -181,25 +184,26 @@
             printf("Command Type: %d, error %d\r\n", CommandType, ret);
             
             switch (CommandType) {
-            	case 3: int relayState0, relayState1;
+            	case 3: int relayState1, relayState2;
             			KeyIndex      = json.findKeyIndexIn("cmdID", 0);
             			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
             			ret = json.tokenIntegerValue(KeyValueIndex, receiveCmdID); 
             			
-            			KeyIndex      = json.findKeyIndexIn("relayState0", 0);
-            			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
-            			ret = json.tokenIntegerValue(KeyValueIndex, relayState0); 
-            			
             			KeyIndex      = json.findKeyIndexIn("relayState1", 0);
             			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
-            			ret = json.tokenIntegerValue(KeyValueIndex, relayState1);
+            			ret = json.tokenIntegerValue(KeyValueIndex, relayState1); 
             			
-            			DataStruct.RELAY_State_1 = relayState0;     
-            			DataStruct.RELAY_State_2 = relayState1;         		
-            			CE_HandleRelays(relayState0, relayState1);
+            			KeyIndex      = json.findKeyIndexIn("relayState2", 0);
+            			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
+            			ret = json.tokenIntegerValue(KeyValueIndex, relayState2);
+            			
+            			DataStruct.RELAY_State_1 = relayState1;     
+            			DataStruct.RELAY_State_2 = relayState2;   
+            			FP_WriteRelayStates(DataStruct.RELAY_State_1, DataStruct.RELAY_State_2);      		
+            			CE_HandleRelays(relayState1, relayState2);
             	break;
             	
-            	case 4: int mode, minOxiVal, maxOxiVal;
+            	case 4: int mode, minOxiVal, maxOxiVal, uploadInterval;
             			KeyIndex      = json.findKeyIndexIn("cmdID", 0);
             			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
             			ret = json.tokenIntegerValue(KeyValueIndex, receiveCmdID); 
@@ -215,11 +219,16 @@
             			KeyIndex      = json.findKeyIndexIn("maxOxygenVal", 0);
             			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
             			ret = json.tokenIntegerValue(KeyValueIndex, maxOxiVal);     
+            		
+            			KeyIndex      = json.findKeyIndexIn("uploadInterval", 0);
+            			KeyValueIndex = json.findChildIndexOf(KeyIndex, 0);
+            			ret = json.tokenIntegerValue(KeyValueIndex, uploadInterval);     
             			
-            			DataStruct.CONFIG_Mode   = mode;   
-            			DataStruct.CONFIG_MinOxi = minOxiVal;   
-            			DataStruct.CONFIG_MaxOxi = maxOxiVal;   
-            			//DataStruct.CONFIG_UploadInterval = relayState0;       			
+            			DataStruct.CONFIG_Mode   		 = mode;   
+            			DataStruct.CONFIG_MinOxi 		 = minOxiVal;   
+            			DataStruct.CONFIG_MaxOxi 		 = maxOxiVal;   
+            			DataStruct.CONFIG_UploadInterval = uploadInterval;			
+            			FP_WriteConfigValues(DataStruct.CONFIG_Mode, DataStruct.CONFIG_MinOxi, DataStruct.CONFIG_MaxOxi, DataStruct.CONFIG_UploadInterval);  			
             	break;
             	
             	default: break;