iot_water_monitor_v2
Dependencies: easy-connect-v16 Watchdog FP MQTTPacket RecordType-v-16 watersenor_and_temp_code
Diff: Simple-MQTT/SimpleMQTT.h
- Revision:
- 47:c3707a4f69a7
- Parent:
- 45:92da959d624b
- Child:
- 48:a7ed665844cd
diff -r f545b8f7f242 -r c3707a4f69a7 Simple-MQTT/SimpleMQTT.h --- a/Simple-MQTT/SimpleMQTT.h Thu Mar 08 13:59:35 2018 +0000 +++ b/Simple-MQTT/SimpleMQTT.h Thu Mar 08 14:19:48 2018 +0000 @@ -390,15 +390,15 @@ const char* pubTopic = MQTT_EVENT_TOPIC; char buf[MQTT_MAX_PAYLOAD_SIZE]; - char timeBuf[50]; +// char timeBuf[50]; if (!client->isConnected()) { printf ("---> MQTT DISCONNECTED\n\r"); return MQTT::FAILURE; } - strftime(timeBuf, 50, "%Y/%m/%d %H:%M:%S", localtime(&inputTime)); - sprintf(buf, "{\"type\":2,\"deviceId\":\"PROEVN\",\"time\":\"%s\",\"cmdId\":%d,\"temperature0\":%.2f,\"oxygen0\":%.2f}", - timeBuf, commandID, TempVal ,DOVal); +// strftime(timeBuf, 50, "%Y/%m/%d %H:%M:%S", localtime(&inputTime)); + sprintf(buf, "{\"type\":2,\"deviceId\":\"PROEVN\",\"time\":\"%d\",\"cmdId\":%d,\"temperature0\":%.2f,\"oxygen0\":%.2f}", + inputTime, commandID, TempVal ,DOVal); message.qos = MQTT::QOS0; message.retained = false; message.dup = false; @@ -416,15 +416,15 @@ MQTT::Message message; const char* pubTopic = MQTT_EVENT_TOPIC; char buf[MQTT_MAX_PAYLOAD_SIZE]; - char timeBuf[50]; +// char timeBuf[50]; if (!client->isConnected()) { printf ("---> MQTT DISCONNECTED\n\r"); return MQTT::FAILURE; } - strftime(timeBuf, 50, "%Y/%m/%d %H:%M:%S", localtime(&inputTime)); +// strftime(timeBuf, 50, "%Y/%m/%d %H:%M:%S", localtime(&inputTime)); sprintf(buf, "{\"type\":3,\"deviceId\":\"PROEVN\",\"time\":\"%s\",\"cmdId\":%d,\"relay1\":%d,\"relay2\":%d,\"relay3\":%d}", - timeBuf, commandID, relay1, relay2, relay3); + inputTime, commandID, relay1, relay2, relay3); message.qos = MQTT::QOS0; message.retained = false; message.dup = false; @@ -443,15 +443,15 @@ MQTT::Message message; const char* pubTopic = MQTT_EVENT_TOPIC; char buf[MQTT_MAX_PAYLOAD_SIZE]; - char timeBuf[50]; +// char timeBuf[50]; if (!client->isConnected()) { printf ("---> MQTT DISCONNECTED\n\r"); return MQTT::FAILURE; } - strftime(timeBuf, 50, "%Y/%m/%d %H:%M:%S", localtime(&inputTime)); +// strftime(timeBuf, 50, "%Y/%m/%d %H:%M:%S", localtime(&inputTime)); sprintf(buf, "{\"type\":4,\"deviceId\":\"PROEVN\",\"time\":\"%s\",\"cmdId\":%d,\"mode\":%d,\"OxygenThreshold\":%d,\"TemperatureThreshold\":%d,\"uploadInterval\":%d}", - timeBuf, commandID, mode, OxyThreshold, TemperatureThreshold, UploadInterval); + inputTime, commandID, mode, OxyThreshold, TemperatureThreshold, UploadInterval); message.qos = MQTT::QOS0; message.retained = false; message.dup = false;