bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[TerminalClock] Reapply changes for fast loading

master
Stiralbios 2023-01-29 10:13:29 +01:00
parent bddef2ef0f
commit d3c2c5a47d
3 changed files with 222 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/terminalclock/ChangeLog
View File

@ -7,3 +7,4 @@
0.07: Use ClockFace module and rework the settings to be able to personnalize the order of the lines 0.07: Use ClockFace module and rework the settings to be able to personnalize the order of the lines
0.08: Hide widgets instead of not loading them at all 0.08: Hide widgets instead of not loading them at all
Use Clockface_menu for widgets and power saving settings Use Clockface_menu for widgets and power saving settings
0.09: Add, fastload compatibility, default HRM value, default altitude value

415
apps/terminalclock/app.js
View File

@ -1,211 +1,236 @@
const locale = require("locale"); {
var heartRate = 0; const locale = require("locale");
var altitude = -9001; let heartRate = 0;
let altitude = -9001;
const fontColor = g.theme.dark ? "#0f0" : "#000"; const fontColor = g.theme.dark ? "#0f0" : "#000";
// handling the differents versions of the Banglejs smartwatch screen sizes // handling the differents versions of the Banglejs smartwatch screen sizes
if (process.env.HWVERSION == 1){ // default BJS2
var paddingY = 3; let paddingY = 2;
var font6x8At4Size = 48; let font6x8At4Size = 32;
var font6x8At2Size = 27; let font6x8At2Size = 18;
var font6x8FirstTextSize = 6; let font6x8FirstTextSize = 4;
var font6x8DefaultTextSize = 3; let font6x8DefaultTextSize = 2;
} else{ if (process.env.HWVERSION == 1){
var paddingY = 2; paddingY = 3;
var font6x8At4Size = 32; font6x8At4Size = 48;
var font6x8At2Size = 18; font6x8At2Size = 27;
var font6x8FirstTextSize = 4; font6x8FirstTextSize = 6;
var font6x8DefaultTextSize = 2; font6x8DefaultTextSize = 3;
} }
// initialising the clockface
const ClockFace = require("ClockFace");
const clock = new ClockFace({
precision: 60,
settingsFile: "terminalclock.json",
// initialising the clockface init: function () {
const ClockFace = require("ClockFace"); // check settings and set default if needed
const clock = new ClockFace({ this.showHRM = false;
precision: 60, this.showAltitude = false;
settingsFile: "terminalclock.json", this.lock_precision = this.precision;
this.unlock_precision = 1;
if (this.HRMinConfidence === undefined) this.HRMinConfidence = 50;
if (this.PowerOnInterval === undefined) this.PowerOnInterval = 15;
if (this.powerSave===undefined) this.powerSave = this.powerSaving; // migrate old setting
if (this.powerSave===undefined) this.powerSave = true;
init: function () { ["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(k => {
// check settings and set default if needed if (this[k]===undefined){
this.showHRM = false; if(k == "L2") this[k] = "Date";
this.showAltitude = false; else if(k == "L3") {
this.lock_precision = this.precision; this[k] = "HR";
this.unlock_precision = 1; this.showHRM = true;
if (this.HRMinConfidence === undefined) this.HRMinConfidence = 50; }else if(k == "L4") this[k] = "Motion";
if (this.PowerOnInterval === undefined) this.PowerOnInterval = 15; else if(k == "L5") this[k] = "Steps";
if (this.powerSave===undefined) this.powerSave = this.powerSaving; // migrate old setting else if(k == "L6") this[k] = ">";
if (this.powerSave===undefined) this.powerSave = true; else this[k] = "Empty";
["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(k => { }
if (this[k]===undefined){ else if (this[k]==="HR") this.showHRM = true;
if(k == "L2") this[k] = "Date"; else if (this[k]==="Alt") this.showAltitude = true && process.env.HWVERSION == 2;
else if(k == "L3") { });
this[k] = "HR";
this.showHRM = true;
}else if(k == "L4") this[k] = "Motion";
else if(k == "L5") this[k] = "Steps";
else if(k == "L6") this[k] = ">";
else this[k] = "Empty";
}
else if (this[k]==="HR") this.showHRM = true;
else if (this[k]==="Alt") this.showAltitude = true && process.env.HWVERSION == 2;
});
// set the lock and unlock actions // set the services (HRM, pressure sensor, etc....)
Bangle.on("lock", on => { if(!this.powerSave){
if (on) lock(); turnOnServices();
else unlock(); } else{
}); this.turnOnInterval = setInterval(turnOnServices, this.PowerOnInterval*60000); // every PowerOnInterval min
}
// start the clock unlocked
unlock();
},
// set the services (HRM, pressure sensor, etc....) draw: function (date) {
if(!this.powerSave){ let curPos = 1;
turnOnServices(); g.setFontAlign(-1, -1);
} else{ g.setColor(fontColor);
setInterval(turnOnServices, this.PowerOnInterval*60000); // every PowerOnInterval min drawTime(date, curPos);
}
// start the clock unlocked
unlock();
},
draw: function (date) {
var curPos = 1;
g.setFontAlign(-1, -1);
g.setColor(fontColor);
drawTime(date, curPos);
curPos++;
["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(line => {
if (this[line]==='Date') drawDate(date, curPos);
else if (this[line]==='HR') drawHRM(curPos);
else if (this[line]==='Motion') drawMotion(curPos);
else if (this[line]==='Alt') drawAltitude(curPos);
else if (this[line]==='Steps') drawStepCount(curPos);
else if (this[line]==='>') drawInput(curPos);
curPos++; curPos++;
});
},
});
["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(line => {
if (this[line]==='Date') drawDate(date, curPos);
else if (this[line]==='HR') drawHRM(curPos);
else if (this[line]==='Motion') drawMotion(curPos);
else if (this[line]==='Alt') drawAltitude(curPos);
else if (this[line]==='Steps') drawStepCount(curPos);
else if (this[line]==='>') drawInput(curPos);
curPos++;
});
},
/* ---------------------------- remove: function() {
Draw related of specific lines if (this.turnOnInterval){
-------------------------------- */ clearInterval(this.turnOnInterval);
delete this.turnOnInterval;
function drawLine(line, pos){ }
if(pos == 1) if (this.turnOffServiceTimeout){
g.setFont("6x8", font6x8FirstTextSize); clearTimeout(this.turnOffServiceTimeout)
else }
g.setFont("6x8", font6x8DefaultTextSize);
var yPos = Bangle.appRect.y +
paddingY * (pos - 1) +
font6x8At4Size * Math.min(1, pos-1) +
font6x8At2Size * Math.max(0, pos-2);
g.drawString(line, 5, yPos, true);
}
function drawTime(now, pos){
var h = now.getHours();
var m = now.getMinutes();
var time = ">" + (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
drawLine(time, pos);
}
function drawDate(now, pos){
var dow = locale.dow(now, 1);
var date = locale.date(now, 1).substr(0,6) + locale.date(now, 1).substr(-2);
var locale_date = ">" + dow + " " + date;
drawLine(locale_date, pos);
}
function drawInput(pos){
drawLine(">", pos);
}
function drawStepCount(pos){
var health = Bangle.getHealthStatus("day");
var steps_formated = ">Steps: " + health.steps;
drawLine(steps_formated, pos);
}
function drawHRM(pos){
if(heartRate != 0)
drawLine(">HR: " + parseInt(heartRate), pos);
else
drawLine(">HR: unknown", pos);
}
function drawAltitude(pos){
if(altitude > 0)
drawLine(">Alt: " + altitude.toFixed(1) + "m", pos);
else
drawLine(">Alt: unknown", pos);
}
function drawMotion(pos){
var health = Bangle.getHealthStatus('last');
var steps_formated = ">Motion: " + parseInt(health.movement);
drawLine(steps_formated, pos);
}
/* -----------------------------------------------
Services functions (HRM, pressure, etc...)
-------------------------------------------------- */
function turnOnServices(){
if(clock.showHRM){
Bangle.setHRMPower(true, "terminalclock");
}
if(clock.showAltitude){
Bangle.setBarometerPower(true, "terminalclock");
}
if(clock.powerSave){
setTimeout(function () {
turnOffServices(); turnOffServices();
}, 45000); if (this.onLock) Bangle.removeListener('lock', this.onLock);
} if (this.onHRM) Bangle.removeListener('HRM', this.onHRM);
} if (this.onPressure) Bangle.removeListener('onPressure', this.onPressure);
}
function turnOffServices(){ });
if(clock.showHRM){
Bangle.setHRMPower(false, "terminalclock");
}
if(clock.showAltitude){
Bangle.setBarometerPower(false, "terminalclock");
}
}
Bangle.on('HRM',function(hrmInfo) {
if(hrmInfo.confidence >= clock.HRMinConfidence)
heartRate = hrmInfo.bpm;
});
const MEDIANLENGTH = 20; // technical /* ----------------------------
var avr = [], median; // technical Draw related of specific lines
Bangle.on('pressure', function(e) { -------------------------------- */
while (avr.length>MEDIANLENGTH) avr.pop();
avr.unshift(e.altitude);
median = avr.slice().sort();
if (median.length>10) {
var mid = median.length>>1;
altitude = E.sum(median.slice(mid-4,mid+5)) / 9;
}
});
/* ------------------------------------------------- let drawLine = function(line, pos){
Clock related functions but not in the ClockFace module if(pos == 1)
---------------------------------------------------- */ g.setFont("6x8", font6x8FirstTextSize);
else
g.setFont("6x8", font6x8DefaultTextSize);
function unlock(){ let yPos = Bangle.appRect.y +
if(clock.powerSave){ paddingY * (pos - 1) +
turnOnServices(); font6x8At4Size * Math.min(1, pos-1) +
} font6x8At2Size * Math.max(0, pos-2);
clock.precision = clock.unlock_precision; g.drawString(line, 5, yPos, true);
clock.tick(); };
}
function lock(){ let drawTime = function(now, pos){
clock.precision = clock.lock_precision; let h = now.getHours();
clock.tick(); let m = now.getMinutes();
} let time = ">" + (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
drawLine(time, pos);
};
// starting the clock let drawDate = function(now, pos){
clock.start(); let dow = locale.dow(now, 1);
let date = locale.date(now, 1).substr(0,6) + locale.date(now, 1).substr(-2);
let locale_date = ">" + dow + " " + date;
drawLine(locale_date, pos);
};
let drawInput = function(pos){
drawLine(">", pos);
};
let drawStepCount = function(pos){
let health = Bangle.getHealthStatus("day");
let steps_formated = ">Steps: " + health.steps;
drawLine(steps_formated, pos);
};
let drawHRM = function(pos){
if(heartRate != 0)
drawLine(">HR: " + parseInt(heartRate), pos);
else
drawLine(
">HR: " + parseInt(Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm)),
pos);
};
let drawAltitude = function(pos){
if(altitude > 0)
drawLine(">Alt: " + altitude.toFixed(1) + "m", pos);
else
drawLine(">Alt: unknown", pos);
};
let drawMotion = function(pos){
let health = Bangle.getHealthStatus('last');
let steps_formated = ">Motion: " + parseInt(health.movement);
drawLine(steps_formated, pos);
};
/* -----------------------------------------------
Services functions (HRM, pressure, etc...)
-------------------------------------------------- */
let turnOnServices = function(){
if(clock.showHRM){
Bangle.setHRMPower(true, "terminalclock");
}
if(clock.showAltitude){
Bangle.setBarometerPower(true, "terminalclock");
}
if(clock.powerSave){
clock.turnOffServiceTimeout = setTimeout(function () {
turnOffServices();
}, 45000);
}
};
let turnOffServices = function(){
if(clock.showHRM){
Bangle.setHRMPower(false, "terminalclock");
}
if(clock.showAltitude){
Bangle.setBarometerPower(false, "terminalclock");
}
};
// set the lock and unlock actions
clock.onLock = lock_event => {
if (lock_event) lock();
else unlock();
};
Bangle.on("lock", clock.onLock);
clock.onHRM = hrmInfo => {
if(hrmInfo.confidence >= clock.HRMinConfidence)
heartRate = hrmInfo.bpm;
};
Bangle.on('HRM', clock.onHRM);
const MEDIANLENGTH = 20; // technical
let avr = [], median; // technical
clock.onPressure = pressureInfo => {
while (avr.length>MEDIANLENGTH) avr.pop();
avr.unshift(pressureInfo.altitude);
median = avr.slice().sort();
if (median.length>10) {
let mid = median.length>>1;
altitude = E.sum(median.slice(mid-4,mid+5)) / 9;
}
else
altitude = pressureInfo.altitude;
};
Bangle.on('pressure', clock.onPressure);
/* -------------------------------------------------
Clock related functions but not in the ClockFace module
---------------------------------------------------- */
let unlock = function(){
if(clock.powerSave){
turnOnServices();
}
clock.precision = clock.unlock_precision;
clock.tick();
};
let lock = function(){
clock.precision = clock.lock_precision;
clock.tick();
};
// starting the clock
clock.start();
}

2
apps/terminalclock/metadata.json
View File

@ -8,7 +8,7 @@
"type": "clock", "type": "clock",
"tags": "clock", "tags": "clock",
"supports": ["BANGLEJS", "BANGLEJS2"], "supports": ["BANGLEJS", "BANGLEJS2"],
"allow_emulator": true, "allow_emulator": false,
"readme": "README.md", "readme": "README.md",
"storage": [ "storage": [
{"name": "terminalclock.app.js","url": "app.js"}, {"name": "terminalclock.app.js","url": "app.js"},