From 0dd890b9d07496da96375c9b6e5ce800dccad3a3 Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei Date: Thu, 17 Sep 2015 13:36:59 -0400 Subject: [PATCH] footer status codes --- js/SerialMonitor/PositionDataView.html | 1 + js/models/MachineState.js | 6 ++++++ js/models/SerialComm.js | 2 ++ 3 files changed, 9 insertions(+) diff --git a/js/SerialMonitor/PositionDataView.html b/js/SerialMonitor/PositionDataView.html index 809650b..9c2d256 100644 --- a/js/SerialMonitor/PositionDataView.html +++ b/js/SerialMonitor/PositionDataView.html @@ -11,4 +11,5 @@ C:   <%= c %>

<% } else if (status == 5) { %>moving <% } else if (status == 6) { %>holding <% } else if (status == 9) { %>homing + <% } else if (status == 10) { %>bad footer status <% } else { %>status = <%= status %><% } %> \ No newline at end of file diff --git a/js/models/MachineState.js b/js/models/MachineState.js index 5c7b8ec..fb7a127 100644 --- a/js/models/MachineState.js +++ b/js/models/MachineState.js @@ -26,6 +26,12 @@ define(['underscore', 'backbone'], function(_, Backbone){ if (data.stat !== null && data.stat !== undefined) this.set("status", data.stat); }, + setFooterStatus: function(data){ + if (data[1] == 0){//ok status + this.set("status", 3); + } else this.set("status", 10); + }, + refresh: function(){ this.set(this.defaults); } diff --git a/js/models/SerialComm.js b/js/models/SerialComm.js index bbd1af2..bdf7824 100644 --- a/js/models/SerialComm.js +++ b/js/models/SerialComm.js @@ -107,6 +107,8 @@ define(['underscore', 'backbone', 'socketio', 'machineState'], function(_, Backb } else if (json.sr){ serialComm.getMachineState().setPosition(json.sr); } + if (json.f) serialComm.getMachineState().setFooterStatus(json.f); + else if (json.r.f) serialComm.getMachineState().setFooterStatus(json.r.f); } catch(err) {} }); -- GitLab