feat: add docker command & trim sse message

jqrbp · May 7, 2021 · 0cfb27e · 0cfb27e
1 parent 2a9b879
commit 0cfb27e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/commands/cmd_run_docker.sh b/commands/cmd_run_docker.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker run --name wemos-gps-backend -v $(pwd)/../data:/usr/share/nginx/html:ro -p8080:80 -d nginx
diff --git a/data/index.html b/data/index.html
@@ -38,13 +38,6 @@ <h1 id="loaderTxt">Loading...</h1>
                     <td><input id="qy" value="0"></input></td>
                     <td><input id="qz" value="0"></input></td>
 				</tr>
-                <tr>
-					<td>dmp Quat</td>
-                    <td><input id="dqw" value="1"></input></td>
-                    <td><input id="dqx" value="0"></input></td>
-                    <td><input id="dqy" value="0"></input></td>
-                    <td><input id="dqz" value="0"></input></td>
-				</tr>
                 <tr>
 					<td>R Quat</td>
                     <td><input id="qrw" value="1"></input></td>
@@ -54,13 +47,6 @@ <h1 id="loaderTxt">Loading...</h1>
 				</tr>
                 <tr><td></td><td></td><td></td><td></td><td></td></tr>
                 <tr><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr>
-					<td>RPY</td>
-                    <td><input id="r" value="invalid"></input></td>
-                    <td><input id="p" value="invalid"></input></td>
-                    <td><input id="y" value="invalid"></input></td>
-                    <td></td>
-				</tr>
                 <tr>
 					<td>Accel</td>
                     <td><input id="ax" value="invalid"></input></td>

diff --git a/data/ssehandler.js b/data/ssehandler.js
@@ -73,6 +73,10 @@ function setMyJson(_val) {
 	return false;
 }
 
+function setValID(_id, _val) {
+    getID(_id).value = _val;
+}
+
 function setMyJsonRadToDeg(_val) {
 	if(chkMyJSON(_val)) {
 		getID(_val).value = (myJSON[_val]*180/Math.PI).toFixed(4);
@@ -105,19 +109,25 @@ function got_packet(msgdata) {
 
             //object quaternion
 			setMyJson("qw"); setMyJson("qx"); setMyJson("qy"); setMyJson("qz");
-            setMyJson("dqw"); setMyJson("dqx"); setMyJson("dqy"); setMyJson("dqz");
-            setMyJsonRadToDeg("r"); setMyJsonRadToDeg("p"); setMyJsonRadToDeg("y");
             setMyJson("ax"); setMyJson("ay"); setMyJson("az");
-            setMyJson("lat1"); setMyJson("lat2"); setMyJson("lng1"); setMyJson("lng2");
+
 
             if(chkMyJSON("h")) {
-                getID("heading").value = (myJSON.h*180/Math.PI).toFixed(2);
+                setValID("heading",(myJSON.h*180/Math.PI).toFixed(2));
                 document.getElementById("compass-img").style.transform = 'rotate(' + ((myJSON.h*180/Math.PI) - 360 ) + 'deg)';
             }
 
-            //magnetometer values
-            setMyJson("mx"); setMyJson("my"); setMyJson("mz"); setMyJsonRadToDeg("mh");
+            if(chkMyJSON("loc1")) {
+                setValID("lat1", myJSON.loc1[0]);  
+                setValID("lng1", myJSON.loc1[1]);
+            } 
+            if(chkMyJSON("loc2")) {
+                setValID("lat2", myJSON.loc2[0]);
+                setValID("lng2", myJSON.loc2[1]);
+            }
 
+            //magnetometer values
+            setMyJson("mx"); setMyJson("my"); setMyJson("mz");
             //magnetometer calibration
             setMyJson("mbx"); setMyJson("mby"); setMyJson("mbz"); 
             setMyJson("msx"); setMyJson("msy"); setMyJson("msz");

diff --git a/imuUtils.cpp b/imuUtils.cpp
@@ -10,7 +10,7 @@ extern "C" {
 }
 
 MPU9250_DMP imu;
-static char imuTxtBuffer[320];
+static char imuTxtBuffer[190];
 
 float qw,qx,qy,qz;
 float ax,ay,az, mx, my, mz;
@@ -51,13 +51,17 @@ void printIMUData(void)
 {  
   if (millis() - printTime > printTimeLimit) {
     if (print_flag) {
-      sprintf(imuTxtBuffer, "{\"lat1\":%.8f,\"lng1\":%.8f,\"lat2\":%.8f,\"lng2\":%.8f,\"dqw\":%.4f,\"dqx\":%.4f,\"dqy\":%.4f,\"dqz\":%.4f,\"qw\":%.4f,\"qx\":%.4f,\"qy\":%.4f,\"qz\":%.4f,\"r\":%.2f,\"p\":%.2f,\"y\":%.2f,\"ax\":%.4f,\"ay\":%.4f,\"az\":%.4f,\"mx\":%.4f,\"my\":%.4f,\"mz\":%.4f,\"mh\":%.4f,\"h\":%.4f}", 
+      // sprintf(imuTxtBuffer, "{\"lat1\":%.8f,\"lng1\":%.8f,\"lat2\":%.8f,\"lng2\":%.8f,\"dqw\":%.4f,\"dqx\":%.4f,\"dqy\":%.4f,\"dqz\":%.4f,\"qw\":%.4f,\"qx\":%.4f,\"qy\":%.4f,\"qz\":%.4f,\"r\":%.2f,\"p\":%.2f,\"y\":%.2f,\"ax\":%.4f,\"ay\":%.4f,\"az\":%.4f,\"mx\":%.4f,\"my\":%.4f,\"mz\":%.4f,\"mh\":%.4f,\"h\":%.4f}", 
+      //   gpsUtilsWrapper_get_latitude(1),gpsUtilsWrapper_get_longitude(1),gpsUtilsWrapper_get_latitude(2),gpsUtilsWrapper_get_longitude(2),
+      //   qw,qx,qy,qz,
+      //   (float)fusedQuat[QUAT_W], (float)fusedQuat[QUAT_X], (float)fusedQuat[QUAT_Y], (float)fusedQuat[QUAT_Z], 
+      //   (float)dmpEuler[VEC3_X], (float)dmpEuler[VEC3_Y], (float)dmpEuler[VEC3_Z], 
+      //   ax, ay, az, mx, my, mz, 
+      //   (float)magYaw, fHeading[0]);
+      sprintf(imuTxtBuffer, "{\"loc1\":[%.5f,%.5f],\"loc2\":[%.5f,%.5f],\"qw\":%.3f,\"qx\":%.3f,\"qy\":%.3f,\"qz\":%.3f,\"ax\":%.3f,\"ay\":%.3f,\"az\":%.3f,\"mx\":%.2f,\"my\":%.2f,\"mz\":%.2f,\"h\":%.2f}", 
         gpsUtilsWrapper_get_latitude(1),gpsUtilsWrapper_get_longitude(1),gpsUtilsWrapper_get_latitude(2),gpsUtilsWrapper_get_longitude(2),
-        qw,qx,qy,qz,
-        (float)fusedQuat[QUAT_W], (float)fusedQuat[QUAT_X], (float)fusedQuat[QUAT_Y], (float)fusedQuat[QUAT_Z], 
-        (float)dmpEuler[VEC3_X], (float)dmpEuler[VEC3_Y], (float)dmpEuler[VEC3_Z], 
-        ax, ay, az, mx, my, mz, 
-        (float)magYaw, fHeading[0]);
+        (float)fusedQuat[QUAT_W], (float)fusedQuat[QUAT_X], (float)fusedQuat[QUAT_Y], (float)fusedQuat[QUAT_Z],
+        ax, ay, az, mx, my, mz, fHeading[0]);
       SSEBroadcastTxt(imuTxtBuffer);
       print_flag = false;
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/sh
		docker run --name wemos-gps-backend -v $(pwd)/../data:/usr/share/nginx/html:ro -p8080:80 -d nginx