Merge pull request #731 from visualapproach/development_v4

Development v4
visualapproach · Jun 16, 2024 · 6014305 · 6014305
2 parents a8d168e + 4a458c0
commit 6014305
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 149 deletions.
diff --git a/Code/data/index.html b/Code/data/index.html
@@ -478,7 +478,7 @@ <h2>Totals</h2>
     // hydro jets available
     document.getElementById("jets").style.display = msgobj.HASJETS ? "table-cell" : "none";
     document.getElementById("jetsswitch").style.display = msgobj.HASJETS ? "table-cell" : "none";
-    document.getElementById("jetstotals").style.display = msgobj.HASJETS ? "table-cell" : "none";
+    document.getElementById("jetstotals").style.display = msgobj.HASJETS ? "table-row" : "none";
     // godmode available
     document.getElementById("god").style.display = msgobj.HASGOD ? "table-cell" : "none";
     document.getElementById("godswitch").style.display = msgobj.HASGOD ? "table-cell" : "none";

diff --git a/Code/data/resetdaily b/Code/data/resetdaily
@@ -0,0 +1 @@
+{"LEN":1,"CMD":[16],"VALUE":[1],"XTIME":[1717711200],"INTERVAL":[86400],"TXT":["Reset"]}
diff --git a/Code/data/weekender2 b/Code/data/weekender2
@@ -0,0 +1 @@
+{"LEN":4,"CMD":[20,16,3,4],"VALUE":[1718985600,0,0,0],"XTIME":[1718548770,1718575200,1719169200,1719255600],"INTERVAL":[0,86400,604800,604800],"TXT":["","","",""]}
diff --git a/Code/lib/BWC_unified/FW_VERSION.h b/Code/lib/BWC_unified/FW_VERSION.h
@@ -1 +1 @@
-#define FW_VERSION "2024-06-08-1820"
+#define FW_VERSION "2024-06-10-2016"
diff --git a/Code/platformio.ini b/Code/platformio.ini
@@ -35,6 +35,7 @@ board_build.f_cpu = 160000000L
 ; board_build.f_flash = 80000000L;
 ; upload_speed = 921600 ; enable if you device are capable
 build_flags = 
+    -DBWC_DEBUGGING=1
 	-DWEBSOCKETS_NETWORK_TYPE="NETWORK_ESP8266_ASYNC"
     -DWEBSOCKETS_SAVE_RAM
     ; -DDEBUG_ESP_PORT=Serial
@@ -62,7 +63,7 @@ build_flags =
 monitor_filters = 
 	esp8266_exception_decoder
 	default
-    log2file
+    ; log2file
 upload_protocol = esptool
 ; upload_protocol = espota
 ; upload_port = layzspa.local

diff --git a/Code/readme.md b/Code/readme.md
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"LEN":1,"CMD":[16],"VALUE":[1],"XTIME":[1717711200],"INTERVAL":[86400],"TXT":["Reset"]}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"LEN":4,"CMD":[20,16,3,4],"VALUE":[1718985600,0,0,0],"XTIME":[1718548770,1718575200,1719169200,1719255600],"INTERVAL":[0,86400,604800,604800],"TXT":["","","",""]}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define FW_VERSION "2024-06-08-1820"
		#define FW_VERSION "2024-06-10-2016"