diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-06-06 09:21:42 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-06-06 09:21:42 +0200 |
| commit | e9392d6be3f9d28df958c6648361fb70f71a5e84 (patch) | |
| tree | 182d835d228e5d9d4a3e7d09a2a8142f695f959a /CAN-binder/low-can-demo/app | |
| parent | abda8ae14a827586c8d6dd61509add4597b07212 (diff) | |
Remove demo UI from the project
Low level CAN binding is a standalone service that doesn't
have to be delivered with an UI.
Change-Id: Ic3995704a63b56f21168e2e9da8e45b3117a0f41
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-demo/app')
15 files changed, 0 insertions, 1033 deletions
diff --git a/CAN-binder/low-can-demo/app/Frontend/images/car-top-view.png b/CAN-binder/low-can-demo/app/Frontend/images/car-top-view.png Binary files differdeleted file mode 100644 index a5ad0966..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/car-top-view.png +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/images/cluster.png b/CAN-binder/low-can-demo/app/Frontend/images/cluster.png Binary files differdeleted file mode 100644 index c6b8d908..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/cluster.png +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/images/favicon.ico b/CAN-binder/low-can-demo/app/Frontend/images/favicon.ico Binary files differdeleted file mode 100644 index eeb7ab7a..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/favicon.ico +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-black.png b/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-black.png Binary files differdeleted file mode 100644 index 46e875e1..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-black.png +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-green.png b/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-green.png Binary files differdeleted file mode 100644 index c3aebad6..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-green.png +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-red.png b/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-red.png Binary files differdeleted file mode 100644 index ad842839..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/gas-pump-red.png +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/images/logo_iot_bzh_lightgrey_325x90_50dpi.png b/CAN-binder/low-can-demo/app/Frontend/images/logo_iot_bzh_lightgrey_325x90_50dpi.png Binary files differdeleted file mode 100644 index 7ba41960..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/images/logo_iot_bzh_lightgrey_325x90_50dpi.png +++ /dev/null diff --git a/CAN-binder/low-can-demo/app/Frontend/index.html b/CAN-binder/low-can-demo/app/Frontend/index.html deleted file mode 100644 index b1b8a810..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/index.html +++ /dev/null @@ -1,137 +0,0 @@ -<!DOCTYPE html> -<!--[if lt IE 7]> <html lang="en" ng-app="@@APPNAME@@" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> -<!--[if IE 7]> <html lang="en" ng-app="@@APPNAME@@" class="no-js lt-ie9 lt-ie8"> <![endif]--> -<!--[if IE 8]> <html lang="en" ng-app="@@APPNAME@@" class="no-js lt-ie9"> <![endif]--> -<!--[if gt IE 8]><!--> <html lang="en" ng-app="@@APPNAME@@" class="no-js"> <!--<![endif]--> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>AGL Low CAN binding demo</title> - <base href="@@URLBASE@@"> - <!-- bower:css --> - <!-- endinject --> - <!-- vendor:css --> - <!-- endinject --> - <!-- appli:css --> - <!-- endinject --> - <!-- inject:css --> - <!-- endinject --> - <!-- bower:js --> - <!-- endinject --> - <!-- inject:js --> - <!-- endinject --> -</head> -<body class="not-connected"> - <!-- Navigation --> - <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> - <div class="container-fluid"> - <!-- Brand and toggle get grouped for better mobile display --> - <a class="navbar-brand" href="http://iot.bzh" target="_blank" alt="IoT.bzh"> - <img id="iotbzh-logo" src="/images/logo_iot_bzh_lightgrey_325x90_50dpi.png"/> - </a> - <div class="collapse navbar-collapse"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <p class="navbar-text navbar-right">AGL Low CAN binding</p> - <ul class="nav navbar-nav"> - <li class="if-not-connected"> - <a role="button" onclick="doConnect();">Connect</a> - </li> - <li class="if-connecting"> - Connecting... - </li> - <li class="if-started"> - <a role="button" onclick="doDisconnect();">Disconnect</a> - </li> - </ul> - </div> - <!-- /.navbar-collapse --> - </div> - <!-- /.container --> - </nav> - - <div class="content"> - <div id="quad1" class="quad"> - <img id="view1"/> -<!-- - <div id="vspan"> - <svg height="100" width="100"> - <g> - <circle cx="50" cy="50" r="49" stroke="white" stroke-width="3"/> - <text x="50%" y="80%" fill="white" text-anchor="middle">Km/h</text> - </g> - </svg> - <div id="vspeed" class="number">0</div> - </div> - <div id="espan"> - <svg height="100" width="100"> - <g> - <circle cx="50" cy="50" r="49" stroke="white" stroke-width="3"/> - <text x="50%" y="80%" fill="white" text-anchor="middle">Rpm</text> - </g> - </svg> - <div id="espeed" class="number">0</div> - </div> ---> - <div id="cluster"> - <canvas id="torqueGauge"></canvas> - <canvas id="rpmGauge"></canvas> - <canvas id="MAFGauge"></canvas> - <canvas id="speedGauge"></canvas> - <canvas id="IATempGauge"></canvas> - </div> - </div> - -<!-- - <div id="quad2" class="quad"> - <div id="mapsat"></div> - <img id="car" class="invisible" src="images/car-top-view.png"/> - <div id="gaspan"> - <div id="gas"> - <div id="gpgreen"></div> - <div id="gpblack"></div> - <div id="gpred"></div> - </div> - <div id="copan"> - <div id="con1"></div> - <div id="con2"></div> - <div id="con3"></div> - <div id="con4"></div> - <div id="con5"></div> - <div id="con6"></div> - <div id="con7"></div> - <div id="con8"></div> - <div id="con9"></div> - </div> - </div> - </div> ---> - <div id="quad3" class="quad"> - <table id="xcdata" class="table table-striped table-bordered table-condensed"> - <thead> - <tr><th colspan="2">AGL CAN messages Details</th></tr> - <tr><th class="col-md-4">Data</th><th>Value</th></tr> - </thead> - <tbody> - <tr> <td>Vehicle Speed</td> <td><span id="vsp">?</span> km/h</td> </tr> - <tr> <td>Engine Speed</td> <td><span id="esp">?</span> tr/mn</td> </tr> - <tr> <td>Engine Load</td> <td><span id="trq">?</span> %</td> </tr> - <tr> <td>MAF air flow rate</td> <td><span id="fue">?</span> grams/sec</td> </tr> - <tr> <td>Intake Air temp</td> <td><span id="tem">?</span> °C</td> </tr> - <tr> <td>Messages rate</td> <td><span id="msg">?</span> received events/s</td> </tr> - <tr> <td>CPU load</td> <td><span id="stat">?</span> %</td> </tr> - </tbody> - </table> - </div> - -<!-- - <div id="quad4" class="quad"> - <div id="mapstreet"></div> - </div> ---> - </div> -</body> -</html> diff --git a/CAN-binder/low-can-demo/app/Frontend/js/AFB.js b/CAN-binder/low-can-demo/app/Frontend/js/AFB.js deleted file mode 100644 index aa1198cb..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/js/AFB.js +++ /dev/null @@ -1,170 +0,0 @@ -AFB = function(base, initialtoken){ - -var urlws = "ws://"+window.location.host+"/"+base; -var urlhttp = "http://"+window.location.host+"/"+base; - -/*********************************************/ -/**** ****/ -/**** AFB_context ****/ -/**** ****/ -/*********************************************/ -var AFB_context = (function() { - var UUID; - var TOKEN = initialtoken; - - var context = function(token, uuid) { - this.token = token; - this.uuid = uuid; - }; - - context.prototype = { - get token() {return TOKEN;}, - set token(tok) {if(tok) TOKEN=tok;}, - get uuid() {return UUID;}, - set uuid(id) {if(id) UUID=id;} - }; - - return new context(); -})(); -/*********************************************/ -/**** ****/ -/**** AFB_websocket ****/ -/**** ****/ -/*********************************************/ -var AFB_websocket = (function() { - var CALL = 2; - var RETOK = 3; - var RETERR = 4; - var EVENT = 5; - - var PROTO1 = "x-afb-ws-json1"; - - var result = function(onopen, onabort) { - var u = urlws; - if (AFB_context.token) { - u = u + '?x-afb-token=' + AFB_context.token; - if (AFB_context.uuid) - u = u + '&x-afb-uuid=' + AFB_context.uuid; - } - this.ws = new WebSocket(u, [ PROTO1 ]); - this.pendings = {}; - this.awaitens = {}; - this.counter = 0; - this.ws.onopen = onopen.bind(this); - this.ws.onerror = onerror.bind(this); - this.ws.onclose = onclose.bind(this); - this.ws.onmessage = onmessage.bind(this); - this.onopen = onopen; - this.onabort = onabort; - }; - - function onerror(event) { - var f = this.onabort; - if (f) { - delete this.onopen; - delete this.onabort; - f && f(this); - } - this.onerror && this.onerror(this); - } - - function onopen(event) { - var f = this.onopen; - delete this.onopen; - delete this.onabort; - f && f(this); - } - - function onclose(event) { - for (var id in this.pendings) { - var ferr = this.pendings[id].onerror; - ferr && ferr(null, this); - } - this.pendings = {}; - this.onclose && this.onclose(); - } - - function fire(awaitens, name, data) { - var a = awaitens[name]; - if (a) - a.forEach(function(handler){handler(data);}); - var i = name.indexOf("/"); - if (i >= 0) { - a = awaitens[name.substring(0,i)]; - if (a) - a.forEach(function(handler){handler(data);}); - } - a = awaitens["*"]; - if (a) - a.forEach(function(handler){handler(data);}); - } - - function reply(pendings, id, ans, offset) { - if (id in pendings) { - var p = pendings[id]; - delete pendings[id]; - var f = p[offset]; - f && f(ans); - } - } - - function onmessage(event) { - var obj = JSON.parse(event.data); - var code = obj[0]; - var id = obj[1]; - var ans = obj[2]; - AFB_context.token = obj[3]; - switch (code) { - case RETOK: - reply(this.pendings, id, ans, 0); - break; - case RETERR: - reply(this.pendings, id, ans, 1); - break; - case EVENT: - default: - fire(this.awaitens, id, ans); - break; - } - } - - function close() { - this.ws.close(); - } - - function call(method, request, onsuccess, onfailure) { - var id, arr; - do { - id = String(this.counter = 4095 & (this.counter + 1)); - } while (id in this.pendings); - this.pendings[id] = [ onsuccess, onfailure ]; - arr = [CALL, id, method, request ]; - if (AFB_context.token) arr.push(AFB_context.token); - this.ws.send(JSON.stringify(arr)); - } - - function onevent(name, handler) { - var id = name; - var list = this.awaitens[id] || (this.awaitens[id] = []); - list.push(handler); - } - - result.prototype = { - close: close, - call: call, - onevent: onevent - }; - - return result; -})(); -/*********************************************/ -/**** ****/ -/**** ****/ -/**** ****/ -/*********************************************/ -return { - context: AFB_context, - ws: AFB_websocket -}; -}; - diff --git a/CAN-binder/low-can-demo/app/Frontend/js/low-can-demo.js b/CAN-binder/low-can-demo/app/Frontend/js/low-can-demo.js deleted file mode 100644 index 2e8b99e6..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/js/low-can-demo.js +++ /dev/null @@ -1,351 +0,0 @@ -// parse location to get security token -var urlParams={}; -location.search.substr(1).split("&").forEach(function(item) { - var k = item.split("=")[0]; - var v = decodeURIComponent(item.split("=")[1]); - if (k in urlParams) urlParams[k].push(v); else urlParams[k] = [v]; -}); - -var afb = new AFB("api"/*root*/, urlParams.token[0]); -var ws; -var vspeed = 0, espeed = 0, torque = 0; -var R2D = 180.0 / Math.PI; -var D2R = Math.PI / 180.0; -var fuel; -var con,cons,consa = [ ]; -var minspeed = 5; -var temp = 18; -var wdgTem, wdgVsp, wdgEsp, wdgTrq; -var wdgFue, wdgGpred, wdgGpblack; -var conscale = 40; -var condt = 60000; - -/* gauges creation */ -var gauges={}; -function initGauges() { - gauges.speed = new steelseries.Radial('speedGauge', { - gaugeType: steelseries.GaugeType.TYPE4, - frameDesign: steelseries.FrameDesign.BLACK_METAL, - backgroundColor: steelseries.BackgroundColor.CARBON, - size: 250, - titleString: "Speed", - unitString: "Km/h", - lcdVisible: true, - niceScale: true, - maxValue: 200, - maxMeasuredValue: 0, - maxMeasuredValueVisible: true, - thresholdVisible: false, - ledVisible: false, - pointerType: steelseries.PointerType.TYPE11, - useOdometer: false, - odometerParams: { - digits: 6 - } - }); - - gauges.rpm = new steelseries.Radial('rpmGauge', { - gaugeType: steelseries.GaugeType.TYPE4, - frameDesign: steelseries.FrameDesign.BLACK_METAL, - backgroundColor: steelseries.BackgroundColor.CARBON, - size: 200, - titleString: "RPM", - unitString: "x1000", - lcdVisible: false, - niceScale: true, - maxValue: 5, - maxMeasuredValue: 0, - maxMeasuredValueVisible: false, - section: [ - steelseries.Section(4, 8, 'rgba(255, 0, 0, 0.7)') - ], - area: [ - steelseries.Section(5, 8, 'rgba(255, 0, 0, 0.3)') - ], - thresholdVisible: false, - ledVisible: false, - pointerType: steelseries.PointerType.TYPE11 - }); - - gauges.maf = new steelseries.Radial('MAFGauge', { - gaugeType: steelseries.GaugeType.TYPE4, - frameDesign: steelseries.FrameDesign.BLACK_METAL, - backgroundColor: steelseries.BackgroundColor.CARBON, - size: 200, - titleString: "Air flow Rate", - unitString: "grams/sec", - lcdVisible: true, - lcdColor: steelseries.LcdColor.STANDARD, - lcdDecimals: 1, - niceScale: true, - minValue: 0, - maxValue: 655, - minMeasuredValue: 0, - maxMeasuredValue: conscale, - maxMeasuredValueVisible: true, - section: [ - steelseries.Section(0, 255, 'rgba(0, 255, 0, 0.5)'), - steelseries.Section(256, 326, 'rgba(255, 255, 0, 0.5)'), - steelseries.Section(327, 600, 'rgba(255, 128, 0, 0.5)'), - steelseries.Section(601, 655, 'rgba(255, 0, 0, 0.5)') - ], - useValueGradient: true, - thresholdVisible: false, - ledVisible: false, - pointerType: steelseries.PointerType.TYPE11 - }); - - gauges.iatemp = new steelseries.Radial('IATempGauge', { - gaugeType: steelseries.GaugeType.TYPE4, - frameDesign: steelseries.FrameDesign.BLACK_METAL, - backgroundColor: steelseries.BackgroundColor.CARBON, - size: 200, - titleString: "Intake air temp", - unitString: "°C", - lcdVisible: true, - lcdColor: steelseries.LcdColor.STANDARD, - lcdDecimals: 1, - niceScale: true, - minValue: 0, - maxValue: 100, - minMeasuredValue: 0, - maxMeasuredValue: 100, - maxMeasuredValueVisible: true, - section: [ - steelseries.Section(0, 30, 'rgba(0, 255, 0, 0.5)'), - steelseries.Section(31, 50, 'rgba(255, 255, 0, 0.5)'), - steelseries.Section(51, 70, 'rgba(255, 128, 0, 0.5)'), - steelseries.Section(71, 100, 'rgba(255, 0, 0, 0.5)') - ], - useValueGradient: true, - thresholdVisible: false, - ledVisible: false, - pointerType: steelseries.PointerType.TYPE11 - }); - - gauges.torque = new steelseries.Radial('torqueGauge', { - gaugeType: steelseries.GaugeType.TYPE2, - frameDesign: steelseries.FrameDesign.BLACK_METAL, - backgroundColor: steelseries.BackgroundColor.CARBON, - size: 200, - titleString: "Load", - unitString: "%", - lcdVisible: false, - niceScale: true, - minValue: 0, - maxValue: 100, - maxMeasuredValue: 0, - maxMeasuredValueVisible: false, - section: [ - steelseries.Section(0, 0, 'rgba(0, 255, 0, 0.7)'), - steelseries.Section(50, 1500, 'rgba(255, 128, 0, 0.7)') - ], - area: [ - steelseries.Section(0, 0, 'rgba(0, 255, 0, 0.3)'), - steelseries.Section(50, 1500, 'rgba(255, 128, 0, 0.3)') - ], - threshold: 0, - thresholdVisible: true, - ledVisible: false, - pointerType: steelseries.PointerType.TYPE4 - }); - - /* adjust cluster background size upon resize */ - // TODO: could be doable through CSS, but a bit tricky - function adjustCluster() { - var qh=$("#quad1").outerHeight(); - var sh=$("#speedGauge").outerHeight(); - var pct=Math.ceil((1000*sh/qh))/10+1; - $('#cluster').css("height",pct+"%"); - } - $(window).resize(adjustCluster); - adjustCluster(); -} - -function clearGauges() { - for (var g in gauges) { - switch(g) { - case "clock": - gauges[g].setValue("-"); - break; - case "speed": - gauges[g].setValue(0); - break; - default: - gauges[g].setValue(0); - break; - } - } -} - -function gotVehicleSpeed(obj) { - vspeed = Math.round(obj.data.value); - wdgVsp.innerHTML = /* wdgVspeed.innerHTML = */ String(vspeed); - //gauges.speed.setValueAnimated(vspeed); - gauges.speed.setValue(vspeed); -} - -function gotTorque(obj) { - torque=Math.round(obj.data.value); - wdgTrq.innerHTML=String(torque); - gauges.torque.setValue(torque); -} - -function gotEngineSpeed(obj) { - espeed = Math.round(obj.data.value); - wdgEsp.innerHTML = /* wdgEspeed.innerHTML = */ String(espeed); - //gauges.rpm.setValueAnimated(espeed/1000); - gauges.rpm.setValue(espeed/1000); -} - -function gotFuelLevel(obj) { - fuel = Math.round(obj.data.value); - wdgFue.innerHTML = fuel; - gauges.maf.setValue(fuel); -} - -function gotTemp(obj) { - temp = Math.round(obj.data.value); - wdgTem.innerHTML = temp; - gauges.iatemp.setValue(temp); -} - -function gotStart(obj) { - document.body.className = "started"; - vspeed = 0; - espeed = 0; - heading = 0; - cons = undefined; - consa = [ ]; - - wdgVsp.innerHTML = /*wdgVspeed.innerHTML = */ - wdgEsp.innerHTML = /*wdgEspeed.innerHTML = */ - wdgTem.innerHTML = wdgFue.innerHTML = "?"; - for (var i = 0 ; i < 9 ; i++) { - wdgConX[i].style.height = "0%"; - wdgConX[i].innerHTML = ""; - } -} - -function gotStop(obj) { - document.body.className = "connected"; -} - -var msgcnt=0; -var msgprv=0; -var msgprvts=0; - -function gotAny(obj) { - if (obj.event != "low-can/STOP") { - document.body.className = "started"; - } - msgcnt++; - - wdgTem.innerHTML = temp; - gauges.iatemp.setValue(temp); -// updateClock(obj.data.timestamp); -} - -function updateMsgRate() { - var now=+new Date(); - if (msgprvts) { - var dt=now-msgprvts; - msgrate=Math.round((msgcnt-msgprv)*10000/dt)/10; - wdgMsg.innerHTML=String(msgrate); - } - - msgprv=msgcnt; - msgprvts=now; -} - -function gotStat(obj) { - wdgStat.innerHTML = obj.data; -} - -function onAbort() { - document.body.className = "not-connected"; -} - -function onOpen() { - ws.call("low-can/subscribe", {event:[ - "diagnostic_messages.vehicle.speed", - "diagnostic_messages.mass.airflow", - "diagnostic_messages.engine.speed", - "diagnostic_messages.engine.load", - "diagnostic_messages.intake.air.temperature"]}, - onSubscribed, onAbort); - ws.call("stat/subscribe", true); - ws.onevent("stat/stat", gotStat); -} - -function onClose() { - ws.call("low-can/unsubscribe", {event:[ - "diagnostic_messages.engine.speed", - "diagnostic_messages.mass.airflow", - "diagnostic_messages.vehicle.speed", - "diagnostic_messages.engine.load", - "diagnostic_messages.intake.air.temperature"]}, - onUnsubscribed, onAbort); - ws.call("stat/unsubscribe", true); - ws.onevent("stat/stat", gotStat); -} - -function onSubscribed() { - document.body.className = "connected"; - ws.onevent("low-can/diagnostic_messages.engine.speed", gotEngineSpeed); - ws.onevent("low-can/diagnostic_messages.mass.airflow", gotFuelLevel); - ws.onevent("low-can/diagnostic_messages.vehicle.speed", gotVehicleSpeed); - ws.onevent("low-can/diagnostic_messages.engine.load", gotTorque); - ws.onevent("low-can/diagnostic_messages.intake.air.temperature", gotTemp); - ws.onevent("low-can",gotAny); -} - -function onUnsubscribed() { - document.body.className = "disconnected"; - ws.onevent("low-can/diagnostic_messages.engine.speed", gotEngineSpeed); - ws.onevent("low-can/diagnostic_messages.mass.airflow", gotFuelLevel); - ws.onevent("low-can/diagnostic_messages.vehicle.speed", gotVehicleSpeed); - ws.onevent("low-can/diagnostic_messages.engine.load", gotTorque); - ws.onevent("low-can/diagnostic_messages.intake.air.temperature", gotTemp); - ws.onevent("low-can",gotAny); -} - -function replyok(obj) { - document.getElementById("output").innerHTML = "OK: "+JSON.stringify(obj); -} -function replyerr(obj) { - document.getElementById("output").innerHTML = "ERROR: "+JSON.stringify(obj); -} -function send(message) { - var api = document.getElementById("api").value; - var verb = document.getElementById("verb").value; - ws.call(api+"/"+verb, {data:message}, replyok, replyerr); -} - -function doConnect() { - document.body.className = "connecting"; - ws = new afb.ws(onOpen, onAbort); -} - -function doDisconnect() { - document.body.className = "connecting"; - ws = new afb.ws(onClose, onAbort); -} - -$(function() { - wdgVsp = document.getElementById("vsp"); - wdgEsp = document.getElementById("esp"); - wdgTrq = document.getElementById("trq"); - wdgFue = document.getElementById("fue"); - wdgTem = document.getElementById("tem"); - wdgStat = document.getElementById("stat"); - wdgMsg = document.getElementById("msg"); - - initGauges(); - - doConnect(); - - // init interval to compute message rate - setInterval(updateMsgRate,250); -}); - diff --git a/CAN-binder/low-can-demo/app/Frontend/styles/bootstrap.scss b/CAN-binder/low-can-demo/app/Frontend/styles/bootstrap.scss deleted file mode 100644 index e72d1def..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/styles/bootstrap.scss +++ /dev/null @@ -1,56 +0,0 @@ -/*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - -// Core variables and mixins -@import "bootstrap/variables"; -@import "bootstrap/mixins"; - -// Reset and dependencies -@import "bootstrap/normalize"; -@import "bootstrap/print"; -@import "bootstrap/glyphicons"; - -// Core CSS -@import "bootstrap/scaffolding"; -@import "bootstrap/type"; -@import "bootstrap/code"; -@import "bootstrap/grid"; -@import "bootstrap/tables"; -@import "bootstrap/forms"; -@import "bootstrap/buttons"; - -// Components -@import "bootstrap/component-animations"; -@import "bootstrap/dropdowns"; -@import "bootstrap/button-groups"; -@import "bootstrap/input-groups"; -@import "bootstrap/navs"; -@import "bootstrap/navbar"; -@import "bootstrap/breadcrumbs"; -@import "bootstrap/pagination"; -@import "bootstrap/pager"; -@import "bootstrap/labels"; -@import "bootstrap/badges"; -@import "bootstrap/jumbotron"; -@import "bootstrap/thumbnails"; -@import "bootstrap/alerts"; -@import "bootstrap/progress-bars"; -@import "bootstrap/media"; -@import "bootstrap/list-group"; -@import "bootstrap/panels"; -@import "bootstrap/responsive-embed"; -@import "bootstrap/wells"; -@import "bootstrap/close"; - -// Components w/ JavaScript -@import "bootstrap/modals"; -@import "bootstrap/tooltip"; -@import "bootstrap/popovers"; -@import "bootstrap/carousel"; - -// Utility classes -@import "bootstrap/utilities"; -@import "bootstrap/responsive-utilities"; diff --git a/CAN-binder/low-can-demo/app/Frontend/styles/low-can-demo.scss b/CAN-binder/low-can-demo/app/Frontend/styles/low-can-demo.scss deleted file mode 100644 index d7e52130..00000000 --- a/CAN-binder/low-can-demo/app/Frontend/styles/low-can-demo.scss +++ /dev/null @@ -1,187 +0,0 @@ -html,body { - padding:0; - margin: 0 auto; - width:100%; - height:100%; - min-height:100%; - color: black; - background: #FFF; -} - -/* http://stackoverflow.com/questions/18474564/bootstrap-3-navbar-with-logo */ -.navbar-brand { - padding: 0px; -} -.navbar-brand>img { - height: 100%; - padding: 5px; - width: auto; -} -.navbar-right { - margin-right: 0; -} - -/* used in navbar to show/hide items depending on connection status */ -.not-connected .if-connecting { display: none; } -.not-connected .if-connected { display: none; } -.not-connected .if-started { display: none; } -.connecting .if-not-connected { display: none; } -.connecting .if-connected { display: none; } -.connecting .if-started { display: none; } -.connected .if-not-connected { display: none; } -.connected .if-connecting { display: none; } -.connected .if-started { display: none; } -.started .if-not-connected { display: none; } -.started .if-connecting { display: none; } -.started .if-connected { display: none; } - -.content{ - position: absolute; - left:0; - right:0; - bottom:0; - top: 50px; - padding:0; - overflow: hidden; -} - -.quad { - position: relative; - overflow: hidden; - width:100%; - height:50%; - padding:0; - margin: 0; - box-sizing:border-box; - -moz-box-sizing:border-box; - -webkit-box-sizing:border-box; - border: 4px ridge silver; - border-radius: 15px; - text-align: left; -} - -.center { - display: table-cell; - width:100%; - height:100%; - vertical-align: middle; -} - -#quad1 { border-bottom-right-radius: 0;} -#quad2 { border-bottom-left-radius: 0; } -#quad3 { border-top-right-radius: 0; overflow: auto; } -#quad4 { border-top-left-radius: 0; } - -/* in quad 1 */ -#view1,#view2 { - position: relative; - width: auto !important; - height: auto !important; - min-width: 100%; - min-height: 100%; - display: block; - top: 50%; - left: 50%; - transform: translate(-50%,-50%); - -webkit-transform: translate(-50%,-50%); -} - -.number { text-align: center; vertical-align: middle; font: italic bold 12px monospace; } - -/* -#espan { position: absolute; left: 1em; bottom: 1em; } -#espeed { position: absolute; top: 30px; width: 100px; color: green; font-size: 28px; } - -#vspan { position: absolute; right: 1em; bottom: 1em; } -#vspeed { position: absolute; top: 16px; width: 100px; color: cyan; font-size: 42px; } -*/ - -#cluster { - position: absolute; - bottom:0; - left:0; - right:0; - background: rgba(50,50,50,.4); - height: 43%; - border-top: 2px outset silver; - border-top-left-radius: 50%; - border-top-right-radius: 50%; -} - -#torqueGauge { position: absolute; bottom: -2%; left: 1%; width: 14%; } -#rpmGauge { position: absolute; bottom: -4%; left: 16%; width: 21%; } -#speedGauge { position: absolute; bottom: -3%; left: 38%; width: 24%; } -#MAFGauge { position: absolute; bottom: -4%; right: 16%; width: 21%; } -#IATempGauge { position: absolute; bottom: -2%; right: 1%; width: 14%; } - -/* in quad 2 */ -#mapstreet { - position: absolute; - width: 100%; - height: 100%; -} - -#car { - position: absolute; - top: 50%; - left: 50%; - z-index: 2000; - -} - -#gaspan { position: absolute; bottom:0; left:0; right:0; background: rgba(200,200,200,.3); padding: 1em; z-index: 2000;} - -#gas { position: relative; float: right; width: 69px; height: 92px; } -#gas div { position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; overflow: hidden; } - -#copan { overflow: hidden; min-height: 50px; position: relative; height: 92px;} -#copan div { - display:inline; - position: absolute; - bottom: 0; - width: 10%; - height: 0%; - font-size: 10px; - color: black; - background: yellow; - border: 1px solid grey; - padding: 0; -} -#copan div p { - text-align: center; - position: absolute; - bottom: 2px; - margin: 0; - width: 100%; -} - -#con1 { left: 0%; } -#con2 { left: 11%; } -#con3 { left: 22%; } -#con4 { left: 33%; } -#con5 { left: 44%; } -#con6 { left: 55%; } -#con7 { left: 66%; } -#con8 { left: 77%; } -#con9 { left: 88%; } - -#gpblack { background: url(/images/gas-pump-black.png); } -#gpgreen { background: url(/images/gas-pump-green.png); } -#gpred { background: url(/images/gas-pump-red.png); visibility: hidden; } - -/* quad 3 */ -#xcdata { - text-align: left; -} - -.leaflet-control-layers-toggle { - background-image: url(/images/layers.png); -} - -/* quad 4 */ -#mapsat { - position: absolute; - width: 100%; - height: 100%; -} - diff --git a/CAN-binder/low-can-demo/app/etc/AppDefaults.js b/CAN-binder/low-can-demo/app/etc/AppDefaults.js deleted file mode 100644 index 164a6f21..00000000 --- a/CAN-binder/low-can-demo/app/etc/AppDefaults.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2015 "IoT.bzh" - * Author "Fulup Ar Foll" - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -var SESSION_TIMEOUT= 3600000; // default is 1h loggin session - -// Default config will be superseaded by ProjectRoot/.config-l4a.js $HOME/.config-l4a.js /etc/default/config-l4a.js -config = { - - APPNAME : 'low-can-demo', // Application name, specified in config.xml - APPVER : '0.1', // version (config.xml) - FRONTEND: "Frontend", // HTML5 frontend [no leading ./] - BACKEND : "Backend", // NodeJS Rest API [no leading ./] - URLBASE : '/', // HTML basedir when running in production [should end with a /] - APIBASE : '/api/' // Api url base dir [should end with a /] -}; - -module.exports = config; - diff --git a/CAN-binder/low-can-demo/app/etc/_Config.js b/CAN-binder/low-can-demo/app/etc/_Config.js deleted file mode 100644 index ce93d434..00000000 --- a/CAN-binder/low-can-demo/app/etc/_Config.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2014 Fulup Ar Foll - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var fs = require('fs'); - -function Config () { - 'use strict'; - var values=[]; - var extention='-l4a.js'; - var conf; - - // Configs file path last one supersead first one. - var files= [__dirname + "/AppDefaults.js", "/etc/default/noderc"+ extention, process.env.NODERC, process.env.HOME + "/.noderc"+ extention , __dirname +"/../../.noderc.js" ]; - - // Parse any existing files within config list & merge them - for (var idx in files) { - if (files[idx]) { - //console.log ("files=", files[idx]); - if (fs.existsSync (files[idx])) conf=require (files[idx]); - for (var i in conf) values[i] = conf[i]; - } - } - - // set path to search for node_module within parent directory - process.env.NODE_PATH= process.env.NODE_PATH + '../node_modules'; - - // console.log ("values=", values); - return values; -} - -module.exports = Config(); diff --git a/CAN-binder/low-can-demo/app/etc/_Trace.js b/CAN-binder/low-can-demo/app/etc/_Trace.js deleted file mode 100644 index 79ef4f5d..00000000 --- a/CAN-binder/low-can-demo/app/etc/_Trace.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2014 Fulup Ar Foll - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var util = require("util"); -var path = require("path"); -var config= require('./_Config'); - -function TracePoint () { - var saved = Error.prepareStackTrace; // save default prepareStack function - Error.prepareStackTrace = function(_, stack){ return stack; }; // overload err stack handling - Error.captureStackTrace(this, arguments.callee); // request a stack - this.trace = this.stack; // effectively build trace - Error.prepareStackTrace = saved; // restore original nodejs function -} - -// ------- Public Methods -------------- -var dbgLevel = function(target, level, format) { //+ arguments - // try to get debugLevel from calling object or global config - if (target && target.dbgLevel) dbgLevel = target.dbgLevel; - else dbgLevel = config.DBG_LVL || 1; - - if (dbgLevel >= level ) { - - var args = [].slice.call(arguments, 2); // copy argument in a real array leaving out level - var message = util.format.apply(null, args); - - var trace = new TracePoint().trace; - var info = { - fullpath : trace[1].getFileName(), - linenum : trace[1].getLineNumber(), - basename : path.basename (trace[1].getFileName()) - }; - - if (dbgLevel >= 5) { - console.log("%s:%d", info.fullpath, info.linenum); - console.log("\t[%d] %j", dbgLevel, message); - } - else console.log("--%d-- [%s:%d] -- %j", dbgLevel, info.basename, info.linenum, message); - } -}; - -module.exports = dbgLevel; |
