git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
stuff
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
static
/
mctx.gui.js
diff --git
a/testing/MCTXWeb/public_html/static/mctx.gui.js
b/testing/MCTXWeb/public_html/static/mctx.gui.js
index
3198055
..
3df2bac
100644
(file)
--- a/
testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/
testing/MCTXWeb/public_html/static/mctx.gui.js
@@
-25,8
+25,12
@@
mctx.menu = [
{'text' : 'Help', href : mctx.location + 'help.html'}
];
-mctx.statusCodes = {
- STATUS_OK : 1
+mctx.status = {
+ OK : 1,
+ ERROR : -1,
+ UNAUTHORIZED : -2,
+ NOTRUNNING : -3,
+ ALREADYEXISTS : -4
};
mctx.statusCodesDescription = {
@@
-54,6
+58,9
@@
mctx.actuators = {
3 : {name : "Pressure regulator"}
};
+mctx.actuator = {};
+mctx.actuator.pressure_regulator = 0;
+
mctx.strain_gauges = {};
mctx.strain_gauges.ids = [0, 1, 2, 3];
mctx.strain_gauges.time_limit = 20;
@@
-296,6
+303,14
@@
$.fn.setErrorLog = function () {
return this;
};
+$.fn.checkStatus = function(data) {
+ if (data.status !== mctx.status.OK) {
+ $(this).text(data.description).removeClass("pass").addClass("fail");
+ return false;
+ }
+ return true;
+};
+
$(document).ready(function () {
//Show the content!
$("#content").css("display", "block");
UCC
git Repository :: git.ucc.asn.au