Revert whitespace and code style changes

master
Jim Madge 2025-02-14 17:00:07 +00:00
parent 8b04b8766b
commit 32e53e6aea
No known key found for this signature in database
GPG Key ID: 5B629C6D46746CBA
2 changed files with 48 additions and 51 deletions

View File

@ -1,8 +1,7 @@
# Terminal clock # Terminal clock
A clock displayed as a terminal cli. A clock displayed as a terminal cli.
It can display: It can display :
- time - time
- date - date
- altitude - altitude
@ -10,6 +9,7 @@ It can display:
- motion - motion
- steps - steps
"Power saving" setting control the HR and pressure (altitude) sensors. "Power saving" setting control the HR and pressure (altitude) sensors.
If "Off" they will always be on. If "Off" they will always be on.
If "On" the sensors will be turned on every "Power on interval" minutes for 45 seconds If "On" the sensors will be turned on every "Power on interval" minutes for 45 secondes

View File

@ -11,7 +11,7 @@
let font6x8At2Size = 18; let font6x8At2Size = 18;
let font6x8FirstTextSize = 4; let font6x8FirstTextSize = 4;
let font6x8DefaultTextSize = 2; let font6x8DefaultTextSize = 2;
if (process.env.HWVERSION == 1) { if (process.env.HWVERSION == 1){
paddingY = 3; paddingY = 3;
font6x8At4Size = 48; font6x8At4Size = 48;
font6x8At2Size = 27; font6x8At2Size = 27;
@ -36,14 +36,14 @@
if (this.powerSave===undefined) this.powerSave = true; if (this.powerSave===undefined) this.powerSave = true;
["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(k => { ["L2", "L3", "L4", "L5", "L6", "L7", "L8", "L9"].forEach(k => {
if (this[k]===undefined) { if (this[k]===undefined){
if (k == "L2") this[k] = "Date"; if(k == "L2") this[k] = "Date";
else if (k == "L3") { else if(k == "L3") {
this[k] = "HR"; this[k] = "HR";
this.showHRM = true; this.showHRM = true;
} else if (k == "L4") this[k] = "Motion"; }else if(k == "L4") this[k] = "Motion";
else if (k == "L5") this[k] = "Steps"; else if(k == "L5") this[k] = "Steps";
else if (k == "L6") this[k] = ">"; else if(k == "L6") this[k] = ">";
else this[k] = "Empty"; else this[k] = "Empty";
} }
else if (this[k]==="HR") this.showHRM = true; else if (this[k]==="HR") this.showHRM = true;
@ -51,9 +51,9 @@
}); });
// set the services (HRM, pressure sensor, etc....) // set the services (HRM, pressure sensor, etc....)
if (!this.powerSave) { if(!this.powerSave){
turnOnServices(); turnOnServices();
} else { } else{
this.turnOnInterval = setInterval(turnOnServices, this.PowerOnInterval*60000); // every PowerOnInterval min this.turnOnInterval = setInterval(turnOnServices, this.PowerOnInterval*60000); // every PowerOnInterval min
} }
// start the clock unlocked // start the clock unlocked
@ -79,11 +79,11 @@
}, },
remove: function() { remove: function() {
if (this.turnOnInterval) { if (this.turnOnInterval){
clearInterval(this.turnOnInterval); clearInterval(this.turnOnInterval);
delete this.turnOnInterval; delete this.turnOnInterval;
} }
if (this.turnOffServiceTimeout) { if (this.turnOffServiceTimeout){
clearTimeout(this.turnOffServiceTimeout) clearTimeout(this.turnOffServiceTimeout)
delete this.turnOffServiceTimeout delete this.turnOffServiceTimeout
} }
@ -100,12 +100,11 @@
Draw related of specific lines Draw related of specific lines
-------------------------------- */ -------------------------------- */
let drawLine = function(line, pos) { let drawLine = function(line, pos){
if (pos == 1) { if(pos == 1)
g.setFont("6x8", font6x8FirstTextSize); g.setFont("6x8", font6x8FirstTextSize);
} else { else
g.setFont("6x8", font6x8DefaultTextSize); g.setFont("6x8", font6x8DefaultTextSize);
}
let yPos = Bangle.appRect.y + let yPos = Bangle.appRect.y +
paddingY * (pos - 1) + paddingY * (pos - 1) +
@ -114,7 +113,7 @@
g.drawString(line, 5, yPos, true); g.drawString(line, 5, yPos, true);
}; };
let drawTime = function(now, pos) { let drawTime = function(now, pos){
let h = now.getHours(); let h = now.getHours();
let m = now.getMinutes(); let m = now.getMinutes();
let time = ">" + (""+h).substr(-2) + ":" + ("0"+m).substr(-2); let time = ">" + (""+h).substr(-2) + ":" + ("0"+m).substr(-2);
@ -136,35 +135,33 @@
drawLine(date, pos); drawLine(date, pos);
}; };
let drawInput = function(pos) { let drawInput = function(pos){
drawLine(">", pos); drawLine(">", pos);
}; };
let drawStepCount = function(pos) { let drawStepCount = function(pos){
let health = Bangle.getHealthStatus("day"); let health = Bangle.getHealthStatus("day");
let steps_formated = ">Steps: " + health.steps; let steps_formated = ">Steps: " + health.steps;
drawLine(steps_formated, pos); drawLine(steps_formated, pos);
}; };
let drawHRM = function(pos) { let drawHRM = function(pos){
if (heartRate != 0) { if(heartRate != 0)
drawLine(">HR: " + parseInt(heartRate), pos); drawLine(">HR: " + parseInt(heartRate), pos);
} else { else
drawLine( drawLine(
">HR: " + parseInt(Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm)), ">HR: " + parseInt(Math.round(Bangle.getHealthStatus().bpm||Bangle.getHealthStatus("last").bpm)),
pos); pos);
}
}; };
let drawAltitude = function(pos) { let drawAltitude = function(pos){
if (altitude > 0) { if(altitude > 0)
drawLine(">Alt: " + altitude.toFixed(1) + "m", pos); drawLine(">Alt: " + altitude.toFixed(1) + "m", pos);
} else { else
drawLine(">Alt: unknown", pos); drawLine(">Alt: unknown", pos);
}
}; };
let drawMotion = function(pos) { let drawMotion = function(pos){
let health = Bangle.getHealthStatus('last'); let health = Bangle.getHealthStatus('last');
let steps_formated = ">Motion: " + parseInt(health.movement); let steps_formated = ">Motion: " + parseInt(health.movement);
drawLine(steps_formated, pos); drawLine(steps_formated, pos);
@ -174,26 +171,26 @@
Services functions (HRM, pressure, etc...) Services functions (HRM, pressure, etc...)
-------------------------------------------------- */ -------------------------------------------------- */
let turnOnServices = function() { let turnOnServices = function(){
if (clock.showHRM) { if(clock.showHRM){
Bangle.setHRMPower(true, "terminalclock"); Bangle.setHRMPower(true, "terminalclock");
} }
if (clock.showAltitude) { if(clock.showAltitude){
Bangle.setBarometerPower(true, "terminalclock"); Bangle.setBarometerPower(true, "terminalclock");
} }
if (clock.powerSave) { if(clock.powerSave){
if (clock.turnOffServiceTimeout) clearTimeout(clock.turnOffServiceTimeout); if(clock.turnOffServiceTimeout) clearTimeout(clock.turnOffServiceTimeout);
clock.turnOffServiceTimeout = setTimeout(function () { clock.turnOffServiceTimeout = setTimeout(function () {
turnOffServices(); turnOffServices();
}, 45000); }, 45000);
} }
}; };
let turnOffServices = function() { let turnOffServices = function(){
if (clock.showHRM) { if(clock.showHRM){
Bangle.setHRMPower(false, "terminalclock"); Bangle.setHRMPower(false, "terminalclock");
} }
if (clock.showAltitude) { if(clock.showAltitude){
Bangle.setBarometerPower(false, "terminalclock"); Bangle.setBarometerPower(false, "terminalclock");
} }
}; };
@ -206,7 +203,7 @@
Bangle.on("lock", clock.onLock); Bangle.on("lock", clock.onLock);
clock.onHRM = hrmInfo => { clock.onHRM = hrmInfo => {
if (hrmInfo.confidence >= clock.HRMinConfidence) if(hrmInfo.confidence >= clock.HRMinConfidence)
heartRate = hrmInfo.bpm; heartRate = hrmInfo.bpm;
}; };
Bangle.on('HRM', clock.onHRM); Bangle.on('HRM', clock.onHRM);
@ -231,15 +228,15 @@
Clock related functions but not in the ClockFace module Clock related functions but not in the ClockFace module
---------------------------------------------------- */ ---------------------------------------------------- */
let unlock = function() { let unlock = function(){
if (clock.powerSave) { if(clock.powerSave){
turnOnServices(); turnOnServices();
} }
clock.precision = clock.unlock_precision; clock.precision = clock.unlock_precision;
clock.tick(); clock.tick();
}; };
let lock = function() { let lock = function(){
clock.precision = clock.lock_precision; clock.precision = clock.lock_precision;
clock.tick(); clock.tick();
}; };