iot_water_monitor_v2
Dependencies: easy-connect-v16 Watchdog FP MQTTPacket RecordType-v-16 watersenor_and_temp_code
Diff: Simple-MQTT/SimpleMQTT.h
- Revision:
- 55:c405323f8d5a
- Parent:
- 52:5546fa1b67b5
- Child:
- 57:898fcb6692cd
diff -r d8dda8394353 -r c405323f8d5a Simple-MQTT/SimpleMQTT.h --- a/Simple-MQTT/SimpleMQTT.h Fri Mar 23 17:18:08 2018 +0000 +++ b/Simple-MQTT/SimpleMQTT.h Thu Mar 29 16:52:35 2018 +0000 @@ -229,19 +229,19 @@ KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); ret = json.tokenIntegerValue(KeyValueIndex, receiveCmdID); + KeyIndex = json.findKeyIndexIn("relayState0", 0); + KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); + ret = json.tokenIntegerValue(KeyValueIndex, relayState1); + KeyIndex = json.findKeyIndexIn("relayState1", 0); KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); - ret = json.tokenIntegerValue(KeyValueIndex, relayState1); + ret = json.tokenIntegerValue(KeyValueIndex, relayState2); KeyIndex = json.findKeyIndexIn("relayState2", 0); KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); - ret = json.tokenIntegerValue(KeyValueIndex, relayState2); - - KeyIndex = json.findKeyIndexIn("relayState3", 0); - KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); ret = json.tokenIntegerValue(KeyValueIndex, relayState3); - if (DataStruct.CONFIG_Mode == 1) { + if (DataStruct.CONFIG_Mode == 0) { DataStruct.RELAY_State_1 = relayState1; DataStruct.RELAY_State_2 = relayState2; DataStruct.RELAY_State_3 = relayState3; @@ -252,7 +252,7 @@ break; case 3: printf("Set config values\r\n"); - int mode, OxiThres, TempThres, uploadInterval, setRTCTime; + int mode, OxiThres, TempThres, uploadInterval; KeyIndex = json.findKeyIndexIn("cmdID", 0); KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); ret = json.tokenIntegerValue(KeyValueIndex, receiveCmdID); @@ -272,21 +272,34 @@ KeyIndex = json.findKeyIndexIn("uploadInterval", 0); KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); ret = json.tokenIntegerValue(KeyValueIndex, uploadInterval); - - KeyIndex = json.findKeyIndexIn("setRTCTime", 0); - KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); - ret = json.tokenIntegerValue(KeyValueIndex, setRTCTime); - + DataStruct.CONFIG_Mode = mode; DataStruct.CONFIG_OxyThreshold = OxiThres; DataStruct.CONFIG_TemperatureThreshold = TempThres; - DataStruct.CONFIG_UploadInterval = uploadInterval * 60; + DataStruct.CONFIG_UploadInterval = uploadInterval * 60; + printf("OMode %d\r\n", DataStruct.CONFIG_Mode ); + printf("Oxygen Threshold*10 %dppm(*100)\r\n", DataStruct.CONFIG_OxyThreshold); + printf("Temperature Threshold %d*C\r\n", DataStruct.CONFIG_TemperatureThreshold); + printf("Periodic upload time %ds\r\n", DataStruct.CONFIG_UploadInterval); FP_WriteConfigValues(DataStruct.CONFIG_Mode, DataStruct.CONFIG_OxyThreshold, DataStruct.CONFIG_TemperatureThreshold, DataStruct.CONFIG_UploadInterval); - CE_SetRTCTime(setRTCTime); + break; case 4: printf("Synchronize data\r\n"); CE_UpdateImmediately(); + case 5: printf("Set time\r\n"); + int setRTCTime; + KeyIndex = json.findKeyIndexIn("cmdID", 0); + KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); + ret = json.tokenIntegerValue(KeyValueIndex, receiveCmdID); + + KeyIndex = json.findKeyIndexIn("setRTCTime", 0); + KeyValueIndex = json.findChildIndexOf(KeyIndex, 0); + ret = json.tokenIntegerValue(KeyValueIndex, setRTCTime); + + printf("Epoch time %d\r\n", (uint32_t)setRTCTime); + CE_SetRTCTime((uint32_t)setRTCTime); + break; default: break; @@ -379,7 +392,10 @@ // or maybe just add the proper members to do this disconnect and call MQTT_AttemptConnect(...) // this works - reset the system when the retry count gets to a threshold if (retryAttempt == 5) - NVIC_SystemReset(); + { + /* RESET ESP */ + NVIC_SystemReset(); + } else wait(timeout); }