Fixes consumer indicators and adds home button

master
Markus 2020-04-14 17:30:10 +02:00
parent f88f875694
commit 9daf178fc1
1 changed files with 24 additions and 5 deletions

View File

@ -142,7 +142,7 @@ function renderData(dataArray) {
g.setPixel(GraphXZero + i, GraphYZero - scaledTemp); g.setPixel(GraphXZero + i, GraphYZero - scaledTemp);
// LCD state // LCD state
if (parseInt(dataInfo[switchabelsIndex]) & switchableConsumers.lcd == switchableConsumers.lcd) { if (parseInt(dataInfo[switchabelsIndex]) & switchableConsumers.lcd) {
g.setColor(1, 1, 1); g.setColor(1, 1, 1);
g.setFontAlign(1, -1, 0); g.setFontAlign(1, -1, 0);
g.drawString("LCD", GraphXZero - GraphMarkerOffset, GraphLcdY - 2, true); g.drawString("LCD", GraphXZero - GraphMarkerOffset, GraphLcdY - 2, true);
@ -150,7 +150,7 @@ function renderData(dataArray) {
} }
// Compass state // Compass state
if (switchables & switchableConsumers.lcd == switchableConsumers.lcd) { if (parseInt(dataInfo[switchabelsIndex]) & switchableConsumers.compass) {
g.setColor(0, 1, 0); g.setColor(0, 1, 0);
g.setFontAlign(-1, -1, 0); g.setFontAlign(-1, -1, 0);
g.drawString("Compass", GraphXMax + GraphMarkerOffset, GraphCompassY - 2, true); g.drawString("Compass", GraphXMax + GraphMarkerOffset, GraphCompassY - 2, true);
@ -166,7 +166,7 @@ function renderData(dataArray) {
// } // }
// Gps state // Gps state
if (switchables & switchableConsumers.lcd == switchableConsumers.lcd) { if (parseInt(dataInfo[switchabelsIndex]) & switchableConsumers.gps) {
g.setColor(0.8, 0.5, 0.24); g.setColor(0.8, 0.5, 0.24);
g.setFontAlign(-1, -1, 0); g.setFontAlign(-1, -1, 0);
g.drawString("GPS", GraphXMax + GraphMarkerOffset, GraphGpsY - 2, true); g.drawString("GPS", GraphXMax + GraphMarkerOffset, GraphGpsY - 2, true);
@ -174,7 +174,7 @@ function renderData(dataArray) {
} }
// Hrm state // Hrm state
if (switchables & switchableConsumers.lcd == switchableConsumers.lcd) { if (parseInt(dataInfo[switchabelsIndex]) & switchableConsumers.hrm) {
g.setColor(1, 0, 0); g.setColor(1, 0, 0);
g.setFontAlign(1, -1, 0); g.setFontAlign(1, -1, 0);
g.drawString("HRM", GraphXZero - GraphMarkerOffset, GraphHrmY - 2, true); g.drawString("HRM", GraphXZero - GraphMarkerOffset, GraphHrmY - 2, true);
@ -185,6 +185,16 @@ function renderData(dataArray) {
dataArray = null; dataArray = null;
} }
function renderHomeIcon() {
//Home for Btn2
g.setColor(1, 1, 1);
g.drawLine(220, 118, 227, 110);
g.drawLine(227, 110, 234, 118);
g.drawPoly([222,117,222,125,232,125,232,117], false);
g.drawRect(226,120,229,125);
}
function renderBatteryChart() { function renderBatteryChart() {
renderCoordinateSystem(); renderCoordinateSystem();
let data = loadData(); let data = loadData();
@ -192,21 +202,30 @@ function renderBatteryChart() {
data = null; data = null;
} }
// Show launcher when middle button pressed
function switchOffApp(){
Bangle.showLauncher();
}
// special function to handle display switch on // special function to handle display switch on
Bangle.on('lcdPower', (on) => { Bangle.on('lcdPower', (on) => {
if (on) { if (on) {
// call your app function here // call your app function here
// If you clear the screen, do Bangle.drawWidgets(); // If you clear the screen, do Bangle.drawWidgets();
g.clear() g.clear();
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
renderBatteryChart(); renderBatteryChart();
} }
}); });
setWatch(switchOffApp, BTN2, {edge:"rising", debounce:50, repeat:true});
g.clear(); g.clear();
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
// call your app function here // call your app function here
renderHomeIcon();
renderBatteryChart(); renderBatteryChart();