Duy tran
iot_water_monitor_v2
Dependencies: easy-connect-v16 Watchdog FP MQTTPacket RecordType-v-16 watersenor_and_temp_code
Revision 56:3729bedac5ab, committed 2018-03-30
- Comitter:
- DuyLionTran
- Date:
- Fri Mar 30 10:55:27 2018 +0000
- Parent:
- 55:c405323f8d5a
- Child:
- 57:898fcb6692cd
- Commit message:
- * version 2.9.7 03-30-2018
Changed in this revision
| Application/CommandExecution.h | Show annotated file Show diff for this revision Revisions of this file |
| Application/main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/Application/CommandExecution.h Thu Mar 29 16:52:35 2018 +0000 +++ b/Application/CommandExecution.h Fri Mar 30 10:55:27 2018 +0000 @@ -3,9 +3,9 @@ #include <stdint.h> -#define RELAY_1_PIN (D10) -#define RELAY_2_PIN (D11) -#define RELAY_3_PIN (D12) +#define RELAY_1_PIN (D11) +#define RELAY_2_PIN (D12) +#define RELAY_3_PIN (D10) void CE_HandleRelays(int Relay1State, int Relay2State, int Relay3State); void CE_SetRTCTime(uint32_t CurrentEpochTime);
--- a/Application/main.cpp Thu Mar 29 16:52:35 2018 +0000
+++ b/Application/main.cpp Fri Mar 30 10:55:27 2018 +0000
@@ -15,6 +15,7 @@
* version 2.8.5 03-19-2018: Set time to turn on/off the relay
* version 2.9 03-22-2018: Watchdog worked. Some hardware bugs found
* version 2.9.7 03-29-2018: Try to upload 1 more time if upload fail
+ * version 2.9.7 03-30-2018
*/
/***************************************************************
@@ -34,9 +35,9 @@
***************************************************************/
//#define READ_ANALOG_SOFTTIMER
-#define READ_SECOND 1 /* Read timer every 1 second(s) */
+#define READ_SECOND 1 /* Read timer every 1 second(s) */
#define INTERVAL_BETWEEN_EACH_UPLOAD_TYPE 10 /* The interval between each upload type in second */
-#define RECONNECT_WIFI 60 /* Try to reconnect to wifi */
+#define RECONNECT_WIFI 60 /* Try to reconnect to wifi */
#ifdef READ_ANALOG_SOFTTIMER
#define READ_ANALOG_MS 30
#endif
@@ -168,7 +169,7 @@
void enableESP() {
espRs = 0;
espEn = 0;
- wait(1);
+ wait(2);
espEn = 1;
espRs = 1;
printf("ESP enabled\r\n");