sweepclock: Added a memory printout to the console so the memory usage can be followed when connected

pull/743/head
adrian w kirk 2021-05-16 20:04:32 +01:00
parent a2ba365a07
commit 193b880ffb
1 changed files with 182 additions and 166 deletions

View File

@ -40,10 +40,10 @@ const color_schemes = [
let color_scheme_index = 0;
var WHITE = [1.0,1.0,1.0];
const WHITE = [1.0,1.0,1.0];
function default_white(color){
if(color == null){
return WHITE
return WHITE;
} else {
return color;
}
@ -269,7 +269,7 @@ var local = require('locale');
var last_date = null;
var last_datestr = null;
var last_coords = null;
var date_coords = [
const date_coords = [
{ name: "topright", coords:[180,30]},
{ name: "bottomright", coords:[180,220]},
{ name: "bottomleft", coords: [5,220]},
@ -386,29 +386,34 @@ class NoFont extends NumeralFont{
getName(){return "NoFont";}
}
const COPASET_DIM_20x58 = [20,58];
const COPASET_DIM_30x58 = [30,58];
const COPASET_DIM_40x58 = [40,58];
const COPASET_DIM_50x58 = [50,58];
class CopasetFont extends NumeralFont{
constructor(){
super();
}
getDimensions(hour){
switch(hour){
case 1: return [20,58];
case 1: return COPASET_DIM_20x58;
case 2:
case 3:
case 4:
case 5:
case 7:
return [30,58];
return COPASET_DIM_30x58;
case 6:
case 8:
case 9:
case 11:
case 12:
return [40,58];
return COPASET_DIM_40x58;
case 10:
return [50,58];
return COPASET_DIM_50x58;
default:
return [30,58];
return COPASET_DIM_30x58;
}
}
hour_txt(hour){ return hour.toString(); }
@ -431,7 +436,13 @@ class CopasetFont extends NumeralFont{
getName(){return "Copaset";}
}
const ROMAN_DIM_10x40 = [10,40];
const ROMAN_DIM_20x40 = [20,40];
const ROMAN_DIM_25x40 = [25,40];
const ROMAN_DIM_30x40 = [30,40];
const ROMAN_DIM_40x40 = [40,40];
const ROMAN_DIM_60x40 = [60,40];
const ROMAN_DIM_70x40 = [70,40];
class RomanNumeralFont extends NumeralFont{
constructor(){
super();
@ -456,26 +467,26 @@ class RomanNumeralFont extends NumeralFont{
getDimensions(hour){
switch (hour){
case 1:
return [10,40];
return ROMAN_DIM_10x40;
case 2:
return [25,40];
return ROMAN_DIM_25x40;
case 3:
case 4:
case 6:
case 9:
case 11:
case 12:
return [40,40];
return ROMAN_DIM_40x40;
case 5:
return [30,40];
return ROMAN_DIM_30x40;
case 7:
return [60,40];
return ROMAN_DIM_60x40;
case 8:
return [70,40];
return ROMAN_DIM_70x40;
case 10:
return [20,40];
return ROMAN_DIM_20x40;
default:
return [40,40];
return ROMAN_DIM_40x40;
}
}
hour_txt(hour){ return this.getText(hour); }
@ -746,6 +757,12 @@ function load_settings(){
}
}
function print_memoryusage(){
var m = process.memory();
var pc = Math.round(m.usage*100/m.total);
console.log("memory usage: " + pc + "%");
}
/**
* Called on button press to save down the last preference settings
*/
@ -757,6 +774,7 @@ function save_settings(){
};
console.log("saving:" + JSON.stringify(settings));
require("Storage").writeJSON("sweepclock.settings.json",settings);
print_memoryusage();
}
// Boiler plate code for setting up the clock,
@ -785,14 +803,12 @@ function scheduleDrawClock(){
}
function reset_clock(){
g.clear();
force_redraw = true;
}
Bangle.on('lcdPower', (on) => {
if (on) {
console.log("lcdPower: on");
Bangle.drawWidgets();
reset_clock();
startTimers();
} else {