From a363d6da2ca99f67fbb3504001887c4145b31ec2 Mon Sep 17 00:00:00 2001 From: numerist Date: Wed, 19 Jun 2024 16:18:28 -0400 Subject: [PATCH 1/6] Update app-bangle2.js Shifting the position of one line on the screen --- apps/doztime/app-bangle2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doztime/app-bangle2.js b/apps/doztime/app-bangle2.js index 603ac8904..67d876747 100644 --- a/apps/doztime/app-bangle2.js +++ b/apps/doztime/app-bangle2.js @@ -16,7 +16,7 @@ const B2 = [30,30,30,30,31,31,31,31,31,30,30,30]; const timeColour = "#ffffff"; const dateColours = ["#ff0000","#ff8000","#ffff00","#00ff00","#0080ff","#ff00ff","#ffffff"]; const calen10 = {"size":26,"pt0":[18-g_x_off,16],"step":[16,0],"dx":-4.5,"dy":-4.5}; // positioning for usual calendar line -const calen7 = {"size":26,"pt0":[48-g_x_off,16],"step":[16,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line +const calen7 = {"size":26,"pt0":[42-g_x_off,16],"step":[16,0],"dx":-4.5,"dy":-4.5}; // positioning for S-day calendar line const time5 = {"size":42,"pt0":[39-g_x_off,24],"step":[26,0],"dx":-6.5,"dy":-6.5}; // positioning for lull time line const time6 = {"size":42,"pt0":[26-g_x_off,24],"step":[26,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line ft w 48, 48-g, step 30 const baseYear = 11584; From 41a1e828be380478025ae389eb699bc4b20aa25f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 22:23:04 +0000 Subject: [PATCH 2/6] build(deps-dev): bump braces from 3.0.2 to 3.0.3 Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index d63d0171f..36589d9eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -730,12 +730,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1437,9 +1437,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -3984,12 +3984,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "call-bind": { @@ -4531,9 +4531,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" From e5be7c422680af90f4a28223514771328289a19f Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Thu, 20 Jun 2024 08:09:42 +0100 Subject: [PATCH 3/6] lint_exemptions.js: drop astrocalc --- apps/lint_exemptions.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js index d3c628503..7f535bbc6 100644 --- a/apps/lint_exemptions.js +++ b/apps/lint_exemptions.js @@ -516,12 +516,6 @@ module.exports = { "no-undef" ] }, - "apps/astrocalc/astrocalc-app.js": { - "hash": "29f978064e42f947b36c94ab3f212512fb5d0a41fa265354c6039e2cf042b92c", - "rules": [ - "no-unused-vars" - ] - }, "apps/HRV/app.js": { "hash": "265b4b0272c43126670b5026079711354cee0a211096bcd2c18139b7a3ee774a", "rules": [ From cf8e8e3c9ae4d90c2ae145039664ea7392a5df3e Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Thu, 20 Jun 2024 08:09:58 +0100 Subject: [PATCH 4/6] doztime: whitespace --- apps/doztime/app-bangle2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doztime/app-bangle2.js b/apps/doztime/app-bangle2.js index 67d876747..1612ec4fd 100644 --- a/apps/doztime/app-bangle2.js +++ b/apps/doztime/app-bangle2.js @@ -139,7 +139,7 @@ function writeDozTime(text,def){ } } function writeDozDate(text,def,colour){ - + dateColour = colour; //let pts = def.pts; let x=def.pt0[0]; From 1e49bb1e6338f91c78b8c2e819b8bf3a2fdddeda Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Thu, 20 Jun 2024 08:10:28 +0100 Subject: [PATCH 5/6] doztime: create `calenDef`, promote `time` & `wait` --- apps/doztime/app-bangle2.js | 11 +++++++---- apps/lint_exemptions.js | 7 ------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/apps/doztime/app-bangle2.js b/apps/doztime/app-bangle2.js index 1612ec4fd..9d1bb26c8 100644 --- a/apps/doztime/app-bangle2.js +++ b/apps/doztime/app-bangle2.js @@ -21,6 +21,7 @@ const time5 = {"size":42,"pt0":[39-g_x_off,24],"step":[26,0],"dx":-6.5,"dy":-6.5 const time6 = {"size":42,"pt0":[26-g_x_off,24],"step":[26,0],"dx":-6.5,"dy":-6.5}; // positioning for twinkling time line ft w 48, 48-g, step 30 const baseYear = 11584; const baseDate = Date(2020,11,21); // month values run from 0 to 11 +let calenDef = calen10; let accum = new Date(baseDate.getTime()); let sequence = []; let timeActiveUntil; @@ -169,20 +170,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); //TODO: should `time` and `wait` have been defined outside the if block? + 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 diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js index 7f535bbc6..1bd285a9f 100644 --- a/apps/lint_exemptions.js +++ b/apps/lint_exemptions.js @@ -412,13 +412,6 @@ module.exports = { "no-unused-vars" ] }, - "apps/doztime/app-bangle2.js": { - "hash": "81592fe1bc6537f80d7dbe7b2e8145924d2400f98ea780c68dd5bd9694376c8a", - "rules": [ - "no-unused-vars", - "no-undef" - ] - }, "apps/devstopwatch/app.js": { "hash": "28ca59e605f280a2d8fd4a74f553783205d51f8bb7042d6f51cf8ec11d44c264", "rules": [ From 51bab7ceec4e07856981f1c83f90e2c81bbc5a6f Mon Sep 17 00:00:00 2001 From: Rob Pilling Date: Thu, 20 Jun 2024 08:13:49 +0100 Subject: [PATCH 6/6] doztime: bump version --- apps/doztime/ChangeLog | 3 ++- apps/doztime/metadata.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/doztime/ChangeLog b/apps/doztime/ChangeLog index 03c1877b4..dc73a3c23 100644 --- a/apps/doztime/ChangeLog +++ b/apps/doztime/ChangeLog @@ -5,4 +5,5 @@ 0.05: extraneous comments and code removed display improved now supports Adjust Clock widget, if installed -0.06: Minor code improvements \ No newline at end of file +0.06: Minor code improvements +0.07: Bangle2: Shift the position of one line on the screen diff --git a/apps/doztime/metadata.json b/apps/doztime/metadata.json index 83be15724..407b474ca 100644 --- a/apps/doztime/metadata.json +++ b/apps/doztime/metadata.json @@ -2,7 +2,7 @@ "id": "doztime", "name": "Dozenal Digital Time", "shortName": "Dozenal Digital", - "version": "0.06", + "version": "0.07", "description": "A dozenal Holocene calendar and dozenal diurnal digital clock", "icon": "app.png", "type": "clock",