From 1c2d59b1a85222a3808998a48b1c3f9f8960900b Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Mon, 10 May 2021 21:55:00 -0400
Subject: [PATCH 01/36] Create app.js

---
 apps/doztime/app.js | 223 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100644 apps/doztime/app.js

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
new file mode 100644
index 000000000..bed87870a
--- /dev/null
+++ b/apps/doztime/app.js
@@ -0,0 +1,223 @@
+// Positioning values for graphics buffers
+const g_height = 80; // total graphics height
+const g_x_off = 16; // position from left
+const g_y_off = (240 - g_height)/2; // vertical center for graphics region
+const g_width = 240 - 2 * g_x_off; // total graphics width
+const g_height_d = 32; // height of date region
+const g_y_off_d = 0; // y position of date region within graphics region
+const spacing = 0; // space between date and time in graphics region
+const g_y_off_t = g_y_off_d + g_height_d + spacing; // y position of time within graphics region
+const g_height_t = 48; // height of time region
+
+// Other vars
+const A1 = [30,30,30,30,31,31,31,31,31,31,30,30];
+const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
+const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
+const timeColour = "#f2f2f2";
+const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
+const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
+const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
+const time5 = {"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
+const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
+const baseYear = 11584;
+const baseDate = Date(2020,11,21); // month values run from 0 to 11
+let accum = new Date(baseDate.getTime());
+let sequence = [];
+let timeActiveUntil;
+let addTimeDigit = false;
+let dateFormat = false;
+let lastX = 999999999;
+let res = {};
+//var last_time_log = 0;
+
+// Date and time graphics buffers
+var dateColour = "#ffffff"; // override later
+var g_d = Graphics.createArrayBuffer(g_width,g_height_d,1,{'msb':true});
+var g_t = Graphics.createArrayBuffer(g_width,g_height_t,1,{'msb':true});
+// Set screen mode and function to write graphics buffers
+Bangle.setLCDMode();
+g.clear(); // start with blank screen
+g.flip = function()
+{
+	g.setColor(dateColour);
+	g.drawImage(
+	{
+		width:g_width,
+		height:g_height_d,
+		buffer:g_d.buffer
+	}, g_x_off, g_y_off + g_y_off_d);
+	g.setColor(timeColour);
+	g.drawImage(
+	{
+		width:g_width,
+		height:g_height_t,
+		buffer:g_t.buffer
+	}, g_x_off, g_y_off + g_y_off_t);
+};
+
+setWatch(function(){ modeTime(); }, BTN1, {repeat:true} );
+setWatch(function(){ Bangle.showLauncher(); }, BTN2, { repeat: false, edge: "falling" });
+setWatch(function(){ modeWeather(); }, BTN3, {repeat:true});
+setWatch(function(){ toggleTimeDigits(); }, BTN4, {repeat:true});
+setWatch(function(){ toggleDateFormat(); }, BTN5, {repeat:true});
+
+function buildSequence(targ){
+	for(let i=0;i<targ.length;++i){
+		sequence.push(new Date(accum.getTime()));
+		accum.setDate(accum.getDate()+targ[i]);
+	}
+}
+buildSequence(B2);
+buildSequence(B2);
+buildSequence(A1);
+buildSequence(B1);
+buildSequence(B2);
+buildSequence(B2);
+buildSequence(A1);
+buildSequence(B1);
+buildSequence(B2);
+buildSequence(B2);
+buildSequence(A1);
+buildSequence(B1);
+buildSequence(B2);
+
+function getDate(dt){
+	let index = sequence.findIndex(n => n > dt)-1;
+	let year = baseYear+parseInt(index/12);
+	let month = index % 12;
+	let day = parseInt((dt-sequence[index])/86400000);
+	let colour = dateColours[day % 6];
+	if(day==30){ colour=dateColours[6]; }
+	return({"year":year,"month":month,"day":day,"colour":colour});
+}
+function toggleTimeDigits(){
+	addTimeDigit = !addTimeDigit;
+	modeTime();
+}
+function toggleDateFormat(){
+	dateFormat = !dateFormat;
+	modeTime();
+}
+function formatDate(res,dateFormat){
+	let yyyy = res.year.toString(12);
+	calenDef = calen10;
+	if(!dateFormat){ //ordinal format
+		let mm = ("0"+(res.month+1).toString(12)).substr(-2);
+		let dd = ("0"+(res.day+1).toString(12)).substr(-2);
+		if(res.day==30){
+			calenDef = calen7;
+			let m = ((res.month+1).toString(12)).substr(-2);
+			return(yyyy+"-"+"S"+m); // ordinal format
+		}
+		return(yyyy+"-"+mm+"-"+dd);
+	}
+	let m = res.month.toString(12); // cardinal format
+	let w = parseInt(res.day/6);
+	let d = res.day%6;
+	//return(yyyy+"-"+res.month+"-"+w+"-"+d);
+	return(yyyy+"-"+m+"-"+w+"-"+d);
+}
+
+function writeDozTime(text,def,colour){
+	let pts = def.pts;
+	let x=def.pt0[0];
+	let y=def.pt0[1];
+	g_t.clear();
+	g_t.setFont("Vector",def.size);
+	g_t.setColor(colour);
+	for(let i in text){
+		if(text[i]=="a"){ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+def.dx,y+def.dy); }
+		else if(text[i]=="b"){ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+def.dx,y+def.dy); }
+		else{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); }
+		x = x+def.step[0];
+		y = y+def.step[1];
+	}
+}
+function writeDozDate(text,def,colour){
+	dateColour = colour;
+	let pts = def.pts;
+	let x=def.pt0[0];
+	let y=def.pt0[1];
+	g_d.clear();
+	g_d.setFont("Vector",def.size);
+	g_d.setColor(colour);
+	for(let i in text){
+		if(text[i]=="a"){ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+def.dx,y+def.dy); }
+		else if(text[i]=="b"){ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+def.dx,y+def.dy); }
+		else{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); }
+		x = x+def.step[0];
+		y = y+def.step[1];
+	}
+}
+
+// Functions for time mode
+function drawTime()
+{
+	let dt = new Date();
+	let date = "";
+	let timeDef;
+	let x = 0;
+	dt.setDate(dt.getDate());
+	if(addTimeDigit){
+		x =
+		10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*(dt.getMilliseconds()+1500);
+		let msg = "00000"+Math.floor(x).toString(12);
+		let time = msg.substr(-5,3)+"."+msg.substr(-2);
+		let wait = 347*(1-(x%1));
+		timeDef = time6;
+	} else {
+		x =
+		864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*(dt.getMilliseconds()+1500);
+		let msg = "0000"+Math.floor(x).toString(12);
+		let time = msg.substr(-4,3)+"."+msg.substr(-1);
+		let 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
+	date = formatDate(res,dateFormat);
+	if(dt<timeActiveUntil)
+	{
+		// Write to background buffers, then display on screen
+		writeDozDate(date,calenDef,res.colour);
+		writeDozTime(time,timeDef,timeColour);
+		g.flip();
+		// Ready next interval
+		setTimeout(drawTime,wait);
+	}
+	else
+	{
+		// Clear screen
+		g_d.clear();
+		g_t.clear();
+		g.flip();
+	}
+	lastX = x;
+}
+function modeTime()
+{
+	timeActiveUntil = new Date();
+	timeActiveUntil.setDate(timeActiveUntil.getDate());
+	timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+15);
+	//Bangle.setLCDPower(true);
+	clearTimeout();
+	drawTime();
+}
+
+// Time-logging function
+/*function logTime(label)
+{
+	var d = new Date();
+	var t = d.getTime();
+	var diff_test = t - last_time_log;
+	last_time_log = t;
+	console.log(label + " at time: " + t + ", since last: " + diff_test);
+}*/
+
+// Functions for weather mode - TODO
+function drawWeather() {}
+function modeWeather() {}
+
+// Start time on twist
+Bangle.on('twist', function() {
+	modeTime();
+});

From 18e443ec08e49866bba01ca68b99823bab5478b7 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Mon, 10 May 2021 21:59:50 -0400
Subject: [PATCH 02/36] Add files via upload

---
 apps/doztime/app.js | 452 ++++++++++++++++++++++----------------------
 1 file changed, 230 insertions(+), 222 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index bed87870a..b079ac6e5 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -1,223 +1,231 @@
-// Positioning values for graphics buffers
-const g_height = 80; // total graphics height
-const g_x_off = 16; // position from left
-const g_y_off = (240 - g_height)/2; // vertical center for graphics region
-const g_width = 240 - 2 * g_x_off; // total graphics width
-const g_height_d = 32; // height of date region
-const g_y_off_d = 0; // y position of date region within graphics region
-const spacing = 0; // space between date and time in graphics region
-const g_y_off_t = g_y_off_d + g_height_d + spacing; // y position of time within graphics region
-const g_height_t = 48; // height of time region
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
-// Other vars
-const A1 = [30,30,30,30,31,31,31,31,31,31,30,30];
-const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
-const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
-const timeColour = "#f2f2f2";
-const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
-const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
-const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
-const time5 = {"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
-const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
-const baseYear = 11584;
-const baseDate = Date(2020,11,21); // month values run from 0 to 11
-let accum = new Date(baseDate.getTime());
-let sequence = [];
-let timeActiveUntil;
-let addTimeDigit = false;
-let dateFormat = false;
-let lastX = 999999999;
-let res = {};
-//var last_time_log = 0;
-
-// Date and time graphics buffers
-var dateColour = "#ffffff"; // override later
-var g_d = Graphics.createArrayBuffer(g_width,g_height_d,1,{'msb':true});
-var g_t = Graphics.createArrayBuffer(g_width,g_height_t,1,{'msb':true});
-// Set screen mode and function to write graphics buffers
-Bangle.setLCDMode();
-g.clear(); // start with blank screen
-g.flip = function()
-{
-	g.setColor(dateColour);
-	g.drawImage(
-	{
-		width:g_width,
-		height:g_height_d,
-		buffer:g_d.buffer
-	}, g_x_off, g_y_off + g_y_off_d);
-	g.setColor(timeColour);
-	g.drawImage(
-	{
-		width:g_width,
-		height:g_height_t,
-		buffer:g_t.buffer
-	}, g_x_off, g_y_off + g_y_off_t);
-};
-
-setWatch(function(){ modeTime(); }, BTN1, {repeat:true} );
-setWatch(function(){ Bangle.showLauncher(); }, BTN2, { repeat: false, edge: "falling" });
-setWatch(function(){ modeWeather(); }, BTN3, {repeat:true});
-setWatch(function(){ toggleTimeDigits(); }, BTN4, {repeat:true});
-setWatch(function(){ toggleDateFormat(); }, BTN5, {repeat:true});
-
-function buildSequence(targ){
-	for(let i=0;i<targ.length;++i){
-		sequence.push(new Date(accum.getTime()));
-		accum.setDate(accum.getDate()+targ[i]);
-	}
-}
-buildSequence(B2);
-buildSequence(B2);
-buildSequence(A1);
-buildSequence(B1);
-buildSequence(B2);
-buildSequence(B2);
-buildSequence(A1);
-buildSequence(B1);
-buildSequence(B2);
-buildSequence(B2);
-buildSequence(A1);
-buildSequence(B1);
-buildSequence(B2);
-
-function getDate(dt){
-	let index = sequence.findIndex(n => n > dt)-1;
-	let year = baseYear+parseInt(index/12);
-	let month = index % 12;
-	let day = parseInt((dt-sequence[index])/86400000);
-	let colour = dateColours[day % 6];
-	if(day==30){ colour=dateColours[6]; }
-	return({"year":year,"month":month,"day":day,"colour":colour});
-}
-function toggleTimeDigits(){
-	addTimeDigit = !addTimeDigit;
-	modeTime();
-}
-function toggleDateFormat(){
-	dateFormat = !dateFormat;
-	modeTime();
-}
-function formatDate(res,dateFormat){
-	let yyyy = res.year.toString(12);
-	calenDef = calen10;
-	if(!dateFormat){ //ordinal format
-		let mm = ("0"+(res.month+1).toString(12)).substr(-2);
-		let dd = ("0"+(res.day+1).toString(12)).substr(-2);
-		if(res.day==30){
-			calenDef = calen7;
-			let m = ((res.month+1).toString(12)).substr(-2);
-			return(yyyy+"-"+"S"+m); // ordinal format
-		}
-		return(yyyy+"-"+mm+"-"+dd);
-	}
-	let m = res.month.toString(12); // cardinal format
-	let w = parseInt(res.day/6);
-	let d = res.day%6;
-	//return(yyyy+"-"+res.month+"-"+w+"-"+d);
-	return(yyyy+"-"+m+"-"+w+"-"+d);
-}
-
-function writeDozTime(text,def,colour){
-	let pts = def.pts;
-	let x=def.pt0[0];
-	let y=def.pt0[1];
-	g_t.clear();
-	g_t.setFont("Vector",def.size);
-	g_t.setColor(colour);
-	for(let i in text){
-		if(text[i]=="a"){ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+def.dx,y+def.dy); }
-		else if(text[i]=="b"){ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+def.dx,y+def.dy); }
-		else{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); }
-		x = x+def.step[0];
-		y = y+def.step[1];
-	}
-}
-function writeDozDate(text,def,colour){
-	dateColour = colour;
-	let pts = def.pts;
-	let x=def.pt0[0];
-	let y=def.pt0[1];
-	g_d.clear();
-	g_d.setFont("Vector",def.size);
-	g_d.setColor(colour);
-	for(let i in text){
-		if(text[i]=="a"){ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+def.dx,y+def.dy); }
-		else if(text[i]=="b"){ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+def.dx,y+def.dy); }
-		else{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); }
-		x = x+def.step[0];
-		y = y+def.step[1];
-	}
-}
-
-// Functions for time mode
-function drawTime()
-{
-	let dt = new Date();
-	let date = "";
-	let timeDef;
-	let x = 0;
-	dt.setDate(dt.getDate());
-	if(addTimeDigit){
-		x =
-		10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*(dt.getMilliseconds()+1500);
-		let msg = "00000"+Math.floor(x).toString(12);
-		let time = msg.substr(-5,3)+"."+msg.substr(-2);
-		let wait = 347*(1-(x%1));
-		timeDef = time6;
-	} else {
-		x =
-		864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*(dt.getMilliseconds()+1500);
-		let msg = "0000"+Math.floor(x).toString(12);
-		let time = msg.substr(-4,3)+"."+msg.substr(-1);
-		let 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
-	date = formatDate(res,dateFormat);
-	if(dt<timeActiveUntil)
-	{
-		// Write to background buffers, then display on screen
-		writeDozDate(date,calenDef,res.colour);
-		writeDozTime(time,timeDef,timeColour);
-		g.flip();
-		// Ready next interval
-		setTimeout(drawTime,wait);
-	}
-	else
-	{
-		// Clear screen
-		g_d.clear();
-		g_t.clear();
-		g.flip();
-	}
-	lastX = x;
-}
-function modeTime()
-{
-	timeActiveUntil = new Date();
-	timeActiveUntil.setDate(timeActiveUntil.getDate());
-	timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+15);
-	//Bangle.setLCDPower(true);
-	clearTimeout();
-	drawTime();
-}
-
-// Time-logging function
-/*function logTime(label)
-{
-	var d = new Date();
-	var t = d.getTime();
-	var diff_test = t - last_time_log;
-	last_time_log = t;
-	console.log(label + " at time: " + t + ", since last: " + diff_test);
-}*/
-
-// Functions for weather mode - TODO
-function drawWeather() {}
-function modeWeather() {}
-
-// Start time on twist
-Bangle.on('twist', function() {
-	modeTime();
-});
+\f0\fs24 \cf0 // Positioning values for graphics buffers\
+const g_height = 80; // total graphics height\
+const g_x_off = 16; // position from left\
+const g_y_off = (240 - g_height)/2; // vertical center for graphics region\
+const g_width = 240 - 2 * g_x_off; // total graphics width\
+const g_height_d = 32; // height of date region\
+const g_y_off_d = 0; // y position of date region within graphics region\
+const spacing = 0; // space between date and time in graphics region\
+const g_y_off_t = g_y_off_d + g_height_d + spacing; // y position of time within graphics region\
+const g_height_t = 48; // height of time region\
+\
+// Other vars\
+const A1 = [30,30,30,30,31,31,31,31,31,31,30,30];\
+const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];\
+const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];\
+const timeColour = "#f2f2f2";\
+const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];\
+const calen10 = \{"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5\}; // positioning for usual calendar line\
+const calen7 = \{"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5\}; // positioning for S-day calendar line\
+const time5 = \{"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5\}; // positioning for lull time line\
+const time6 = \{"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5\}; // positioning for twinkling time line\
+const baseYear = 11584;\
+const baseDate = Date(2020,11,21); // month values run from 0 to 11\
+let accum = new Date(baseDate.getTime());\
+let sequence = [];\
+let timeActiveUntil;\
+let addTimeDigit = false;\
+let dateFormat = false;\
+let lastX = 999999999;\
+let res = \{\};\
+//var last_time_log = 0;\
+\
+// Date and time graphics buffers\
+var dateColour = "#ffffff"; // override later\
+var g_d = Graphics.createArrayBuffer(g_width,g_height_d,1,\{'msb':true\});\
+var g_t = Graphics.createArrayBuffer(g_width,g_height_t,1,\{'msb':true\});\
+// Set screen mode and function to write graphics buffers\
+Bangle.setLCDMode();\
+g.clear(); // start with blank screen\
+g.flip = function()\
+\{\
+	g.setColor(dateColour);\
+	g.drawImage(\
+	\{\
+		width:g_width,\
+		height:g_height_d,\
+		buffer:g_d.buffer\
+	\}, g_x_off, g_y_off + g_y_off_d);\
+	g.setColor(timeColour);\
+	g.drawImage(\
+	\{\
+		width:g_width,\
+		height:g_height_t,\
+		buffer:g_t.buffer\
+	\}, g_x_off, g_y_off + g_y_off_t);\
+\};\
+\
+setWatch(function()\{ modeTime(); \}, BTN1, \{repeat:true\} );\
+setWatch(function()\{ Bangle.showLauncher(); \}, BTN2, \{ repeat: false, edge: "falling" \});\
+setWatch(function()\{ modeWeather(); \}, BTN3, \{repeat:true\});\
+setWatch(function()\{ toggleTimeDigits(); \}, BTN4, \{repeat:true\});\
+setWatch(function()\{ toggleDateFormat(); \}, BTN5, \{repeat:true\});\
+\
+function buildSequence(targ)\{\
+	for(let i=0;i<targ.length;++i)\{\
+		sequence.push(new Date(accum.getTime()));\
+		accum.setDate(accum.getDate()+targ[i]);\
+	\}\
+\}\
+buildSequence(B2);\
+buildSequence(B2);\
+buildSequence(A1);\
+buildSequence(B1);\
+buildSequence(B2);\
+buildSequence(B2);\
+buildSequence(A1);\
+buildSequence(B1);\
+buildSequence(B2);\
+buildSequence(B2);\
+buildSequence(A1);\
+buildSequence(B1);\
+buildSequence(B2);\
+\
+function getDate(dt)\{\
+	let index = sequence.findIndex(n => n > dt)-1;\
+	let year = baseYear+parseInt(index/12);\
+	let month = index % 12;\
+	let day = parseInt((dt-sequence[index])/86400000);\
+	let colour = dateColours[day % 6];\
+	if(day==30)\{ colour=dateColours[6]; \}\
+	return(\{"year":year,"month":month,"day":day,"colour":colour\});\
+\}\
+function toggleTimeDigits()\{\
+	addTimeDigit = !addTimeDigit;\
+	modeTime();\
+\}\
+function toggleDateFormat()\{\
+	dateFormat = !dateFormat;\
+	modeTime();\
+\}\
+function formatDate(res,dateFormat)\{\
+	let yyyy = res.year.toString(12);\
+	calenDef = calen10;\
+	if(!dateFormat)\{ //ordinal format\
+		let mm = ("0"+(res.month+1).toString(12)).substr(-2);\
+		let dd = ("0"+(res.day+1).toString(12)).substr(-2);\
+		if(res.day==30)\{\
+			calenDef = calen7;\
+			let m = ((res.month+1).toString(12)).substr(-2);\
+			return(yyyy+"-"+"S"+m); // ordinal format\
+		\}\
+		return(yyyy+"-"+mm+"-"+dd);\
+	\}\
+	let m = res.month.toString(12); // cardinal format\
+	let w = parseInt(res.day/6);\
+	let d = res.day%6;\
+	//return(yyyy+"-"+res.month+"-"+w+"-"+d);\
+	return(yyyy+"-"+m+"-"+w+"-"+d);\
+\}\
+\
+function writeDozTime(text,def,colour)\{\
+	let pts = def.pts;\
+	let x=def.pt0[0];\
+	let y=def.pt0[1];\
+	g_t.clear();\
+	g_t.setFont("Vector",def.size);\
+	g_t.setColor(colour);\
+	for(let i in text)\{\
+		if(text[i]=="a")\{ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+def.dx,y+def.dy); \}\
+		else if(text[i]=="b")\{ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+def.dx,y+def.dy); \}\
+		else\{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); \}\
+		x = x+def.step[0];\
+		y = y+def.step[1];\
+	\}\
+\}\
+function writeDozDate(text,def,colour)\{\
+	dateColour = colour;\
+	let pts = def.pts;\
+	let x=def.pt0[0];\
+	let y=def.pt0[1];\
+	g_d.clear();\
+	g_d.setFont("Vector",def.size);\
+	g_d.setColor(colour);\
+	for(let i in text)\{\
+		if(text[i]=="a")\{ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+def.dx,y+def.dy); \}\
+		else if(text[i]=="b")\{ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+def.dx,y+def.dy); \}\
+		else\{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); \}\
+		x = x+def.step[0];\
+		y = y+def.step[1];\
+	\}\
+\}\
+\
+// Functions for time mode\
+function drawTime()\
+\{\
+	let dt = new Date();\
+	let date = "";\
+	let timeDef;\
+	let x = 0;\
+	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);\
+		let 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));\
+		timeDef = time5;\
+	\}\
+	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);\
+	if(dt<timeActiveUntil)\
+	\{\
+		// Write to background buffers, then display on screen\
+		writeDozDate(date,calenDef,res.colour);\
+		writeDozTime(time,timeDef,timeColour);\
+		g.flip();\
+		// Ready next interval\
+		setTimeout(drawTime,wait);\
+	\}\
+	else\
+	\{\
+		// Clear screen\
+		g_d.clear();\
+		g_t.clear();\
+		g.flip();\
+	\}\
+	lastX = x;\
+\}\
+function modeTime()\
+\{\
+	timeActiveUntil = new Date();\
+	timeActiveUntil.setDate(timeActiveUntil.getDate());\
+	timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+15);\
+	//Bangle.setLCDPower(true);\
+	clearTimeout();\
+	drawTime();\
+\}\
+\
+// Time-logging function\
+/*function logTime(label)\
+\{\
+	var d = new Date();\
+	var t = d.getTime();\
+	var diff_test = t - last_time_log;\
+	last_time_log = t;\
+	console.log(label + " at time: " + t + ", since last: " + diff_test);\
+\}*/\
+\
+// Start time on twist\
+Bangle.on('twist', function() \{\
+	modeTime();\
+\});\
+\
+// Functions for weather mode - TODO\
+function drawWeather() \{\}\
+function modeWeather() \{\}\
+}
\ No newline at end of file

From 40ee87674d1a8aec2619644461e3742e731a4de6 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Mon, 10 May 2021 22:19:49 -0400
Subject: [PATCH 03/36] Delete app.js

---
 apps/doztime/app.js | 231 --------------------------------------------
 1 file changed, 231 deletions(-)
 delete mode 100644 apps/doztime/app.js

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
deleted file mode 100644
index b079ac6e5..000000000
--- a/apps/doztime/app.js
+++ /dev/null
@@ -1,231 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-\margl1440\margr1440\vieww10800\viewh8400\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
-
-\f0\fs24 \cf0 // Positioning values for graphics buffers\
-const g_height = 80; // total graphics height\
-const g_x_off = 16; // position from left\
-const g_y_off = (240 - g_height)/2; // vertical center for graphics region\
-const g_width = 240 - 2 * g_x_off; // total graphics width\
-const g_height_d = 32; // height of date region\
-const g_y_off_d = 0; // y position of date region within graphics region\
-const spacing = 0; // space between date and time in graphics region\
-const g_y_off_t = g_y_off_d + g_height_d + spacing; // y position of time within graphics region\
-const g_height_t = 48; // height of time region\
-\
-// Other vars\
-const A1 = [30,30,30,30,31,31,31,31,31,31,30,30];\
-const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];\
-const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];\
-const timeColour = "#f2f2f2";\
-const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];\
-const calen10 = \{"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5\}; // positioning for usual calendar line\
-const calen7 = \{"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5\}; // positioning for S-day calendar line\
-const time5 = \{"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5\}; // positioning for lull time line\
-const time6 = \{"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5\}; // positioning for twinkling time line\
-const baseYear = 11584;\
-const baseDate = Date(2020,11,21); // month values run from 0 to 11\
-let accum = new Date(baseDate.getTime());\
-let sequence = [];\
-let timeActiveUntil;\
-let addTimeDigit = false;\
-let dateFormat = false;\
-let lastX = 999999999;\
-let res = \{\};\
-//var last_time_log = 0;\
-\
-// Date and time graphics buffers\
-var dateColour = "#ffffff"; // override later\
-var g_d = Graphics.createArrayBuffer(g_width,g_height_d,1,\{'msb':true\});\
-var g_t = Graphics.createArrayBuffer(g_width,g_height_t,1,\{'msb':true\});\
-// Set screen mode and function to write graphics buffers\
-Bangle.setLCDMode();\
-g.clear(); // start with blank screen\
-g.flip = function()\
-\{\
-	g.setColor(dateColour);\
-	g.drawImage(\
-	\{\
-		width:g_width,\
-		height:g_height_d,\
-		buffer:g_d.buffer\
-	\}, g_x_off, g_y_off + g_y_off_d);\
-	g.setColor(timeColour);\
-	g.drawImage(\
-	\{\
-		width:g_width,\
-		height:g_height_t,\
-		buffer:g_t.buffer\
-	\}, g_x_off, g_y_off + g_y_off_t);\
-\};\
-\
-setWatch(function()\{ modeTime(); \}, BTN1, \{repeat:true\} );\
-setWatch(function()\{ Bangle.showLauncher(); \}, BTN2, \{ repeat: false, edge: "falling" \});\
-setWatch(function()\{ modeWeather(); \}, BTN3, \{repeat:true\});\
-setWatch(function()\{ toggleTimeDigits(); \}, BTN4, \{repeat:true\});\
-setWatch(function()\{ toggleDateFormat(); \}, BTN5, \{repeat:true\});\
-\
-function buildSequence(targ)\{\
-	for(let i=0;i<targ.length;++i)\{\
-		sequence.push(new Date(accum.getTime()));\
-		accum.setDate(accum.getDate()+targ[i]);\
-	\}\
-\}\
-buildSequence(B2);\
-buildSequence(B2);\
-buildSequence(A1);\
-buildSequence(B1);\
-buildSequence(B2);\
-buildSequence(B2);\
-buildSequence(A1);\
-buildSequence(B1);\
-buildSequence(B2);\
-buildSequence(B2);\
-buildSequence(A1);\
-buildSequence(B1);\
-buildSequence(B2);\
-\
-function getDate(dt)\{\
-	let index = sequence.findIndex(n => n > dt)-1;\
-	let year = baseYear+parseInt(index/12);\
-	let month = index % 12;\
-	let day = parseInt((dt-sequence[index])/86400000);\
-	let colour = dateColours[day % 6];\
-	if(day==30)\{ colour=dateColours[6]; \}\
-	return(\{"year":year,"month":month,"day":day,"colour":colour\});\
-\}\
-function toggleTimeDigits()\{\
-	addTimeDigit = !addTimeDigit;\
-	modeTime();\
-\}\
-function toggleDateFormat()\{\
-	dateFormat = !dateFormat;\
-	modeTime();\
-\}\
-function formatDate(res,dateFormat)\{\
-	let yyyy = res.year.toString(12);\
-	calenDef = calen10;\
-	if(!dateFormat)\{ //ordinal format\
-		let mm = ("0"+(res.month+1).toString(12)).substr(-2);\
-		let dd = ("0"+(res.day+1).toString(12)).substr(-2);\
-		if(res.day==30)\{\
-			calenDef = calen7;\
-			let m = ((res.month+1).toString(12)).substr(-2);\
-			return(yyyy+"-"+"S"+m); // ordinal format\
-		\}\
-		return(yyyy+"-"+mm+"-"+dd);\
-	\}\
-	let m = res.month.toString(12); // cardinal format\
-	let w = parseInt(res.day/6);\
-	let d = res.day%6;\
-	//return(yyyy+"-"+res.month+"-"+w+"-"+d);\
-	return(yyyy+"-"+m+"-"+w+"-"+d);\
-\}\
-\
-function writeDozTime(text,def,colour)\{\
-	let pts = def.pts;\
-	let x=def.pt0[0];\
-	let y=def.pt0[1];\
-	g_t.clear();\
-	g_t.setFont("Vector",def.size);\
-	g_t.setColor(colour);\
-	for(let i in text)\{\
-		if(text[i]=="a")\{ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+def.dx,y+def.dy); \}\
-		else if(text[i]=="b")\{ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+def.dx,y+def.dy); \}\
-		else\{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); \}\
-		x = x+def.step[0];\
-		y = y+def.step[1];\
-	\}\
-\}\
-function writeDozDate(text,def,colour)\{\
-	dateColour = colour;\
-	let pts = def.pts;\
-	let x=def.pt0[0];\
-	let y=def.pt0[1];\
-	g_d.clear();\
-	g_d.setFont("Vector",def.size);\
-	g_d.setColor(colour);\
-	for(let i in text)\{\
-		if(text[i]=="a")\{ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+def.dx,y+def.dy); \}\
-		else if(text[i]=="b")\{ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+def.dx,y+def.dy); \}\
-		else\{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); \}\
-		x = x+def.step[0];\
-		y = y+def.step[1];\
-	\}\
-\}\
-\
-// Functions for time mode\
-function drawTime()\
-\{\
-	let dt = new Date();\
-	let date = "";\
-	let timeDef;\
-	let x = 0;\
-	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);\
-		let 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));\
-		timeDef = time5;\
-	\}\
-	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);\
-	if(dt<timeActiveUntil)\
-	\{\
-		// Write to background buffers, then display on screen\
-		writeDozDate(date,calenDef,res.colour);\
-		writeDozTime(time,timeDef,timeColour);\
-		g.flip();\
-		// Ready next interval\
-		setTimeout(drawTime,wait);\
-	\}\
-	else\
-	\{\
-		// Clear screen\
-		g_d.clear();\
-		g_t.clear();\
-		g.flip();\
-	\}\
-	lastX = x;\
-\}\
-function modeTime()\
-\{\
-	timeActiveUntil = new Date();\
-	timeActiveUntil.setDate(timeActiveUntil.getDate());\
-	timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+15);\
-	//Bangle.setLCDPower(true);\
-	clearTimeout();\
-	drawTime();\
-\}\
-\
-// Time-logging function\
-/*function logTime(label)\
-\{\
-	var d = new Date();\
-	var t = d.getTime();\
-	var diff_test = t - last_time_log;\
-	last_time_log = t;\
-	console.log(label + " at time: " + t + ", since last: " + diff_test);\
-\}*/\
-\
-// Start time on twist\
-Bangle.on('twist', function() \{\
-	modeTime();\
-\});\
-\
-// Functions for weather mode - TODO\
-function drawWeather() \{\}\
-function modeWeather() \{\}\
-}
\ No newline at end of file

From 8973ebe7a84fae57dde762d9cb13d074addf8b7f Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Mon, 10 May 2021 22:24:27 -0400
Subject: [PATCH 04/36] Create app.js

---
 apps/doztime/app.js | 223 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100644 apps/doztime/app.js

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
new file mode 100644
index 000000000..bed87870a
--- /dev/null
+++ b/apps/doztime/app.js
@@ -0,0 +1,223 @@
+// Positioning values for graphics buffers
+const g_height = 80; // total graphics height
+const g_x_off = 16; // position from left
+const g_y_off = (240 - g_height)/2; // vertical center for graphics region
+const g_width = 240 - 2 * g_x_off; // total graphics width
+const g_height_d = 32; // height of date region
+const g_y_off_d = 0; // y position of date region within graphics region
+const spacing = 0; // space between date and time in graphics region
+const g_y_off_t = g_y_off_d + g_height_d + spacing; // y position of time within graphics region
+const g_height_t = 48; // height of time region
+
+// Other vars
+const A1 = [30,30,30,30,31,31,31,31,31,31,30,30];
+const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
+const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
+const timeColour = "#f2f2f2";
+const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
+const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
+const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
+const time5 = {"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
+const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
+const baseYear = 11584;
+const baseDate = Date(2020,11,21); // month values run from 0 to 11
+let accum = new Date(baseDate.getTime());
+let sequence = [];
+let timeActiveUntil;
+let addTimeDigit = false;
+let dateFormat = false;
+let lastX = 999999999;
+let res = {};
+//var last_time_log = 0;
+
+// Date and time graphics buffers
+var dateColour = "#ffffff"; // override later
+var g_d = Graphics.createArrayBuffer(g_width,g_height_d,1,{'msb':true});
+var g_t = Graphics.createArrayBuffer(g_width,g_height_t,1,{'msb':true});
+// Set screen mode and function to write graphics buffers
+Bangle.setLCDMode();
+g.clear(); // start with blank screen
+g.flip = function()
+{
+	g.setColor(dateColour);
+	g.drawImage(
+	{
+		width:g_width,
+		height:g_height_d,
+		buffer:g_d.buffer
+	}, g_x_off, g_y_off + g_y_off_d);
+	g.setColor(timeColour);
+	g.drawImage(
+	{
+		width:g_width,
+		height:g_height_t,
+		buffer:g_t.buffer
+	}, g_x_off, g_y_off + g_y_off_t);
+};
+
+setWatch(function(){ modeTime(); }, BTN1, {repeat:true} );
+setWatch(function(){ Bangle.showLauncher(); }, BTN2, { repeat: false, edge: "falling" });
+setWatch(function(){ modeWeather(); }, BTN3, {repeat:true});
+setWatch(function(){ toggleTimeDigits(); }, BTN4, {repeat:true});
+setWatch(function(){ toggleDateFormat(); }, BTN5, {repeat:true});
+
+function buildSequence(targ){
+	for(let i=0;i<targ.length;++i){
+		sequence.push(new Date(accum.getTime()));
+		accum.setDate(accum.getDate()+targ[i]);
+	}
+}
+buildSequence(B2);
+buildSequence(B2);
+buildSequence(A1);
+buildSequence(B1);
+buildSequence(B2);
+buildSequence(B2);
+buildSequence(A1);
+buildSequence(B1);
+buildSequence(B2);
+buildSequence(B2);
+buildSequence(A1);
+buildSequence(B1);
+buildSequence(B2);
+
+function getDate(dt){
+	let index = sequence.findIndex(n => n > dt)-1;
+	let year = baseYear+parseInt(index/12);
+	let month = index % 12;
+	let day = parseInt((dt-sequence[index])/86400000);
+	let colour = dateColours[day % 6];
+	if(day==30){ colour=dateColours[6]; }
+	return({"year":year,"month":month,"day":day,"colour":colour});
+}
+function toggleTimeDigits(){
+	addTimeDigit = !addTimeDigit;
+	modeTime();
+}
+function toggleDateFormat(){
+	dateFormat = !dateFormat;
+	modeTime();
+}
+function formatDate(res,dateFormat){
+	let yyyy = res.year.toString(12);
+	calenDef = calen10;
+	if(!dateFormat){ //ordinal format
+		let mm = ("0"+(res.month+1).toString(12)).substr(-2);
+		let dd = ("0"+(res.day+1).toString(12)).substr(-2);
+		if(res.day==30){
+			calenDef = calen7;
+			let m = ((res.month+1).toString(12)).substr(-2);
+			return(yyyy+"-"+"S"+m); // ordinal format
+		}
+		return(yyyy+"-"+mm+"-"+dd);
+	}
+	let m = res.month.toString(12); // cardinal format
+	let w = parseInt(res.day/6);
+	let d = res.day%6;
+	//return(yyyy+"-"+res.month+"-"+w+"-"+d);
+	return(yyyy+"-"+m+"-"+w+"-"+d);
+}
+
+function writeDozTime(text,def,colour){
+	let pts = def.pts;
+	let x=def.pt0[0];
+	let y=def.pt0[1];
+	g_t.clear();
+	g_t.setFont("Vector",def.size);
+	g_t.setColor(colour);
+	for(let i in text){
+		if(text[i]=="a"){ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+def.dx,y+def.dy); }
+		else if(text[i]=="b"){ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+def.dx,y+def.dy); }
+		else{ g_t.setFontAlign(0,0,0); g_t.drawString(text[i],x,y); }
+		x = x+def.step[0];
+		y = y+def.step[1];
+	}
+}
+function writeDozDate(text,def,colour){
+	dateColour = colour;
+	let pts = def.pts;
+	let x=def.pt0[0];
+	let y=def.pt0[1];
+	g_d.clear();
+	g_d.setFont("Vector",def.size);
+	g_d.setColor(colour);
+	for(let i in text){
+		if(text[i]=="a"){ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+def.dx,y+def.dy); }
+		else if(text[i]=="b"){ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+def.dx,y+def.dy); }
+		else{ g_d.setFontAlign(0,0,0); g_d.drawString(text[i],x,y); }
+		x = x+def.step[0];
+		y = y+def.step[1];
+	}
+}
+
+// Functions for time mode
+function drawTime()
+{
+	let dt = new Date();
+	let date = "";
+	let timeDef;
+	let x = 0;
+	dt.setDate(dt.getDate());
+	if(addTimeDigit){
+		x =
+		10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*(dt.getMilliseconds()+1500);
+		let msg = "00000"+Math.floor(x).toString(12);
+		let time = msg.substr(-5,3)+"."+msg.substr(-2);
+		let wait = 347*(1-(x%1));
+		timeDef = time6;
+	} else {
+		x =
+		864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*(dt.getMilliseconds()+1500);
+		let msg = "0000"+Math.floor(x).toString(12);
+		let time = msg.substr(-4,3)+"."+msg.substr(-1);
+		let 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
+	date = formatDate(res,dateFormat);
+	if(dt<timeActiveUntil)
+	{
+		// Write to background buffers, then display on screen
+		writeDozDate(date,calenDef,res.colour);
+		writeDozTime(time,timeDef,timeColour);
+		g.flip();
+		// Ready next interval
+		setTimeout(drawTime,wait);
+	}
+	else
+	{
+		// Clear screen
+		g_d.clear();
+		g_t.clear();
+		g.flip();
+	}
+	lastX = x;
+}
+function modeTime()
+{
+	timeActiveUntil = new Date();
+	timeActiveUntil.setDate(timeActiveUntil.getDate());
+	timeActiveUntil.setSeconds(timeActiveUntil.getSeconds()+15);
+	//Bangle.setLCDPower(true);
+	clearTimeout();
+	drawTime();
+}
+
+// Time-logging function
+/*function logTime(label)
+{
+	var d = new Date();
+	var t = d.getTime();
+	var diff_test = t - last_time_log;
+	last_time_log = t;
+	console.log(label + " at time: " + t + ", since last: " + diff_test);
+}*/
+
+// Functions for weather mode - TODO
+function drawWeather() {}
+function modeWeather() {}
+
+// Start time on twist
+Bangle.on('twist', function() {
+	modeTime();
+});

From 288be354789374607fa515a62835074e3e5bdc3c Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Mon, 10 May 2021 22:41:39 -0400
Subject: [PATCH 06/36] Update app.js

---
 apps/doztime/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index bed87870a..653968f9e 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -160,14 +160,14 @@ function drawTime()
 	dt.setDate(dt.getDate());
 	if(addTimeDigit){
 		x =
-		10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*(dt.getMilliseconds()+1500);
+		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);
 		let wait = 347*(1-(x%1));
 		timeDef = time6;
 	} else {
 		x =
-		864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*(dt.getMilliseconds()+1500);
+		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));

From 2500242e047a695c41078b0b72c7c2de410b7980 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 12:10:01 -0400
Subject: [PATCH 07/36] Create app-icon.js

---
 apps/doztime/app-icon.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 apps/doztime/app-icon.js

diff --git a/apps/doztime/app-icon.js b/apps/doztime/app-icon.js
new file mode 100644
index 000000000..19e81c45d
--- /dev/null
+++ b/apps/doztime/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("lEowggdkUiCKIADCJcCkUjmYACmUikAlKB4ImDAoQSJkYhBFAQECAQI5HBQU//4AC+YUCHowzBCQfzAYYKCEw8vEgYqD+QoGgQbBHAYADCwIoBCYkiEwhPEBAIoBHgY6BExHyHwQhBFAQ6BkYTHDgcyHgcCHRZlDCYQsBTYg6GDAJQDPoI6LAAIPBCYRiHHQhkDCYRiHHQhkCCYKKBCYzzBA4yMBCYTVEGYITEBYITZHY5PHUAJjITIJjHRZINBIYoTDWZAoFWYbbJFALbHgUyX4oPDXIcjMQITBmZkHFYszCYZkJMQoTCKAQ8IHQZOCHgYoKkQ6DHgYoEcIgmBHQg8CFAIPCCYfzBQQSEFAbrFCQImHFAQUCkczmYECAQISGHoYzBAAQFCCRA9BEwYoDHI4pFAAgRLCooRPABg="))

From 86f5c549830e009a4dd0fc8407f8aa05c2653afc Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 12:15:41 -0400
Subject: [PATCH 08/36] Update apps.json

---
 apps.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps.json b/apps.json
index 18c74638f..9ac0dbbda 100644
--- a/apps.json
+++ b/apps.json
@@ -3177,3 +3177,17 @@
   ]
 }
 ]
+},
+{ "id": "doztime",
+  "name": "Dozenal Watch",
+  "shortName":"Dozenal Watch",
+  "icon": "app.png",
+  "version":"0.01",
+  "description": "A dozenal Holocene calendar and dozenal diurnal clock",
+  "tags": "",
+  "storage": [
+    {"name":"doztime.app.js","url":"app.js"},
+    {"name":"doztime.img","url":"app-icon.js","evaluate":true}
+  ]
+}
+]

From cf1ee75e8dfe0d110687263eafaef9d9930979d9 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 16:10:31 -0400
Subject: [PATCH 09/36] Update app.js

---
 apps/doztime/app.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index 653968f9e..b4aa870b6 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -124,7 +124,6 @@ function writeDozTime(text,def,colour){
 	let y=def.pt0[1];
 	g_t.clear();
 	g_t.setFont("Vector",def.size);
-	g_t.setColor(colour);
 	for(let i in text){
 		if(text[i]=="a"){ g_t.setFontAlign(0,0,2); g_t.drawString("2",x+def.dx,y+def.dy); }
 		else if(text[i]=="b"){ g_t.setFontAlign(0,0,2); g_t.drawString("3",x+def.dx,y+def.dy); }
@@ -140,7 +139,6 @@ function writeDozDate(text,def,colour){
 	let y=def.pt0[1];
 	g_d.clear();
 	g_d.setFont("Vector",def.size);
-	g_d.setColor(colour);
 	for(let i in text){
 		if(text[i]=="a"){ g_d.setFontAlign(0,0,2); g_d.drawString("2",x+def.dx,y+def.dy); }
 		else if(text[i]=="b"){ g_d.setFontAlign(0,0,2); g_d.drawString("3",x+def.dx,y+def.dy); }

From e9798ff397d4d854f3561f6c2874ead9aa0055d5 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 16:17:16 -0400
Subject: [PATCH 10/36] Update apps.json

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 9ac0dbbda..8d9eeba7b 100644
--- a/apps.json
+++ b/apps.json
@@ -3181,7 +3181,7 @@
 { "id": "doztime",
   "name": "Dozenal Watch",
   "shortName":"Dozenal Watch",
-  "icon": "app.png",
+  "icon": "doztime.png",
   "version":"0.01",
   "description": "A dozenal Holocene calendar and dozenal diurnal clock",
   "tags": "",

From c9a706589d3796b46ed96bdeee68a89e703160ab Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 16:23:54 -0400
Subject: [PATCH 11/36] Update app-icon.js

---
 apps/doztime/app-icon.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/doztime/app-icon.js b/apps/doztime/app-icon.js
index 19e81c45d..ba768ac51 100644
--- a/apps/doztime/app-icon.js
+++ b/apps/doztime/app-icon.js
@@ -1 +1,5 @@
-require("heatshrink").decompress(atob("lEowggdkUiCKIADCJcCkUjmYACmUikAlKB4ImDAoQSJkYhBFAQECAQI5HBQU//4AC+YUCHowzBCQfzAYYKCEw8vEgYqD+QoGgQbBHAYADCwIoBCYkiEwhPEBAIoBHgY6BExHyHwQhBFAQ6BkYTHDgcyHgcCHRZlDCYQsBTYg6GDAJQDPoI6LAAIPBCYRiHHQhkDCYRiHHQhkCCYKKBCYzzBA4yMBCYTVEGYITEBYITZHY5PHUAJjITIJjHRZINBIYoTDWZAoFWYbbJFALbHgUyX4oPDXIcjMQITBmZkHFYszCYZkJMQoTCKAQ8IHQZOCHgYoKkQ6DHgYoEcIgmBHQg8CFAIPCCYfzBQQSEFAbrFCQImHFAQUCkczmYECAQISGHoYzBAAQFCCRA9BEwYoDHI4pFAAgRLCooRPABg="))
+ {
+  width : 40, height : 40, bpp : 4,
+  transparent : 0,
+  buffer : require("heatshrink").decompress(atob("ADkikQRRAAYRLgUikczAAUykUgEpQPBEwYFCCRMjEIIoCAgQCBHI4KCn//AAXzCgQ9GGYISD+YDDBQQmHl4kDFQfyFA0CDYI4DAAYWBFAITEkQmEJ4gIBFAI8DHQImI+Q+CEIIoCHQMjCY4cDmQ8DgQ6LMoYTCFgKbEHQwYBKAZ9BHRYABB4ITCMQ46EMgYTCMQ46EMgQTBRQITGeYIHGRgITCaogzBCYgLBCbI7HJ46gBMZCZBMY6LJBoJDFCYazIFAqzDbZIoBbY8CmS/FB4a5DkZiBCYMzMg4rFmYTDMhJiFCYRQCHhA6DJwQ8DFBUiHQY8DFAjhEEwI6EHgQoBB4QTD+YKCCQgoDdYoSBEw4oCCgUjmczAgQCBCQw9DGYIACAoQSIHoImDFAY5HFIoAECJYVFCJ4AMA="))
+}

From daa4e1811dd90a41170313683f104831a1d15462 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 16:38:20 -0400
Subject: [PATCH 12/36] Update apps.json

---
 apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 8d9eeba7b..197222bba 100644
--- a/apps.json
+++ b/apps.json
@@ -3186,8 +3186,8 @@
   "description": "A dozenal Holocene calendar and dozenal diurnal clock",
   "tags": "",
   "storage": [
-    {"name":"doztime.app.js","url":"app.js"},
-    {"name":"doztime.img","url":"app-icon.js","evaluate":true}
+    {"name":"doztime.app.js","url":"doztime.app.js"},
+    {"name":"doztime.img","url":"doztime-icon.js","evaluate":true}
   ]
 }
 ]

From 628376eb410aaaf63fb72dfc36540f1436c8e778 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 16:40:50 -0400
Subject: [PATCH 13/36] Rename app-icon.js to doztime-icon.js

---
 apps/doztime/{app-icon.js => doztime-icon.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/doztime/{app-icon.js => doztime-icon.js} (100%)

diff --git a/apps/doztime/app-icon.js b/apps/doztime/doztime-icon.js
similarity index 100%
rename from apps/doztime/app-icon.js
rename to apps/doztime/doztime-icon.js

From 7c60245063b7e97c1a01e6a8b31152689c107f8e Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 16:48:49 -0400
Subject: [PATCH 14/36] Rename app.js to doztime.app.js

---
 apps/doztime/{app.js => doztime.app.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/doztime/{app.js => doztime.app.js} (100%)

diff --git a/apps/doztime/app.js b/apps/doztime/doztime.app.js
similarity index 100%
rename from apps/doztime/app.js
rename to apps/doztime/doztime.app.js

From 703bf6a765006bcc2f129636fdbaeb8f3af0cbc2 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 17:03:11 -0400
Subject: [PATCH 15/36] Update apps.json

---
 apps.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 197222bba..921480823 100644
--- a/apps.json
+++ b/apps.json
@@ -3184,7 +3184,8 @@
   "icon": "doztime.png",
   "version":"0.01",
   "description": "A dozenal Holocene calendar and dozenal diurnal clock",
-  "tags": "",
+  "tags": "clock",
+  "type": "clock",
   "storage": [
     {"name":"doztime.app.js","url":"doztime.app.js"},
     {"name":"doztime.img","url":"doztime-icon.js","evaluate":true}

From c8d5254d2ffa9f3bc63f1640838c22210abda325 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 18:53:17 -0400
Subject: [PATCH 16/36] Update apps.json

---
 apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 921480823..3ae8269ae 100644
--- a/apps.json
+++ b/apps.json
@@ -3187,8 +3187,8 @@
   "tags": "clock",
   "type": "clock",
   "storage": [
-    {"name":"doztime.app.js","url":"doztime.app.js"},
-    {"name":"doztime.img","url":"doztime-icon.js","evaluate":true}
+    {"name":"doztime.app.js","url":"app.js"},
+    {"name":"doztime.img","url":"app-icon.js","evaluate":true}
   ]
 }
 ]

From 476efccd7d73c170b9a361d229e45b14c89ac173 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 18:54:12 -0400
Subject: [PATCH 17/36] Rename doztime-icon.js to app-icon.js

---
 apps/doztime/{doztime-icon.js => app-icon.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/doztime/{doztime-icon.js => app-icon.js} (100%)

diff --git a/apps/doztime/doztime-icon.js b/apps/doztime/app-icon.js
similarity index 100%
rename from apps/doztime/doztime-icon.js
rename to apps/doztime/app-icon.js

From 48004d81d73482de881b483eaaa74e7a1380a3ac Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 18:54:31 -0400
Subject: [PATCH 18/36] Rename doztime.app.js to app.js

---
 apps/doztime/{doztime.app.js => app.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/doztime/{doztime.app.js => app.js} (100%)

diff --git a/apps/doztime/doztime.app.js b/apps/doztime/app.js
similarity index 100%
rename from apps/doztime/doztime.app.js
rename to apps/doztime/app.js

From d198b5deb2a4735711cb11cd592ea21663db8834 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 19:30:49 -0400
Subject: [PATCH 19/36] Update app.js

---
 apps/doztime/app.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index b4aa870b6..fef978a67 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -15,8 +15,8 @@ const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
 const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
 const timeColour = "#f2f2f2";
 const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
-const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
-const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
+const calen10 = {"size":32,"pt0":[34-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
+const calen7 = {"size":32,"pt0":[64-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
 const time5 = {"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
@@ -158,14 +158,14 @@ function drawTime()
 	dt.setDate(dt.getDate());
 	if(addTimeDigit){
 		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()+750);
 		let msg = "00000"+Math.floor(x).toString(12);
 		let time = msg.substr(-5,3)+"."+msg.substr(-2);
 		let wait = 347*(1-(x%1));
 		timeDef = time6;
 	} else {
 		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()+750);
 		let msg = "0000"+Math.floor(x).toString(12);
 		let time = msg.substr(-4,3)+"."+msg.substr(-1);
 		let wait = 4167*(1-(x%1));

From 6fe2e591289701f925b9d3a8948692d37cdaaf5d Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 21:18:21 -0400
Subject: [PATCH 20/36] Add files via upload

---
 apps/doztime/app.png | Bin 0 -> 2500 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/doztime/app.png

diff --git a/apps/doztime/app.png b/apps/doztime/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..363537a58cf0ba55de061d555c4501f34d53279e
GIT binary patch
literal 2500
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
O0000<MNUMnLSTZi6rH;O

literal 0
HcmV?d00001


From e80a4dd54d3ffaef769253fd2d9ff9f241546ec8 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 21:20:43 -0400
Subject: [PATCH 21/36] Update app-icon.js

---
 apps/doztime/app-icon.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/doztime/app-icon.js b/apps/doztime/app-icon.js
index ba768ac51..19e81c45d 100644
--- a/apps/doztime/app-icon.js
+++ b/apps/doztime/app-icon.js
@@ -1,5 +1 @@
- {
-  width : 40, height : 40, bpp : 4,
-  transparent : 0,
-  buffer : require("heatshrink").decompress(atob("ADkikQRRAAYRLgUikczAAUykUgEpQPBEwYFCCRMjEIIoCAgQCBHI4KCn//AAXzCgQ9GGYISD+YDDBQQmHl4kDFQfyFA0CDYI4DAAYWBFAITEkQmEJ4gIBFAI8DHQImI+Q+CEIIoCHQMjCY4cDmQ8DgQ6LMoYTCFgKbEHQwYBKAZ9BHRYABB4ITCMQ46EMgYTCMQ46EMgQTBRQITGeYIHGRgITCaogzBCYgLBCbI7HJ46gBMZCZBMY6LJBoJDFCYazIFAqzDbZIoBbY8CmS/FB4a5DkZiBCYMzMg4rFmYTDMhJiFCYRQCHhA6DJwQ8DFBUiHQY8DFAjhEEwI6EHgQoBB4QTD+YKCCQgoDdYoSBEw4oCCgUjmczAgQCBCQw9DGYIACAoQSIHoImDFAY5HFIoAECJYVFCJ4AMA="))
-}
+require("heatshrink").decompress(atob("lEowggdkUiCKIADCJcCkUjmYACmUikAlKB4ImDAoQSJkYhBFAQECAQI5HBQU//4AC+YUCHowzBCQfzAYYKCEw8vEgYqD+QoGgQbBHAYADCwIoBCYkiEwhPEBAIoBHgY6BExHyHwQhBFAQ6BkYTHDgcyHgcCHRZlDCYQsBTYg6GDAJQDPoI6LAAIPBCYRiHHQhkDCYRiHHQhkCCYKKBCYzzBA4yMBCYTVEGYITEBYITZHY5PHUAJjITIJjHRZINBIYoTDWZAoFWYbbJFALbHgUyX4oPDXIcjMQITBmZkHFYszCYZkJMQoTCKAQ8IHQZOCHgYoKkQ6DHgYoEcIgmBHQg8CFAIPCCYfzBQQSEFAbrFCQImHFAQUCkczmYECAQISGHoYzBAAQFCCRA9BEwYoDHI4pFAAgRLCooRPABg="))

From b02269417173a3c75606af3822a9f76cd12f67d7 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 21:21:54 -0400
Subject: [PATCH 22/36] Update apps.json

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 3ae8269ae..e62445df2 100644
--- a/apps.json
+++ b/apps.json
@@ -3181,7 +3181,7 @@
 { "id": "doztime",
   "name": "Dozenal Watch",
   "shortName":"Dozenal Watch",
-  "icon": "doztime.png",
+  "icon": "app.png",
   "version":"0.01",
   "description": "A dozenal Holocene calendar and dozenal diurnal clock",
   "tags": "clock",

From 516f9cc10c1bc2bc959120f5dd55afd4096621de Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 21:34:11 -0400
Subject: [PATCH 23/36] Update apps.json

---
 apps.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps.json b/apps.json
index e62445df2..a73b508fc 100644
--- a/apps.json
+++ b/apps.json
@@ -3175,14 +3175,12 @@
     {"name":"batclock.app.js","url":"bat-clock.app.js"},
     {"name":"batclock.img","url":"bat-clock.icon.js","evaluate":true}
   ]
-}
-]
 },
 { "id": "doztime",
   "name": "Dozenal Watch",
   "shortName":"Dozenal Watch",
   "icon": "app.png",
-  "version":"0.01",
+  "version": "1.0",
   "description": "A dozenal Holocene calendar and dozenal diurnal clock",
   "tags": "clock",
   "type": "clock",
@@ -3190,5 +3188,3 @@
     {"name":"doztime.app.js","url":"app.js"},
     {"name":"doztime.img","url":"app-icon.js","evaluate":true}
   ]
-}
-]

From e6b203ef1d9f055cd477affa849817ccdc0f0ef3 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 21:54:53 -0400
Subject: [PATCH 24/36] Update apps.json

---
 apps.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps.json b/apps.json
index a73b508fc..09c0832b8 100644
--- a/apps.json
+++ b/apps.json
@@ -3188,3 +3188,5 @@
     {"name":"doztime.app.js","url":"app.js"},
     {"name":"doztime.img","url":"app-icon.js","evaluate":true}
   ]
+}
+]

From c82851c5d04a8d1f459a5152bd959259b0de0f1f Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 22:05:52 -0400
Subject: [PATCH 25/36] Update apps.json

---
 apps.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps.json b/apps.json
index 09c0832b8..8543849a4 100644
--- a/apps.json
+++ b/apps.json
@@ -3176,14 +3176,14 @@
     {"name":"batclock.img","url":"bat-clock.icon.js","evaluate":true}
   ]
 },
-{ "id": "doztime",
-  "name": "Dozenal Watch",
+{ "id":"doztime",
+  "name":"Dozenal Watch",
   "shortName":"Dozenal Watch",
-  "icon": "app.png",
-  "version": "1.0",
-  "description": "A dozenal Holocene calendar and dozenal diurnal clock",
-  "tags": "clock",
-  "type": "clock",
+  "icon":"app.png",
+  "version":"1.0",
+  "description":"A dozenal Holocene calendar and dozenal diurnal clock",
+  "tags":"clock",
+  "type":"clock",
   "storage": [
     {"name":"doztime.app.js","url":"app.js"},
     {"name":"doztime.img","url":"app-icon.js","evaluate":true}

From c26456e39af34fe7975ac01e1a80ae2c506b68bd Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Tue, 11 May 2021 22:10:41 -0400
Subject: [PATCH 26/36] Update apps.json

---
 apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 8543849a4..a6d21c0a2 100644
--- a/apps.json
+++ b/apps.json
@@ -3177,8 +3177,8 @@
   ]
 },
 { "id":"doztime",
-  "name":"Dozenal Watch",
-  "shortName":"Dozenal Watch",
+  "name":"Dozenal Time",
+  "shortName":"Dozenal Time",
   "icon":"app.png",
   "version":"1.0",
   "description":"A dozenal Holocene calendar and dozenal diurnal clock",

From df94ad0b6dda74d473f5c0b63450aba1b66c612d Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:41:23 -0400
Subject: [PATCH 27/36] Update app.js

---
 apps/doztime/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index fef978a67..e754342be 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -15,9 +15,9 @@ const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
 const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
 const timeColour = "#f2f2f2";
 const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
-const calen10 = {"size":32,"pt0":[34-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
-const calen7 = {"size":32,"pt0":[64-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
-const time5 = {"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
+const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
+const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
+const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
 const baseDate = Date(2020,11,21); // month values run from 0 to 11

From f96f52c7565f475326a6752dc139ca5429a0f1a8 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:42:39 -0400
Subject: [PATCH 28/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index e754342be..caa041e68 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -15,7 +15,7 @@ const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
 const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
 const timeColour = "#f2f2f2";
 const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
-const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
+const calen10 = {"size":20,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
 const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
 const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line

From f1bf9cc598c579a5630a6b812de43829ea339047 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:44:17 -0400
Subject: [PATCH 29/36] Update app.js

---
 apps/doztime/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index caa041e68..c92b51cdd 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -15,9 +15,9 @@ const B1 = [30,30,30,30,30,31,31,31,31,31,30,30];
 const B2 = [30,30,30,30,31,31,31,31,31,30,30,30];
 const timeColour = "#f2f2f2";
 const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
-const calen10 = {"size":20,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
+const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
 const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
-const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line
+const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line, was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
 const baseDate = Date(2020,11,21); // month values run from 0 to 11

From 8480daf4fa41738b19d1f6a3bdcb287cc013d383 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:48:55 -0400
Subject: [PATCH 30/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index c92b51cdd..40f5eefda 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -20,7 +20,7 @@ const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.
 const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line, was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
-const baseDate = Date(2020,11,21); // month values run from 0 to 11
+const baseDate = Date(2020,11,20); // month values run from 0 to 11
 let accum = new Date(baseDate.getTime());
 let sequence = [];
 let timeActiveUntil;

From c613035f741524ca6e74a45a7cfef77d7c415b4b Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:49:43 -0400
Subject: [PATCH 31/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index 40f5eefda..c92b51cdd 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -20,7 +20,7 @@ const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.
 const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line, was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
-const baseDate = Date(2020,11,20); // month values run from 0 to 11
+const baseDate = Date(2020,11,21); // month values run from 0 to 11
 let accum = new Date(baseDate.getTime());
 let sequence = [];
 let timeActiveUntil;

From 636fb40fea030ce8ed6dd658b2c0ce2d55c48b40 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:53:53 -0400
Subject: [PATCH 32/36] Update app.js

---
 apps/doztime/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index c92b51cdd..eacef778f 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -158,14 +158,14 @@ function drawTime()
 	dt.setDate(dt.getDate());
 	if(addTimeDigit){
 		x =
-		10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*(dt.getMilliseconds()+750);
+		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);
 		let wait = 347*(1-(x%1));
 		timeDef = time6;
 	} else {
 		x =
-		864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*(dt.getMilliseconds()+750);
+		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));

From 7b68fc8ddfaff3ef0299f8dc0e1495a2a1a067fc Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:56:15 -0400
Subject: [PATCH 33/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index eacef778f..fddc565db 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -20,7 +20,7 @@ const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.
 const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line, was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
-const baseDate = Date(2020,11,21); // month values run from 0 to 11
+const baseDate = Date(2020,11,20); // month values run from 0 to 11
 let accum = new Date(baseDate.getTime());
 let sequence = [];
 let timeActiveUntil;

From 08f998b0c88259f74555016c597db10bd82707d9 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 07:58:07 -0400
Subject: [PATCH 34/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index fddc565db..eacef778f 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -20,7 +20,7 @@ const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.
 const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line, was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
-const baseDate = Date(2020,11,20); // month values run from 0 to 11
+const baseDate = Date(2020,11,21); // month values run from 0 to 11
 let accum = new Date(baseDate.getTime());
 let sequence = [];
 let timeActiveUntil;

From a29a202a4a05d35577b9c5021cde61a4c72168b5 Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 08:01:16 -0400
Subject: [PATCH 35/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index eacef778f..880a4ed6d 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -17,7 +17,7 @@ const timeColour = "#f2f2f2";
 const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
 const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
 const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
-const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line, was 64
+const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line; was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
 const baseDate = Date(2020,11,21); // month values run from 0 to 11

From a50816a4a59070d617b0f774b11078b595ec42ef Mon Sep 17 00:00:00 2001
From: numerist <rapoport@shermans.net>
Date: Wed, 12 May 2021 09:06:07 -0400
Subject: [PATCH 36/36] Update app.js

---
 apps/doztime/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/doztime/app.js b/apps/doztime/app.js
index 880a4ed6d..eb36b84ed 100644
--- a/apps/doztime/app.js
+++ b/apps/doztime/app.js
@@ -17,7 +17,7 @@ const timeColour = "#f2f2f2";
 const dateColours = ["#ff0000","#ffa500","#ffff00","#00b800","#0000ff","#ff00ff","#ff0080"];
 const calen10 = {"size":32,"pt0":[32-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line
 const calen7 = {"size":32,"pt0":[62-g_x_off,16],"step":[20,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line
-const time5 = {"size":48,"pt0":[62-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line; was 64
+const time5 = {"size":48,"pt0":[64-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line; was 64
 const time6 = {"size":48,"pt0":[48-g_x_off,24],"step":[30,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line
 const baseYear = 11584;
 const baseDate = Date(2020,11,21); // month values run from 0 to 11