Merge branch 'dev'

SpaceTeam · Feb 12, 2020 · 58c0c5d · 58c0c5d
2 parents 1f92c72 + c0560ed
commit 58c0c5d
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 56 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/index.html b/client/index.html
@@ -116,10 +116,17 @@ <h3 id="versionLabel">ECUI - Version <span id="version">1.0.0</span></h3>
                 </div>
 
             </div>
-            <div class="form-control-lg custom-control custom-checkbox digitalOut-div row control-row">
-                <input type="checkbox" class="custom-control-input ckbx manual-obj" id="igniter"
-                       onclick="onIgniterCheck(this);">
-                <label class="custom-control-label ckbx-label" for="igniter">Igniter</label>
+            <div class="row control-row">
+                <div class="form-control-lg custom-control custom-checkbox digitalOut-div">
+                    <input type="checkbox" class="custom-control-input ckbx manual-obj digitalOut" id="igniter"
+                           onclick="onDigitalCheck(this);" disabled>
+                    <label class="custom-control-label ckbx-label" for="igniter">Igniter</label>
+                </div>
+                <div class="form-control-lg custom-control custom-checkbox digitalOut-div">
+                    <input type="checkbox" class="custom-control-input ckbx manual-obj digitalOut" id="solenoidPress;solenoidDepress"
+                           onclick="onDigitalCheck(this);" disabled>
+                    <label class="custom-control-label ckbx-label" for="solenoidPress;solenoidDepress">Solenoid Pressure</label>
+                </div>
             </div>
 
             <button class="btn btn-secondary cal-btn manual-obj" id="saftlButton" disabled>Saftl</button>

diff --git a/client/js/ClientSocket.js b/client/js/ClientSocket.js
@@ -82,6 +82,22 @@ function sendDigitalOut(doId, doValue)
     socket.emit('digital-outs-set', [jsonDigitalOut]);
 }
 
+function sendDigitalOutArr(doIds, doValue)
+{
+    let jsonDigitalOut = [];
+    let jsonDigitalOutObj = {};
+
+    for (let doIdsInd in doIds)
+    {
+        jsonDigitalOutObj = {};
+        jsonDigitalOutObj.id = doIds[doIdsInd];
+        jsonDigitalOutObj.value = doValue;
+
+        jsonDigitalOut.push(jsonDigitalOutObj);
+    }
+    socket.emit('digital-outs-set', jsonDigitalOut);
+}
+
 function sendServo(servoId, servoValue)
 {
     let jsonServo = {};
@@ -149,19 +165,23 @@ function onServosLoad(jsonServosData)
     }
 }
 
-function onIgniterCheck(checkbox)
+function onDigitalCheck(checkbox)
 {
     let id = $(checkbox).attr('id');
 
+    let ids = id.split(";");
+    console.log(ids);
+
     if (checkbox.checked)
     {
-        sendDigitalOut(id, true);
+        sendDigitalOutArr(ids, true);
     }
     else
     {
-        sendDigitalOut(id, false);
+        sendDigitalOutArr(ids, false);
     }
 
+
 }
 
 function onServoEnable(checkbox) {
@@ -201,6 +221,14 @@ function onServoEnable(checkbox) {
             $(this).prop('disabled', true);
         });
 
+        $('.digitalOut').each(function () {
+            if ($(this).prop("checked") === true)
+            {
+                $(this).prop('checked', false);
+                $(this).click();
+            }
+        });
+
         socket.emit('servos-disable');
     }
 }

diff --git a/client/js/SequenceChart.js b/client/js/SequenceChart.js
@@ -43,10 +43,23 @@ class SequenceChart
 
     //if indicator then strokecolor must be defined
     //TODO: allow only when live tracking is not running
-    addSeries(seriesName, yValueName, isIndicator=false, strokeColor=undefined)
+    addSeries(seriesName, yValueName, interpolation="none", isIndicator=false, strokeColor=undefined)
     {
         // Create series
-        var series = this.chart.series.push(new am4charts.LineSeries());
+        var series;
+        if (interpolation === "none")
+        {
+            series = this.chart.series.push(new am4charts.StepLineSeries());
+        }
+        else if (interpolation === "linear")
+        {
+            series = this.chart.series.push(new am4charts.LineSeries());
+        }
+        else
+        {
+            series = this.chart.series.push(new am4charts.StepLineSeries());
+        }
+
 
         series.name = seriesName;
         series.dataFields.valueY = yValueName;
@@ -185,7 +198,8 @@ class SequenceChart
 
                     let currSeries = this.chart.series.getIndex(i);
                     let yValueName = currSeries.dataFields.valueY;
-                    console.log(this.addSeries(currSeries.name + " live", yValueName + " live", true, currSeries.stroke));
+                    console.log("name: " + currSeries.name + " interp: " + this.getInterpolationFromName(currSeries.name));
+                    console.log(this.addSeries(currSeries.name + " live", yValueName + " live", this.getInterpolationFromName(currSeries.name), true, currSeries.stroke));
 
                     let time = this.chart.data[0].time;
 
@@ -235,6 +249,33 @@ class SequenceChart
 
                 if (currInt.next !== undefined)
                 {
+
+                    //todo: make it prettier
+                    let currLiveSeries = this.chart.series.getIndex(parseInt(serInd) + this.liveIntervalList.length);
+                    if (time === currInt.next.x)
+                    {
+                        this.addSingleData(currLiveSeries, time, currInt.next.y);
+                        //console.log({"time": time, "y": currInt.next.y});
+                    }
+                    else
+                    {
+                        //todo: make better solution
+                        let y;
+                        if (currLiveSeries.constructor.name === "e") //constructor name of Line Series
+                        {
+                            let scale = (currInt.next.y - currInt.prev.y) / (currInt.next.x - currInt.prev.x);
+                            y = scale * (time-currInt.prev.x) + currInt.prev.y;
+
+                            //console.log("time: " + time + " scale: " + scale + " y: " + y);
+                            this.addSingleData(currLiveSeries, time, y);
+                        }
+                        else
+                        {
+                            y = currInt.prev.y;
+                        }
+                        this.addSingleData(currLiveSeries, time, y);
+                    }
+
                     let yValueName = this.chart.series.getIndex(serInd).dataFields.valueY;
                     if (time >= currInt.next.x) {
                         //fetch next time with point from series
@@ -253,25 +294,6 @@ class SequenceChart
                         }
                         currInt.next = newNextInt;
                     }
-                    if (currInt.next !== undefined) {
-
-                        //todo: make it prettier
-                        let currLiveSeries = this.chart.series.getIndex(parseInt(serInd) + this.liveIntervalList.length);
-                        if (time === currInt.next.x)
-                        {
-                            this.addSingleData(currLiveSeries, time, currInt.next.y);
-                            //console.log({"time": time, "y": currInt.next.y});
-                        }
-                        else
-                        {
-                            let scale = (currInt.next.y - currInt.prev.y) / (currInt.next.x - currInt.prev.x);
-                            let y = scale * (time-currInt.prev.x) + currInt.prev.y;
-
-                            //console.log("time: " + time + " scale: " + scale + " y: " + y);
-                            this.addSingleData(currLiveSeries, time, y);
-                        }
-
-                    }
                 }
 
             }
@@ -295,6 +317,7 @@ class SequenceChart
 
     loadSequenceChart(jsonSeq)
     {
+        this.globals = jsonSeq.globals;
         let startTime = jsonSeq.globals.startTime;
         let endTime = jsonSeq.globals.endTime;
 
@@ -347,7 +370,7 @@ class SequenceChart
                     {
                         if (!(cmd in serObj))
                         {
-                            let newSer = this.addSeries(cmd, cmd);
+                            let newSer = this.addSeries(cmd, cmd, jsonSeq.globals.interpolation[cmd]);
                             serObj[cmd] = newSer;
                         }
                         this.addSingleData(serObj[cmd], time, action[cmd]);
@@ -356,6 +379,11 @@ class SequenceChart
             }
         }
     }
+
+    getInterpolationFromName(name)
+    {
+        return this.globals.interpolation[name];
+    }
 }
 
 

diff --git a/client/version.txt b/client/version.txt
@@ -1 +1 @@
-1.0.0
+1.1.0
diff --git a/sequence/AbortSequence.json → sequence/AbortSequenceTemp.json b/sequence/AbortSequence.json → sequence/AbortSequenceTemp.json
diff --git a/sequence/Checklist.json → sequence/ChecklistTemp.json b/sequence/Checklist.json → sequence/ChecklistTemp.json
diff --git a/sequence/Sequence.json → sequence/SequenceTemp.json b/sequence/Sequence.json → sequence/SequenceTemp.json
@@ -2,7 +2,15 @@
     "globals": {
         "startTime": -12,
         "endTime": 7,
-        "interval": 0.01
+        "interval": 0.01,
+        "interpolation": {
+            "igniter": "none",
+            "fuel": "linear",
+            "oxidizer": "linear"
+        },
+        "ranges": [
+            "chamberPressure"
+        ]
     },
     "data": [
         {
@@ -21,36 +29,18 @@
                 },
                 {
                     "fuel": 0,
-                    "igniter": 0,
-                    "oxidizer": 0,
-                    "timestamp": -1.1
-                },
-		{
-                    "fuel": 0,
-                    "igniter": 0,
-                    "oxidizer": 0,
-                    "timestamp": -1.0
-		},
-		{
-                    "fuel": 0,
-                    "igniter": 0,
                     "oxidizer": 0,
                     "timestamp": 0.0
                 },
-		{
+		        {
                     "igniter": 100,
                     "timestamp": 0.1
                 },
                 {
                     "fuel": 50,
-                    "igniter": 100,
                     "oxidizer": 50,
                     "timestamp": 0.5
                 },
-                {
-                    "igniter": 100,
-                    "timestamp": 0.9
-                },
                 {
                     "fuel": 100,
                     "igniter": 100,
@@ -69,13 +59,9 @@
                     },
                     "timestamp": 1.1
                 },
-                {
-                    "igniter": 100,
-                    "timestamp": 2.5
-                },
                 {
                     "igniter": 0,
-                    "timestamp": 2.6
+                    "timestamp": 2.5
                 },
                 {
                     "fuel": 100,