Merge pull request #517 from visualapproach/development_v4

Development v4
visualapproach · May 19, 2023 · f9bc945 · f9bc945
2 parents 22e7ec1 + 677fcfe
commit f9bc945
Show file tree

Hide file tree

Showing 24 changed files with 290 additions and 255 deletions.
diff --git a/Code/data/hwconfig.html b/Code/data/hwconfig.html
@@ -119,8 +119,8 @@ <h2>Hardware:</h2>
 				<tr>
 					<td>DSP</td>
 					<td>
-						data/td/rx<input type="text" id="pin4" maxlength="2" style="width:30px">
-						clk/tx<input type="text" id="pin5" maxlength="2" style="width:30px">
+						data/td/tx<input type="text" id="pin4" maxlength="2" style="width:30px">
+						clk/rx<input type="text" id="pin5" maxlength="2" style="width:30px">
 						cs/ld<input type="text" id="pin6" maxlength="2" style="width:30px">
 						audio<input type="text" id="pin7" maxlength="2" style="width:30px">
 					</td>
@@ -174,8 +174,8 @@ <h2>Hardware:</h2>
 			}
 			if(dsp == 4 || dsp == 5 || dsp == 6 || dsp == 7 || dsp == 8)
 			{
-				p4 = 7;
-				p5 = 6;
+				p4 = 6;
+				p5 = 7;
 				p6 = null;
 				p7 = null;
 			}
@@ -202,8 +202,8 @@ <h2>Hardware:</h2>
 			}
 			if(dsp == 4 || dsp == 5 || dsp == 6 || dsp == 7 || dsp == 8)
 			{
-				p4 = 5;
-				p5 = 4;
+				p4 = 4;
+				p5 = 5;
 				p6 = null;
 				p7 = null;
 			}
@@ -230,8 +230,8 @@ <h2>Hardware:</h2>
 			}
 			if(dsp == 4 || dsp == 5 || dsp == 6 || dsp == 7 || dsp == 8)
 			{
-				p4 = 3;
-				p5 = 4;
+				p4 = 4;
+				p5 = 3;
 				p6 = null;
 				p7 = null;
 			}

diff --git a/Code/datazip/chkupdatefw.html.gz b/Code/datazip/chkupdatefw.html.gz
diff --git a/Code/datazip/config.html.gz b/Code/datazip/config.html.gz
diff --git a/Code/datazip/favicon.ico.gz b/Code/datazip/favicon.ico.gz
diff --git a/Code/datazip/function.js.gz b/Code/datazip/function.js.gz
diff --git a/Code/datazip/hwconfig.html.gz b/Code/datazip/hwconfig.html.gz
diff --git a/Code/datazip/hwtestinfo.html.gz b/Code/datazip/hwtestinfo.html.gz
diff --git a/Code/datazip/index.html.gz b/Code/datazip/index.html.gz
diff --git a/Code/datazip/index.js.gz b/Code/datazip/index.js.gz
diff --git a/Code/datazip/main.css.gz b/Code/datazip/main.css.gz
diff --git a/Code/datazip/mqtt.html.gz b/Code/datazip/mqtt.html.gz
diff --git a/Code/datazip/remove.html.gz b/Code/datazip/remove.html.gz
diff --git a/Code/datazip/success.html.gz b/Code/datazip/success.html.gz
diff --git a/Code/datazip/upload.html.gz b/Code/datazip/upload.html.gz
diff --git a/Code/datazip/webconfig.html.gz b/Code/datazip/webconfig.html.gz
diff --git a/Code/datazip/wifi.html.gz b/Code/datazip/wifi.html.gz
diff --git a/Code/fw/firmware.bin b/Code/fw/firmware.bin
diff --git a/Code/fw/version.txt b/Code/fw/version.txt
@@ -1 +1 @@
-2023-05-13-1551
+2023-05-19-1021
diff --git a/Code/lib/BWC_unified/bwc.cpp b/Code/lib/BWC_unified/bwc.cpp
@@ -781,7 +781,7 @@ String BWC::getJSONStates() {
     doc[F("HJT")] = cio->cio_states.jets;
     doc[F("BRT")] = dsp->dsp_states.brightness;
     doc[F("ERR")] = cio->cio_states.error;
-    doc[F("GOD")] = cio->cio_states.godmode;
+    doc[F("GOD")] = (uint8_t)cio->cio_states.godmode;
     doc[F("TGT")] = cio->cio_states.target;
     doc[F("TMP")] = cio->cio_states.temperature;
     doc[F("VTMC")] = _virtual_temp;

diff --git a/Code/lib/dsp/DSP_4W.cpp b/Code/lib/dsp/DSP_4W.cpp
@@ -1,7 +1,7 @@
 #include "DSP_4W.h"
 #include "util.h"
 
-void DSP_4W::setup(int dsp_rx, int dsp_tx, int dummy, int dummy2)
+void DSP_4W::setup(int dsp_tx, int dsp_rx, int dummy, int dummy2)
 {
     _dsp_serial.begin(9600, SWSERIAL_8N1, dsp_tx, dsp_rx, false, 63);
     _dsp_serial.setTimeout(20);

diff --git a/Code/lib/dsp/DSP_4W.h b/Code/lib/dsp/DSP_4W.h
@@ -9,7 +9,7 @@ class DSP_4W : public DSP
     public:
         DSP_4W(){};
         virtual ~DSP_4W(){};
-        void setup(int dsp_rx, int dsp_tx, int dummy, int dummy2);
+        void setup(int dsp_tx, int dsp_rx, int dummy, int dummy2);
         void stop();
         void pause_resume(bool action) override;
         void updateToggles();

diff --git a/Code/src/config.h b/Code/src/config.h
@@ -5,7 +5,7 @@
 #include <WiFi.h>
 #endif
 #define DEVICE_NAME "layzspa"
-#define FW_VERSION "2023-05-13-1551"
+#define FW_VERSION "2023-05-19-1021"
 
 #define HA_PREFIX "homeassistant"
 #define PROM_NAMESPACE "layzspa"