forked from FOSS/BangleApps
fix code formatting from last commit/pr
Gordon Williams
parent
1fac102afd
commit
04c2e6bb80
|
|
@ -42,21 +42,21 @@ var g_t = Graphics.createArrayBuffer(g_width,g_height_t,1,{'msb':true});
|
||||||
g.clear(); // start with blank screen
|
g.clear(); // start with blank screen
|
||||||
g.flip = function()
|
g.flip = function()
|
||||||
{
|
{
|
||||||
g.setBgColor(0,0,0);
|
g.setBgColor(0,0,0);
|
||||||
g.setColor(dateColour);
|
g.setColor(dateColour);
|
||||||
g.drawImage(
|
g.drawImage(
|
||||||
{
|
{
|
||||||
width:g_width,
|
width:g_width,
|
||||||
height:g_height_d,
|
height:g_height_d,
|
||||||
buffer:g_d.buffer
|
buffer:g_d.buffer
|
||||||
}, g_x_off, g_y_off + g_y_off_d);
|
}, g_x_off, g_y_off + g_y_off_d);
|
||||||
g.setColor(timeColour2);
|
g.setColor(timeColour2);
|
||||||
g.drawImage(
|
g.drawImage(
|
||||||
{
|
{
|
||||||
width:g_width,
|
width:g_width,
|
||||||
height:g_height_t,
|
height:g_height_t,
|
||||||
buffer:g_t.buffer
|
buffer:g_t.buffer
|
||||||
}, g_x_off, g_y_off + g_y_off_t);
|
}, g_x_off, g_y_off + g_y_off_t);
|
||||||
};
|
};
|
||||||
|
|
||||||
setWatch(function(){ modeTime(); }, BTN, {repeat:true} );
|
setWatch(function(){ modeTime(); }, BTN, {repeat:true} );
|
||||||
|
|
@ -68,10 +68,10 @@ Bangle.on('touch', function(button, xy) { //from Gordon Williams
|
||||||
});
|
});
|
||||||
|
|
||||||
function buildSequence(targ){
|
function buildSequence(targ){
|
||||||
for(let i=0;i<targ.length;++i){
|
for(let i=0;i<targ.length;++i){
|
||||||
sequence.push(new Date(accum.getTime()));
|
sequence.push(new Date(accum.getTime()));
|
||||||
accum.setDate(accum.getDate()+targ[i]);
|
accum.setDate(accum.getDate()+targ[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
buildSequence(B2);
|
buildSequence(B2);
|
||||||
buildSequence(B2);
|
buildSequence(B2);
|
||||||
|
|
@ -88,137 +88,137 @@ buildSequence(B1);
|
||||||
buildSequence(B2);
|
buildSequence(B2);
|
||||||
|
|
||||||
function getDate(dt){
|
function getDate(dt){
|
||||||
let index = sequence.findIndex(n => n > dt)-1;
|
let index = sequence.findIndex(n => n > dt)-1;
|
||||||
let year = baseYear+parseInt(index/12);
|
let year = baseYear+parseInt(index/12);
|
||||||
let month = index % 12;
|
let month = index % 12;
|
||||||
let day = parseInt((dt-sequence[index])/86400000);
|
let day = parseInt((dt-sequence[index])/86400000);
|
||||||
let colour = dateColours[day % 6];
|
let colour = dateColours[day % 6];
|
||||||
if(day==30){ colour=dateColours[6]; }
|
if(day==30){ colour=dateColours[6]; }
|
||||||
return({"year":year,"month":month,"day":day,"colour":colour});
|
return({"year":year,"month":month,"day":day,"colour":colour});
|
||||||
}
|
}
|
||||||
function toggleTimeDigits(){
|
function toggleTimeDigits(){
|
||||||
addTimeDigit = !addTimeDigit;
|
addTimeDigit = !addTimeDigit;
|
||||||
modeTime();
|
modeTime();
|
||||||
}
|
}
|
||||||
function toggleDateFormat(){
|
function toggleDateFormat(){
|
||||||
dateFormat = !dateFormat;
|
dateFormat = !dateFormat;
|
||||||
modeTime();
|
modeTime();
|
||||||
}
|
}
|
||||||
function formatDate(res,dateFormat){
|
function formatDate(res,dateFormat){
|
||||||
let yyyy = res.year.toString(12);
|
let yyyy = res.year.toString(12);
|
||||||
calenDef = calen10;
|
calenDef = calen10;
|
||||||
if(!dateFormat){ //ordinal format
|
if(!dateFormat){ //ordinal format
|
||||||
let mm = ("0"+(res.month+1).toString(12)).substr(-2);
|
let mm = ("0"+(res.month+1).toString(12)).substr(-2);
|
||||||
let dd = ("0"+(res.day+1).toString(12)).substr(-2);
|
let dd = ("0"+(res.day+1).toString(12)).substr(-2);
|
||||||
if(res.day==30){
|
if(res.day==30){
|
||||||
calenDef = calen7;
|
calenDef = calen7;
|
||||||
let m = ((res.month+1).toString(12)).substr(-2);
|
let m = ((res.month+1).toString(12)).substr(-2);
|
||||||
return(yyyy+"-"+"S"+m); // ordinal format
|
return(yyyy+"-"+"S"+m); // ordinal format
|
||||||
}
|
}
|
||||||
return(yyyy+"-"+mm+"-"+dd);
|
return(yyyy+"-"+mm+"-"+dd);
|
||||||
}
|
}
|
||||||
let m = res.month.toString(12); // cardinal format
|
let m = res.month.toString(12); // cardinal format
|
||||||
let w = parseInt(res.day/6);
|
let w = parseInt(res.day/6);
|
||||||
let d = res.day%6;
|
let d = res.day%6;
|
||||||
//return(yyyy+"-"+res.month+"-"+w+"-"+d);
|
//return(yyyy+"-"+res.month+"-"+w+"-"+d);
|
||||||
return(yyyy+"-"+m+"-"+w+"-"+d);
|
return(yyyy+"-"+m+"-"+w+"-"+d);
|
||||||
}
|
}
|
||||||
|
|
||||||
function writeDozTime(text,def){
|
function writeDozTime(text,def){
|
||||||
let pts = def.pts;
|
let pts = def.pts;
|
||||||
let x=def.pt0[0];
|
let x=def.pt0[0];
|
||||||
let y=def.pt0[1];
|
let y=def.pt0[1];
|
||||||
g_t.clear();
|
g_t.clear();
|
||||||
g_t.setFont("Vector",def.size);
|
g_t.setFont("Vector",def.size);
|
||||||
for(let i in text){
|
for(let i in text){
|
||||||
if(text[i]=="a"){ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+2+def.dx,y+1+def.dy); }
|
if(text[i]=="a"){ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+2+def.dx,y+1+def.dy); }
|
||||||
else if(text[i]=="b"){ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+2+def.dx,y+1+def.dy); }
|
else if(text[i]=="b"){ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+2+def.dx,y+1+def.dy); }
|
||||||
else{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); }
|
else{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); }
|
||||||
x = x+def.step[0];
|
x = x+def.step[0];
|
||||||
y = y+def.step[1];
|
y = y+def.step[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function writeDozDate(text,def,colour){
|
function writeDozDate(text,def,colour){
|
||||||
|
|
||||||
dateColour = colour;
|
dateColour = colour;
|
||||||
let pts = def.pts;
|
let pts = def.pts;
|
||||||
let x=def.pt0[0];
|
let x=def.pt0[0];
|
||||||
let y=def.pt0[1];
|
let y=def.pt0[1];
|
||||||
g_d.clear();
|
g_d.clear();
|
||||||
g_d.setFont("Vector",def.size);
|
g_d.setFont("Vector",def.size);
|
||||||
for(let i in text){
|
for(let i in text){
|
||||||
if(text[i]=="a"){ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+2+def.dx,y+1+def.dy); }
|
if(text[i]=="a"){ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+2+def.dx,y+1+def.dy); }
|
||||||
else if(text[i]=="b"){ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+2+def.dx,y+1+def.dy); }
|
else if(text[i]=="b"){ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+2+def.dx,y+1+def.dy); }
|
||||||
else{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); }
|
else{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); }
|
||||||
x = x+def.step[0];
|
x = x+def.step[0];
|
||||||
y = y+def.step[1];
|
y = y+def.step[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Bangle.loadWidgets();
|
Bangle.loadWidgets();
|
||||||
//for malaire's Adjust Clock widget, if used
|
//for malaire's Adjust Clock widget, if used
|
||||||
function adjustedNow() {
|
function adjustedNow() {
|
||||||
return WIDGETS.adjust ? new Date(WIDGETS.adjust.now()) : new Date();
|
return WIDGETS.adjust ? new Date(WIDGETS.adjust.now()) : new Date();
|
||||||
}
|
}
|
||||||
Bangle.drawWidgets();
|
Bangle.drawWidgets();
|
||||||
|
|
||||||
// Functions for time mode
|
// Functions for time mode
|
||||||
function drawTime()
|
function drawTime()
|
||||||
{
|
{
|
||||||
let dt = adjustedNow();
|
let dt = adjustedNow();
|
||||||
let date = "";
|
let date = "";
|
||||||
let timeDef;
|
let timeDef;
|
||||||
let x = 0;
|
let x = 0;
|
||||||
dt.setDate(dt.getDate());
|
dt.setDate(dt.getDate());
|
||||||
if(addTimeDigit){
|
if(addTimeDigit){
|
||||||
x =
|
x =
|
||||||
10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds();
|
10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds();
|
||||||
let msg = "00000"+Math.floor(x).toString(12);
|
let msg = "00000"+Math.floor(x).toString(12);
|
||||||
let time = msg.substr(-5,3)+"."+msg.substr(-2);
|
let time = msg.substr(-5,3)+"."+msg.substr(-2);
|
||||||
let wait = 347*(1-(x%1));
|
let wait = 347*(1-(x%1));
|
||||||
timeDef = time6;
|
timeDef = time6;
|
||||||
} else {
|
} else {
|
||||||
x =
|
x =
|
||||||
864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*dt.getMilliseconds();
|
864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*dt.getMilliseconds();
|
||||||
let msg = "0000"+Math.floor(x).toString(12);
|
let msg = "0000"+Math.floor(x).toString(12);
|
||||||
let time = msg.substr(-4,3)+"."+msg.substr(-1);
|
let time = msg.substr(-4,3)+"."+msg.substr(-1);
|
||||||
let wait = 4167*(1-(x%1));
|
let wait = 4167*(1-(x%1));
|
||||||
timeDef = time5;
|
timeDef = time5;
|
||||||
}
|
}
|
||||||
if(lastX > x){ res = getDate(dt); } // calculate date once at start-up and once when turning over to a new day
|
if(lastX > x){ res = getDate(dt); } // calculate date once at start-up and once when turning over to a new day
|
||||||
date = formatDate(res,dateFormat);
|
date = formatDate(res,dateFormat);
|
||||||
if(dt<timeActiveUntil)
|
if(dt<timeActiveUntil)
|
||||||
{
|
{
|
||||||
// Write to background buffers, then display on screen
|
// Write to background buffers, then display on screen
|
||||||
writeDozDate(date,calenDef,res.colour);
|
writeDozDate(date,calenDef,res.colour);
|
||||||
writeDozTime(time,timeDef);
|
writeDozTime(time,timeDef);
|
||||||
g.flip();
|
g.flip();
|
||||||
// Ready next interval
|
// Ready next interval
|
||||||
drawtime_timeout = setTimeout(drawTime,wait);
|
drawtime_timeout = setTimeout(drawTime,wait);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Clear screen
|
// Clear screen
|
||||||
g_d.clear();
|
g_d.clear();
|
||||||
g_t.clear();
|
g_t.clear();
|
||||||
g.flip();
|
g.flip();
|
||||||
|
|
||||||
}
|
}
|
||||||
lastX = x;
|
lastX = x;
|
||||||
}
|
}
|
||||||
function modeTime()
|
function modeTime()
|
||||||
{
|
{
|
||||||
timeActiveUntil = adjustedNow();
|
timeActiveUntil = adjustedNow();
|
||||||
timeActiveUntil.setDate(timeActiveUntil.getDate());
|
timeActiveUntil.setDate(timeActiveUntil.getDate());
|
||||||
timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+604800);
|
timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+604800);
|
||||||
if (typeof drawtime_timeout !== 'undefined')
|
if (typeof drawtime_timeout !== 'undefined')
|
||||||
{
|
{
|
||||||
clearTimeout(drawtime_timeout);
|
clearTimeout(drawtime_timeout);
|
||||||
}
|
}
|
||||||
drawTime();
|
drawTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start time on twist
|
// Start time on twist
|
||||||
Bangle.on('twist',function() {
|
Bangle.on('twist',function() {
|
||||||
modeTime();
|
modeTime();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue