Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doztime: Bangle 1 - fix scoping of vars time and wait #3706

Merged
merged 2 commits into from
Jan 3, 2025
Merged

doztime: Bangle 1 - fix scoping of vars time and wait #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7eabbe
doztime: Bangle 1 - fix scoping of vars `time` and `wait`
Jan 3, 2025
49faae7
doztime: Bangle 1 - fix lint warns
Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/doztime/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
now supports Adjust Clock widget, if installed
0.06: Minor code improvements
0.07: Bangle2: Shift the position of one line on the screen
0.08: Bangle1: fix scoping of variables `time` and `wait`
17 changes: 10 additions & 7 deletions apps/doztime/app-bangle1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ let addTimeDigit = false;
let dateFormat = false;
let lastX = 999999999;
let res = {};
let calenDef;
//var last_time_log = 0;

var drawtime_timeout;
Expand Down Expand Up @@ -60,7 +61,7 @@ g.flip = function()

setWatch(function(){ modeTime(); }, BTN1, {repeat:true} );
setWatch(function(){ Bangle.showLauncher(); }, BTN2, { repeat: false, edge: "falling" });
setWatch(function(){ modeWeather(); }, BTN3, {repeat:true});
//setWatch(function(){ modeWeather(); }, BTN3, {repeat:true}); // TODO: `modeWeather` is not yet implemented.
setWatch(function(){ toggleTimeDigits(); }, BTN4, {repeat:true});
setWatch(function(){ toggleDateFormat(); }, BTN5, {repeat:true});

Expand Down Expand Up @@ -122,7 +123,7 @@ function formatDate(res,dateFormat){
}

function writeDozTime(text,def){
let pts = def.pts;
//let pts = def.pts;
let x=def.pt0[0];
let y=def.pt0[1];
g_t.clear();
Expand All @@ -138,7 +139,7 @@ function writeDozTime(text,def){
function writeDozDate(text,def,colour){

dateColour = colour;
let pts = def.pts;
//let pts = def.pts;
let x=def.pt0[0];
let y=def.pt0[1];
g_d.clear();
Expand All @@ -159,20 +160,22 @@ function drawTime()
let date = "";
let timeDef;
let x = 0;
let time;
let wait;
dt.setDate(dt.getDate());
if(addTimeDigit){
x =
10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds();
let msg = "00000"+Math.floor(x).toString(12);
let time = msg.substr(-5,3)+"."+msg.substr(-2); //TODO: should `time` and `wait` have been defined outside the if block?
let wait = 347*(1-(x%1));
time = msg.substr(-5,3)+"."+msg.substr(-2);
wait = 347*(1-(x%1));
timeDef = time6;
} else {
x =
864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*dt.getMilliseconds();
let msg = "0000"+Math.floor(x).toString(12);
let time = msg.substr(-4,3)+"."+msg.substr(-1);
let wait = 4167*(1-(x%1));
time = msg.substr(-4,3)+"."+msg.substr(-1);
wait = 4167*(1-(x%1));
timeDef = time5;
}
if(lastX > x){ res = getDate(dt); } // calculate date once at start-up and once when turning over to a new day
Expand Down
2 changes: 1 addition & 1 deletion apps/doztime/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "doztime",
"name": "Dozenal Digital Time",
"shortName": "Dozenal Digital",
"version": "0.07",
"version": "0.08",
"description": "A dozenal Holocene calendar and dozenal diurnal digital clock",
"icon": "app.png",
"type": "clock",
Expand Down
Loading