Diff: main.h

Revision:

14:0c8967e20f93

Parent:

13:f8e84b12665c

--- a/main.h	Tue Dec 19 19:31:23 2017 +0000
+++ b/main.h	Mon Jan 29 14:41:02 2018 +0000
@@ -18,19 +18,19 @@
 #define UPLOAD_PERIOD_S 30.0
 #define CHECK_PROXIMITY_PERIOD_S  1.0
 
-// Influx TSDB http server
-#define INFLUX_SERVER_URL "rpi1.nrjy.com"
-#define INFLUX_SERVER_PORT 8086
+// Influx TSDB http api
+#define INFLUX_SERVER_URL   "rpi1.nrjy.com"
+#define INFLUX_SERVER_PORT  8086
+#define INFLUX_WRITE_EP     "/write?db=HENV2&precision=s&rp=HENV2_1y"
 
-// time server to get current unix time and sync rtc
-#define TIME_SERVER_URL "www.convert-unix-time.com"
-#define TIME_SERVER_PORT 80
-#define TIME_SERVER_QUERY "/api?timestamp=now&timezone=New_York"
+// time server http api to get current unix time
+#define TIME_SERVER_URL     "www.convert-unix-time.com"
+#define TIME_SERVER_PORT    80
+#define TIME_SERVER_EP      "/api?timestamp=now&timezone=New_York"
 
-
-#define WIFI_WRITE_TIMEOUT 5000
-#define WIFI_READ_TIMEOUT  5000
-#define CONNECTION_TRIAL_MAX    5
+#define WIFI_WRITE_TIMEOUT 3000
+#define WIFI_READ_TIMEOUT  3000
+#define CONNECTION_TRIAL_MAX    3
 
 /* Nextion display macros */
 
@@ -42,6 +42,7 @@
 #define NO_WAKEUP_ON_SERIALIN   nextion.printf("usup=0\xff\xff\xff")
 #define WAKEUP_ON_TOUCH         nextion.printf("thup=1\xff\xff\xff")
 #define SLEEP_ON_NOTOUCH_30S    nextion.printf("thsp=30\xff\xff\xff")
+#define WAKE_UP_DISPLAY         nextion.printf("sleep=0\xff\xff\xff")
 
 
 /* Interface definition */
@@ -88,11 +89,7 @@
 float tempC_val2 = 0;
 
 
-
 /* Comm vars */
-char *InfluxServerUrl = INFLUX_SERVER_URL;
-char *influx_query = "/write?db=HENV2&precision=s&rp=HENV2_1y";
-uint16_t InfluxServerPort = INFLUX_SERVER_PORT;
 static   uint8_t http_request[1024];
 static   uint8_t http_resp[512];
 uint16_t reqLen;