More testing and tweaking of existing clock apps

master
Gordon Williams 2021-07-28 10:54:22 +01:00
parent c1d06ef4d9
commit 6d73d175eb
17 changed files with 600 additions and 606 deletions

View File

@ -312,7 +312,7 @@
{ "id": "impwclock", { "id": "impwclock",
"name": "Imprecise Word Clock", "name": "Imprecise Word Clock",
"icon": "clock-impword.png", "icon": "clock-impword.png",
"version":"0.02", "version":"0.03",
"description": "Imprecise word clock for vacations, weekends, and those who never need accurate time.", "description": "Imprecise word clock for vacations, weekends, and those who never need accurate time.",
"tags": "clock", "tags": "clock",
"type":"clock", "type":"clock",
@ -1785,7 +1785,7 @@
"name": "SWL Clock / Short Wave Listner Clock", "name": "SWL Clock / Short Wave Listner Clock",
"shortName": "SWL Clock", "shortName": "SWL Clock",
"icon": "swlclk.png", "icon": "swlclk.png",
"version":"0.01", "version":"0.02",
"description": "Display Local, UTC time and some programs on the shorts waves along the day, with the frequencies", "description": "Display Local, UTC time and some programs on the shorts waves along the day, with the frequencies",
"tags": "tool,clock", "tags": "tool,clock",
"type":"clock", "type":"clock",
@ -1801,7 +1801,7 @@
"name": "Round clock with seconds, minutes and date", "name": "Round clock with seconds, minutes and date",
"shortName": "Round Clock", "shortName": "Round Clock",
"icon": "app.png", "icon": "app.png",
"version": "0.05", "version": "0.06",
"description": "Designed round clock with ticks for minutes and seconds and heart rate indication", "description": "Designed round clock with ticks for minutes and seconds and heart rate indication",
"tags": "clock", "tags": "clock",
"type": "clock", "type": "clock",
@ -1815,7 +1815,7 @@
"name": "fclock", "name": "fclock",
"shortName": "F Clock", "shortName": "F Clock",
"icon": "app.png", "icon": "app.png",
"version": "0.01", "version": "0.02",
"description": "Simple design of a digital clock", "description": "Simple design of a digital clock",
"tags": "clock", "tags": "clock",
"type": "clock", "type": "clock",
@ -2623,7 +2623,7 @@
"name": "ISO Compliant Clock Face", "name": "ISO Compliant Clock Face",
"shortName":"ISO Clock", "shortName":"ISO Clock",
"icon": "isoclock.png", "icon": "isoclock.png",
"version":"0.01", "version":"0.02",
"description": "Tweaked fork of digiclock for ISO date and time", "description": "Tweaked fork of digiclock for ISO date and time",
"tags": "clock", "tags": "clock",
"type" : "clock", "type" : "clock",
@ -2781,7 +2781,7 @@
{ "id": "lazyclock", { "id": "lazyclock",
"name": "Lazy Clock", "name": "Lazy Clock",
"icon": "lazyclock.png", "icon": "lazyclock.png",
"version":"0.02", "version":"0.03",
"readme": "README.md", "readme": "README.md",
"description": "Tells the time, roughly", "description": "Tells the time, roughly",
"tags": "clock", "tags": "clock",
@ -2821,13 +2821,13 @@
"name": "Game of Life Clock", "name": "Game of Life Clock",
"shortName":"Conway's Clock", "shortName":"Conway's Clock",
"icon": "app.png", "icon": "app.png",
"version":"0.05", "version":"0.06",
"description": "Modification and clockification of Conway's Game of Life", "description": "Modification and clockification of Conway's Game of Life",
"tags": "clock", "tags": "clock",
"type" : "clock", "type" : "clock",
"readme": "README.md", "readme": "README.md",
"storage": [ "storage": [
{"name":"lifeclk.app.js","url":"app.js"}, {"name":"lifeclk.app.js","url":"app.min.js"},
{"name":"lifeclk.img","url":"app-icon.js","evaluate":true} {"name":"lifeclk.img","url":"app-icon.js","evaluate":true}
] ]
}, },
@ -3347,7 +3347,7 @@
{ "id": "mysticclock", { "id": "mysticclock",
"name": "Mystic Clock", "name": "Mystic Clock",
"icon": "mystic-clock.png", "icon": "mystic-clock.png",
"version":"1.00", "version":"1.01",
"description": "A retro-inspired watchface featuring time, date, and an interactive data display line.", "description": "A retro-inspired watchface featuring time, date, and an interactive data display line.",
"tags": "clock", "tags": "clock",
"type":"clock", "type":"clock",

View File

@ -1 +1,2 @@
0.01: First published version of app 0.01: First published version of app
0.02: Move to Bangle.setUI to launcher support

View File

@ -1,206 +1,203 @@
{ var minutes;
var minutes; var seconds;
var seconds; var hours;
var hours; var date;
var date; var first = true;
var first = true; var locale = require('locale');
var locale = require('locale'); var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false;
var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false;
//HR variables //HR variables
var id = 0; var id = 0;
var grow = true; var grow = true;
var size=10; var size=10;
//Screen dimensions //Screen dimensions
const screen = { const screen = {
width: g.getWidth(), width: g.getWidth(),
height: g.getWidth(), height: g.getWidth(),
middle: g.getWidth() / 2, middle: g.getWidth() / 2,
center: g.getHeight() / 2, center: g.getHeight() / 2,
}; };
// Ssettings // Ssettings
const settings = { const settings = {
time: { time: {
color: '#dddddd', color: '#dddddd',
font: 'Vector', font: 'Vector',
size: 100, size: 100,
middle: screen.middle, middle: screen.middle,
center: screen.center, center: screen.center,
}, },
date: { date: {
color: '#dddddd', color: '#dddddd',
font: 'Vector', font: 'Vector',
size: 15, size: 15,
middle: screen.height-17, // at bottom of screen middle: screen.height-17, // at bottom of screen
center: screen.center, center: screen.center,
}, },
circle: { circle: {
colormin: '#ffffff', colormin: '#ffffff',
colorsec: '#ffffff', colorsec: '#ffffff',
width: 10, width: 10,
middle: screen.middle, middle: screen.middle,
center: screen.center, center: screen.center,
height: screen.height height: screen.height
}, },
hr: { hr: {
color: '#333333', color: '#333333',
size: 20, size: 20,
x: screen.center, x: screen.center,
y: screen.middle + 65 y: screen.middle + 65
} }
}; };
const dateStr = function (date) { const dateStr = function (date) {
return locale.date(new Date(), 1); return locale.date(new Date(), 1);
}; };
const getFormated = function(val) { const getFormated = function(val) {
if (val<10) { if (val<10) {
val='0'+val; val='0'+val;
} }
return val; return val;
}; };
const drawMin = function (sections, color) { const drawMin = function (sections, color) {
g.setFontAlign(0, 0, 0);
g.setColor('#000000');
g.setFont(settings.time.font, settings.time.size/2);
g.drawString(getFormated(sections-1), settings.time.center+50, settings.time.middle);
g.setColor(settings.time.color);
g.setFont(settings.time.font, settings.time.size/2);
g.drawString(getFormated(sections), settings.time.center+50, settings.time.middle);
};
const drawSec = function (sections, color) { g.setFontAlign(0, 0, 0);
g.setFontAlign(0, 0, 0); g.setColor('#000000');
g.setColor('#000000'); g.setFont(settings.time.font, settings.time.size/2);
g.setFont(settings.time.font, settings.time.size/4); g.drawString(getFormated(sections-1), settings.time.center+50, settings.time.middle);
g.drawString(getFormated(sections-1), settings.time.center+100, settings.time.middle); g.setColor(settings.time.color);
g.setColor(settings.time.color); g.setFont(settings.time.font, settings.time.size/2);
g.setFont(settings.time.font, settings.time.size/4); g.drawString(getFormated(sections), settings.time.center+50, settings.time.middle);
g.drawString(getFormated(sections), settings.time.center+100, settings.time.middle); };
};
const drawClock = function () { const drawSec = function (sections, color) {
g.setFontAlign(0, 0, 0);
g.setColor('#000000');
g.setFont(settings.time.font, settings.time.size/4);
g.drawString(getFormated(sections-1), settings.time.center+100, settings.time.middle);
g.setColor(settings.time.color);
g.setFont(settings.time.font, settings.time.size/4);
g.drawString(getFormated(sections), settings.time.center+100, settings.time.middle);
};
currentTime = new Date(); const drawClock = function () {
//Get date as a string currentTime = new Date();
date = dateStr(currentTime);
if(seconds==59) {
g.clear();
}
// Update minutes when needed //Get date as a string
if (minutes != currentTime.getMinutes()) { date = dateStr(currentTime);
minutes = currentTime.getMinutes();
drawMin(minutes, settings.circle.colormin);
}
//Update seconds when needed if(seconds==59) {
if (seconds != currentTime.getSeconds()) { g.clear();
seconds = currentTime.getSeconds(); }
drawSec(seconds, settings.circle.colorsec);
}
//Write the time as configured in the settings // Update minutes when needed
hours = currentTime.getHours(); if (minutes != currentTime.getMinutes()) {
if (_12hour && hours > 13) { minutes = currentTime.getMinutes();
hours = hours - 12; drawMin(minutes, settings.circle.colormin);
} }
var meridian; //Update seconds when needed
if (seconds != currentTime.getSeconds()) {
seconds = currentTime.getSeconds();
drawSec(seconds, settings.circle.colorsec);
}
if (typeof locale.meridian === "function") { //Write the time as configured in the settings
meridian = locale.meridian(new Date()); hours = currentTime.getHours();
} else { if (_12hour && hours > 13) {
meridian = ""; hours = hours - 12;
} }
var timestr; var meridian;
if (meridian.length > 0 && _12hour) { if (typeof locale.meridian === "function") {
timestr = hours + " " + meridian; meridian = locale.meridian(new Date());
} else { } else {
timestr = hours; meridian = "";
} }
g.setFontAlign(0, 0, 0);
g.setColor(settings.time.color);
g.setFont(settings.time.font, settings.time.size);
g.drawString(timestr, settings.time.center-40, settings.time.middle);
//Write the date as configured in the settings var timestr;
g.setColor(settings.date.color);
g.setFont(settings.date.font, settings.date.size);
g.drawString(date, settings.date.center, settings.date.middle);
};
//setInterval for HR visualisation if (meridian.length > 0 && _12hour) {
const newBeats = function (hr) { timestr = hours + " " + meridian;
if (id != 0) { } else {
changeInterval(id, 6e3 / hr.bpm); timestr = hours;
} else { }
id = setInterval(drawHR, 6e3 / hr.bpm); g.setFontAlign(0, 0, 0);
} g.setColor(settings.time.color);
}; g.setFont(settings.time.font, settings.time.size);
g.drawString(timestr, settings.time.center-40, settings.time.middle);
//visualize HR with circles pulsating //Write the date as configured in the settings
const drawHR = function () { g.setColor(settings.date.color);
if (grow && size < settings.hr.size) { g.setFont(settings.date.font, settings.date.size);
size++; g.drawString(date, settings.date.center, settings.date.middle);
} };
if (!grow && size > 3) { //setInterval for HR visualisation
size--; const newBeats = function (hr) {
} if (id != 0) {
changeInterval(id, 6e3 / hr.bpm);
} else {
id = setInterval(drawHR, 6e3 / hr.bpm);
}
};
if (size == settings.hr.size || size == 3) { //visualize HR with circles pulsating
grow = !grow; const drawHR = function () {
} if (grow && size < settings.hr.size) {
size++;
}
if (grow) { if (!grow && size > 3) {
color = settings.hr.color; size--;
g.setColor(color); }
g.fillCircle(settings.hr.x, settings.hr.y, size);
} else {
color = "#000000";
g.setColor(color);
g.drawCircle(settings.hr.x, settings.hr.y, size);
}
};
// clean app screen if (size == settings.hr.size || size == 3) {
g.clear(); grow = !grow;
Bangle.loadWidgets(); }
Bangle.drawWidgets();
//manage when things should be enabled and not if (grow) {
Bangle.on('lcdPower', function (on) { color = settings.hr.color;
if (on) { g.setColor(color);
Bangle.setHRMPower(1); g.fillCircle(settings.hr.x, settings.hr.y, size);
} else { } else {
Bangle.setHRMPower(0); color = "#000000";
} g.setColor(color);
}); g.drawCircle(settings.hr.x, settings.hr.y, size);
}
};
// refesh every second // clean app screen
setInterval(drawClock, 1E3); g.clear();
Bangle.loadWidgets();
Bangle.drawWidgets();
//start HR monitor and update frequency of update //manage when things should be enabled and not
Bangle.setHRMPower(1); Bangle.on('lcdPower', function (on) {
Bangle.on('HRM', function (d) { if (on) {
newBeats(d); Bangle.setHRMPower(1);
}); } else {
Bangle.setHRMPower(0);
}
});
// draw now // refesh every second
drawClock(); setInterval(drawClock, 1E3);
// Show launcher when middle button pressed //start HR monitor and update frequency of update
setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" }); Bangle.setHRMPower(1);
Bangle.on('HRM', function (d) {
newBeats(d);
});
} // draw now
drawClock();
// Show launcher when button pressed
Bangle.setUI("clock");

View File

@ -1,2 +1,3 @@
0.01: New App! 0.01: New App!
0.02: Stopped watchface from flashing every interval 0.02: Stopped watchface from flashing every interval
0.03: Move to Bangle.setUI to launcher support

View File

@ -47,10 +47,9 @@ const activeColorNight = 0xF800 /*red*/ ;
const activeColorDay = 0xFFFF /* white */; const activeColorDay = 0xFFFF /* white */;
var hidxPrev; var hidxPrev;
var showDigitalTime = false;
function drawWordClock() { function drawWordClock() {
// get time // get time
var t = new Date(); var t = new Date();
var h = t.getHours(); var h = t.getHours();
@ -141,7 +140,7 @@ function drawWordClock() {
// Display digital time while button 1 is pressed // Display digital time while button 1 is pressed
g.clearRect(0, 215, 240, 240); g.clearRect(0, 215, 240, 240);
if (BTN1.read()){ if (showDigitalTime){
g.setColor(activeColor); g.setColor(activeColor);
g.drawString(time, 120, 215); g.drawString(time, 120, 215);
} }
@ -158,8 +157,20 @@ Bangle.drawWidgets();
setInterval(drawWordClock, 1E4); setInterval(drawWordClock, 1E4);
drawWordClock(); drawWordClock();
// Show digital time while top button is pressed // Show digital time while top button is pressed (if we have physical buttons)
setWatch(drawWordClock, BTN1, {repeat:true,edge:"both"}); if (global.BTN3) setWatch(function() {
showDigitalTime = BTN1.read();
drawWordClock();
}, BTN1, {repeat:true,edge:"both"});
// Show launcher when middle button pressed // If LCD pressed (on Bangle.js 2) draw digital time
setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"}); Bangle.on('drag',e=>{
var pressed = e.b!=0;
if (pressed!=showDigitalTime) {
showDigitalTime = pressed;
drawWordClock();
}
});
// Show launcher when button pressed
Bangle.setUI("clock");

View File

@ -1 +1,2 @@
0.01: Created app based on digiclock with some small tweaks. 0.01: Created app based on digiclock with some small tweaks.
0.02: Swap to Bangle.setUI for launcher/buttons

View File

@ -1,82 +1,82 @@
//load fonts //load fonts
require("Font7x11Numeric7Seg").add(Graphics); require("Font7x11Numeric7Seg").add(Graphics);
require("FontHaxorNarrow7x17").add(Graphics); require("FontHaxorNarrow7x17").add(Graphics);
//screen position //screen position
const X = 170; const X = 170;
const Y = 140; const Y = 140;
function draw() { function draw() {
// Date Variables // Date Variables
var date = new Date(); var date = new Date();
var h = date.getHours(); var h = date.getHours();
var m = date.getMinutes(); var m = date.getMinutes();
var day = date.getDay(); var day = date.getDay();
var month = date.getMonth()+1; var month = date.getMonth()+1;
var dateNum = date.getDate(); var dateNum = date.getDate();
var year = date.getFullYear(); var year = date.getFullYear();
var half = "AM"; var half = "AM";
var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2); var time = ("0" + h).substr(-2) + ":" + ("0" + m).substr(-2);
//convert day into string //convert day into string
switch (day) { switch (day) {
case 0: case 0:
day = "Sunday"; day = "Sunday";
break; break;
case 1: case 1:
day = "Monday"; day = "Monday";
break; break;
case 2: case 2:
day = "Tuesday"; day = "Tuesday";
break; break;
case 3: case 3:
day = "Wednesday"; day = "Wednesday";
break; break;
case 4: case 4:
day = "Thursday"; day = "Thursday";
break; break;
case 5: case 5:
day = "Friday"; day = "Friday";
break; break;
case 6: case 6:
day = "Saturday"; day = "Saturday";
break; break;
default: default:
day = "ERROR"; day = "ERROR";
break; break;
} }
if (h > 12) { if (h > 12) {
half = "PM"; half = "PM";
h = h - 12; h = h - 12;
} }
//reset graphics //reset graphics
g.reset(); g.reset();
//draw the time //draw the time
g.setFont("7x11Numeric7Seg", 5); g.setFont("7x11Numeric7Seg", 5);
g.setFontAlign(1,1); g.setFontAlign(1,1);
g.drawString(time, X+10, Y, true /*clear background*/); g.drawString(time, X+10, Y, true /*clear background*/);
g.setFont("7x11Numeric7Seg", 3); g.setFont("7x11Numeric7Seg", 3);
g.drawString(("0"+date.getSeconds()).substr(-2), X+55, Y, true /*clear background*/); g.drawString(("0"+date.getSeconds()).substr(-2), X+55, Y, true /*clear background*/);
g.setFontAlign(0,1); g.setFontAlign(0,1);
g.setFont("HaxorNarrow7x17", 3); g.setFont("HaxorNarrow7x17", 3);
g.drawString(day, X-60, Y+53, true); g.drawString(day, X-60, Y+53, true);
g.drawString(year+"-"+month+"-"+dateNum, X-55, Y-55, true); g.drawString(year+"-"+month+"-"+dateNum, X-55, Y-55, true);
} }
//clear screen at startup //clear screen at startup
g.clear(); g.clear();
//draw immediatly //draw immediatly
draw(); draw();
var secondInterval = setInterval(draw, 1000); var secondInterval = setInterval(draw, 1000);
// Stop updates when LCD is off, restart when on // Stop updates when LCD is off, restart when on
@ -92,4 +92,5 @@ Bangle.on('lcdPower',on=>{
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
setWatch(Bangle.showLauncher, BTN2, {repeat : false, edge: "falling"}); // Show launcher when button pressed
Bangle.setUI("clock");

View File

@ -1,2 +1,3 @@
0.01: Launch app 0.01: Launch app
0.02: Fix bug with the elusive one o'clock monster; Only change template when going over boundaries; Re-jig wording options 0.02: Fix bug with the elusive one o'clock monster; Only change template when going over boundaries; Re-jig wording options
0.03: Use Bangle.setUI for launcher/buttons

View File

@ -221,22 +221,13 @@ function addEvents() {
} }
}); });
setWatch(switchMode, BTN1, { // Show launcher when button pressed
repeat: true, Bangle.setUI("clockupdown", btn=>{
edge: "falling" if (btn<0) switchMode();
}); if (btn>0) {
currentFormatter = null;
setWatch(Bangle.showLauncher, BTN2, { refreshTime();
repeat: false, }
edge: "falling"
});
setWatch(() => {
currentFormatter = null;
refreshTime();
}, BTN3, {
repeat: true,
edge: "falling"
}); });
} }
@ -245,9 +236,9 @@ function init() {
startClock(); startClock();
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
addEvents(); addEvents();
} }
init(); init();

View File

@ -2,4 +2,5 @@
0.02: Faster algorithm, hours and minutes are now displayable whenever, using the upper button 2021-01-14 0.02: Faster algorithm, hours and minutes are now displayable whenever, using the upper button 2021-01-14
0.03: Ah yes. Some people prefer the 12 hour system 2021-01-14 0.03: Ah yes. Some people prefer the 12 hour system 2021-01-14
0.04: Fixed a bug, doesn't run while display's on now 2021-01-18 0.04: Fixed a bug, doesn't run while display's on now 2021-01-18
0.05: Fixed a bug, doesn't count the time it was asleep when calculating the update time 2021-01-19 0.05: Fixed a bug, doesn't count the time it was asleep when calculating the update time 2021-01-19
0.06: Use Bangle.set UI, change to unminified upload to ensure this works ok on Bangle.js

View File

@ -1,4 +1,4 @@
Bangle.setLCDTimeout(30); // Name as .min.js so we don't try and pretokenise (which stops Bangle.js running this somehow)
const is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"]; const is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"];
@ -435,9 +435,11 @@ function showMinAgain(){
} }
function setButtons(){ function setButtons(){
setWatch(showMinAgain, BTN1, {repeat:true,edge:"falling"}); // Show launcher when button pressed
setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"}); Bangle.setUI("clockupdown", btn=>{
setWatch(regen, BTN3, {repeat:true,edge:"falling"}); if (btn<0) showMinAgain();
if (btn>0) regen();
});
} }
let wentToSleepAt; let wentToSleepAt;

View File

@ -1 +1,2 @@
1.00: First published version. 1.00: First published version.
1.01: Use Bangle.setUI for Launcher/buttons

View File

@ -200,16 +200,9 @@ if (Bangle.isLCDOn()) {
drawAll(); // draw immediately drawAll(); // draw immediately
} }
// show launcher when middle button pressed // Show launcher when button pressed
setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" }); Bangle.setUI("clockupdown", btn=>{
if (btn<0) prevInfo();
// rotate through info when the buttons are pressed if (btn>0) nextInfo();
setWatch(() => {
nextInfo();
drawAll(); drawAll();
}, BTN3, { repeat: true }); });
setWatch(() => {
prevInfo();
drawAll();
}, BTN1, { repeat: true });

View File

@ -2,4 +2,6 @@
0.02: Added support for locale and 12H clock 0.02: Added support for locale and 12H clock
0.03: Added HR indication to clock 0.03: Added HR indication to clock
0.04: Update font size and alignment 0.04: Update font size and alignment
0.05: Changes which circle show minutes and seconds 0.05: Changes which circle show minutes and seconds
0.06: Avoid function wrapper, use setUI for launcher
Clock face smaller so no longer breaks widgets

View File

@ -1,229 +1,226 @@
{ var minutes;
var minutes; var seconds;
var seconds; var hours;
var hours; var date;
var date; var first = true;
var first = true; var locale = require('locale');
var locale = require('locale'); var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false;
var _12hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"] || false;
//HR variables //HR variables
var id = 0; var id = 0;
var grow = true; var grow = true;
var size=10; var size=10;
//Screen dimensions //Screen dimensions
const screen = { const screen = {
width: g.getWidth(), width: g.getWidth(),
height: g.getWidth(), height: g.getWidth(),
middle: g.getWidth() / 2, middle: g.getWidth() / 2,
center: g.getHeight() / 2, center: g.getHeight() / 2,
}; };
// Ssettings // Settings
const settings = { const settings = {
time: { time: {
color: '#D6ED17', color: '#D6ED17',
font: 'Vector', font: 'Vector',
size: 60, size: 60,
middle: screen.middle, middle: screen.middle,
center: screen.center, center: screen.center,
}, },
date: { date: {
color: '#D6ED17', color: '#D6ED17',
font: 'Vector', font: 'Vector',
size: 15, size: 15,
middle: screen.height-17, // at bottom of screen middle: screen.height-17, // at bottom of screen
center: screen.center, center: screen.center,
}, },
circle: { circle: {
colormin: '#ffffff', colormin: '#ffffff',
colorsec: '#ffffff', colorsec: '#ffffff',
width: 10, width: 10,
middle: screen.middle, middle: screen.middle,
center: screen.center, center: screen.center,
height: screen.height height: screen.height-24
}, },
hr: { hr: {
color: '#333333', color: '#333333',
size: 10, size: 10,
x: screen.center, x: screen.center,
y: screen.middle + 45 y: screen.middle + 45
}
};
const dateStr = function (date) {
return locale.date(new Date(), 1);
};
const getArcXY = function (centerX, centerY, radius, angle) {
var s, r = [];
s = 2 * Math.PI * angle / 360;
r.push(centerX + Math.round(Math.cos(s) * radius));
r.push(centerY + Math.round(Math.sin(s) * radius));
return r;
};
const drawMinArc = function (sections, color) {
g.setColor(color);
var rad = (settings.circle.height / 2) - 40;
var r1 = getArcXY(settings.circle.middle, settings.circle.center, rad, sections * (360 / 60) - 90);
//g.setPixel(r[0],r[1]);
var r2 = getArcXY(settings.circle.middle, settings.circle.center, rad - settings.circle.width, sections * (360 / 60) - 90);
//g.setPixel(r[0],r[1]);
g.drawLine(r1[0], r1[1], r2[0], r2[1]);
g.setColor('#333333');
g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4);
};
const drawSecArc = function (sections, color) {
g.setColor(color);
var rad = (settings.circle.height / 2) - 20;
var r1 = getArcXY(settings.circle.middle, settings.circle.center, rad, sections * (360 / 60) - 90);
//g.setPixel(r[0],r[1]);
var r2 = getArcXY(settings.circle.middle, settings.circle.center, rad - settings.circle.width, sections * (360 / 60) - 90);
//g.setPixel(r[0],r[1]);
g.drawLine(r1[0], r1[1], r2[0], r2[1]);
g.setColor('#333333');
g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4);
};
const drawClock = function () {
g.reset();
currentTime = new Date();
//Set to initial time when started
if (first == true) {
minutes = currentTime.getMinutes();
seconds = currentTime.getSeconds();
for (count = 0; count <= minutes; count++) {
drawMinArc(count, settings.circle.colormin);
} }
};
const dateStr = function (date) { for (count = 0; count <= seconds; count++) {
return locale.date(new Date(), 1); drawSecArc(count, settings.circle.colorsec);
}; }
first = false;
}
const getArcXY = function (centerX, centerY, radius, angle) { // Reset
var s, r = []; if (seconds == 59) {
s = 2 * Math.PI * angle / 360; g.setColor('#000000');
r.push(centerX + Math.round(Math.cos(s) * radius)); g.fillCircle(settings.circle.middle, settings.circle.center, (settings.circle.height / 2));
r.push(centerY + Math.round(Math.sin(s) * radius)); for (count = 0; count <= minutes; count++) {
drawMinArc(count, settings.circle.colormin);
}
}
return r; //Get date as a string
}; date = dateStr(currentTime);
const drawMinArc = function (sections, color) { // Update minutes when needed
if (minutes != currentTime.getMinutes()) {
minutes = currentTime.getMinutes();
drawMinArc(minutes, settings.circle.colormin);
}
//Update seconds when needed
if (seconds != currentTime.getSeconds()) {
seconds = currentTime.getSeconds();
drawSecArc(seconds, settings.circle.colorsec);
}
//Write the time as configured in the settings
hours = currentTime.getHours();
if (_12hour && hours > 13) {
hours = hours - 12;
}
var meridian;
if (typeof locale.meridian === "function") {
meridian = locale.meridian(new Date());
} else {
meridian = "";
}
var timestr;
if (meridian.length > 0 && _12hour) {
timestr = hours + " " + meridian;
} else {
timestr = hours;
}
g.setFontAlign(0, 0, 0);
g.setColor(settings.time.color);
g.setFont(settings.time.font, settings.time.size);
g.drawString(timestr, settings.time.center, settings.time.middle);
//Write the date as configured in the settings
g.setColor(settings.date.color);
g.setFont(settings.date.font, settings.date.size);
g.drawString(date, settings.date.center, settings.date.middle);
};
//setInterval for HR visualisation
const newBeats = function (hr) {
if (id != 0) {
changeInterval(id, 6e3 / hr.bpm);
} else {
id = setInterval(drawHR, 6e3 / hr.bpm);
}
};
//visualize HR with circles pulsating
const drawHR = function () {
if (grow && size < settings.hr.size) {
size++;
}
if (!grow && size > 3) {
size--;
}
if (size == settings.hr.size || size == 3) {
grow = !grow;
}
if (grow) {
color = settings.hr.color;
g.setColor(color); g.setColor(color);
rad = (settings.circle.height / 2) - 40; g.fillCircle(settings.hr.x, settings.hr.y, size);
r1 = getArcXY(settings.circle.middle, settings.circle.center, rad, sections * (360 / 60) - 90); } else {
//g.setPixel(r[0],r[1]); color = "#000000";
r2 = getArcXY(settings.circle.middle, settings.circle.center, rad - settings.circle.width, sections * (360 / 60) - 90);
//g.setPixel(r[0],r[1]);
g.drawLine(r1[0], r1[1], r2[0], r2[1]);
g.setColor('#333333');
g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4);
};
const drawSecArc = function (sections, color) {
g.setColor(color); g.setColor(color);
rad = (settings.circle.height / 2) - 20; g.drawCircle(settings.hr.x, settings.hr.y, size);
r1 = getArcXY(settings.circle.middle, settings.circle.center, rad, sections * (360 / 60) - 90); }
//g.setPixel(r[0],r[1]); };
r2 = getArcXY(settings.circle.middle, settings.circle.center, rad - settings.circle.width, sections * (360 / 60) - 90);
//g.setPixel(r[0],r[1]);
g.drawLine(r1[0], r1[1], r2[0], r2[1]);
g.setColor('#333333');
g.drawCircle(settings.circle.middle, settings.circle.center, rad - settings.circle.width - 4);
};
const drawClock = function () { // clean app screen
g.clear();
Bangle.loadWidgets();
Bangle.drawWidgets();
currentTime = new Date(); //manage when things should be enabled and not
Bangle.on('lcdPower', function (on) {
if (on) {
Bangle.setHRMPower(1);
} else {
Bangle.setHRMPower(0);
}
});
//Set to initial time when started // refesh every second
if (first == true) { setInterval(drawClock, 1E3);
minutes = currentTime.getMinutes();
seconds = currentTime.getSeconds();
for (count = 0; count <= minutes; count++) {
drawMinArc(count, settings.circle.colormin);
}
for (count = 0; count <= seconds; count++) { //start HR monitor and update frequency of update
drawSecArc(count, settings.circle.colorsec); Bangle.setHRMPower(1);
} Bangle.on('HRM', function (d) {
first = false; newBeats(d);
} });
// Reset // draw now
if (seconds == 59) { drawClock();
g.setColor('#000000');
g.fillCircle(settings.circle.middle, settings.circle.center, (settings.circle.height / 2));
for (count = 0; count <= minutes; count++) {
drawMinArc(count, settings.circle.colormin);
}
}
//Get date as a string // Show launcher when button pressed
date = dateStr(currentTime); Bangle.setUI("clock");
// Update minutes when needed
if (minutes != currentTime.getMinutes()) {
minutes = currentTime.getMinutes();
drawMinArc(minutes, settings.circle.colormin);
}
//Update seconds when needed
if (seconds != currentTime.getSeconds()) {
seconds = currentTime.getSeconds();
drawSecArc(seconds, settings.circle.colorsec);
}
//Write the time as configured in the settings
hours = currentTime.getHours();
if (_12hour && hours > 13) {
hours = hours - 12;
}
var meridian;
if (typeof locale.meridian === "function") {
meridian = locale.meridian(new Date());
} else {
meridian = "";
}
var timestr;
if (meridian.length > 0 && _12hour) {
timestr = hours + " " + meridian;
} else {
timestr = hours;
}
g.setFontAlign(0, 0, 0);
g.setColor(settings.time.color);
g.setFont(settings.time.font, settings.time.size);
g.drawString(timestr, settings.time.center, settings.time.middle);
//Write the date as configured in the settings
g.setColor(settings.date.color);
g.setFont(settings.date.font, settings.date.size);
g.drawString(date, settings.date.center, settings.date.middle);
};
//setInterval for HR visualisation
const newBeats = function (hr) {
if (id != 0) {
changeInterval(id, 6e3 / hr.bpm);
} else {
id = setInterval(drawHR, 6e3 / hr.bpm);
}
};
//visualize HR with circles pulsating
const drawHR = function () {
if (grow && size < settings.hr.size) {
size++;
}
if (!grow && size > 3) {
size--;
}
if (size == settings.hr.size || size == 3) {
grow = !grow;
}
if (grow) {
color = settings.hr.color;
g.setColor(color);
g.fillCircle(settings.hr.x, settings.hr.y, size);
} else {
color = "#000000";
g.setColor(color);
g.drawCircle(settings.hr.x, settings.hr.y, size);
}
};
// clean app screen
g.clear();
Bangle.loadWidgets();
Bangle.drawWidgets();
//manage when things should be enabled and not
Bangle.on('lcdPower', function (on) {
if (on) {
Bangle.setHRMPower(1);
} else {
Bangle.setHRMPower(0);
}
});
// refesh every second
setInterval(drawClock, 1E3);
//start HR monitor and update frequency of update
Bangle.setHRMPower(1);
Bangle.on('HRM', function (d) {
newBeats(d);
});
// draw now
drawClock();
// Show launcher when middle button pressed
setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });
}

View File

@ -1 +1,2 @@
0.01: New App! 0.01: New App!
0.02: Fix text alignment, move to setUI

View File

@ -17,126 +17,119 @@ function drawTime(){
var utc = getUTCTime(d); var utc = getUTCTime(d);
var beats = Math.floor((((utc[0] + 1) % 24) + utc[1] / 60 + utc[2] / 3600) * 1000 / 24); var beats = Math.floor((((utc[0] + 1) % 24) + utc[1] / 60 + utc[2] / 3600) * 1000 / 24);
function drawStation(){ g.reset().setFont("Vector",10).setFontAlign(0,0);
g.setFont("Vector",10); g.setColor("#ffffff");
g.setColor("#ffffff"); switch (utc[0]) {
switch (utc[0]) { case 0:
case 0: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("00h00-00h30 Radio Havane Cuba\n15730\n00h00-01h00 Radio for Peace Int.\n9395\n00h30-01h00 Radio Havane Cuba\n5040",xyCenter,30);
g.drawString("00h00-00h30 Radio Havane Cuba\n15730\n00h00-01h00 Radio for Peace Int.\n9395\n00h30-01h00 Radio Havane Cuba\n5040",xyCenter,30); break;
break; case 1:
case 1: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("01h00-02h00 Radio Roumanie Int.\n6040 7375\n01h00-01h30 R. Argentine vers le monde\n9395",xyCenter,30);
g.drawString("01h00-02h00 Radio Roumanie Int.\n6040 7375\n01h00-01h30 R. Argentine vers le monde\n9395",xyCenter,30); break;
break; case 2:
case 2: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("02h30-03h00 R. Argentine vers le monde\n5800",xyCenter,30);
g.drawString("02h30-03h00 R. Argentine vers le monde\n5800",xyCenter,30); break;
break; case 4:
case 4: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("04h00-05h00 R.F.I.\n9790 11700\n04h00-05h00 Voix de la Corée\n13650 15105\n04h30-05h00 A.W.R.\n6155",xyCenter,30);
g.drawString("04h00-05h00 R.F.I.\n9790 11700\n04h00-05h00 Voix de la Corée\n13650 15105\n04h30-05h00 A.W.R.\n6155",xyCenter,30); break;
break; case 5:
case 5: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("05h00-05h30 Radio Roumanie Int.\n6015 15340 17520\n05h00-06h00 Radio Ndarason Int.\n5960\n05h30-06h00 Radio Japon\n11730 13840\n",xyCenter,30);
g.drawString("05h00-05h30 Radio Roumanie Int.\n6015 15340 17520\n05h00-06h00 Radio Ndarason Int.\n5960\n05h30-06h00 Radio Japon\n11730 13840\n",xyCenter,30); break;
break; case 6:
case 6: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("06h00-06h30 B.B.C.\n5875 9440 11620\n06h00-06h30 Voix de l'Amérique\n4960 6180 9885 13830\n06h30-06h45 Vatican News\n11935",xyCenter,30);
g.drawString("06h00-06h30 B.B.C.\n5875 9440 11620\n06h00-06h30 Voix de l'Amérique\n4960 6180 9885 13830\n06h30-06h45 Vatican News\n11935",xyCenter,30); break;
break; case 7:
case 7: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("07h00-07h30 B.B.C.\n9440 13810?\n07h00-08h00 Radio Chine Int.\n17865\n07h00-08h00 R.F.I.\n11700 13695 15300 17850 21580?",xyCenter,30);
g.drawString("07h00-07h30 B.B.C.\n9440 13810?\n07h00-08h00 Radio Chine Int.\n17865\n07h00-08h00 R.F.I.\n11700 13695 15300 17850 21580?",xyCenter,30); break;
break; case 8:
case 8: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("08h00-08h30 A.W.R.\n15145\n08h00-09h00 W.B.C.Q.\n9330\n08h30-09h00 Voix de l'Amérique\n9410 13830 17530",xyCenter,30);
g.drawString("08h00-08h30 A.W.R.\n15145\n08h00-09h00 W.B.C.Q.\n9330\n08h30-09h00 Voix de l'Amérique\n9410 13830 17530",xyCenter,30); break;
break; case 9:
case 9: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("09h00-10h00 R. Argentine vers le monde\n5950\n09h00-10h00 R.F.I.\n13695 15300 15320",xyCenter,30);
g.drawString("09h00-10h00 R. Argentine vers le monde\n5950\n09h00-10h00 R.F.I.\n13695 15300 15320",xyCenter,30); break;
break; case 10:
case 10: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("10h00-10h30 Voix du Nigéria\n11770\n10h00-11h00 Radio MiAmigo\n6085",xyCenter,30);
g.drawString("10h00-10h30 Voix du Nigéria\n11770\n10h00-11h00 Radio MiAmigo\n6085",xyCenter,30); break;
break; case 11:
case 11: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("11h00-12h00 Voix de la Corée\n11710 11735 13650 15180\n11h30-12h00 Radio Slovaquie Int.\n6005",xyCenter,30);
g.drawString("11h00-12h00 Voix de la Corée\n11710 11735 13650 15180\n11h30-12h00 Radio Slovaquie Int.\n6005",xyCenter,30); break;
break; case 12:
case 12: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("12h00-12h30 Voix du Vietnam\n7285\n12h00-13h00 Radio MiAmigo\n6085",xyCenter,30);
g.drawString("12h00-12h30 Voix du Vietnam\n7285\n12h00-13h00 Radio MiAmigo\n6085",xyCenter,30); break;
break; case 13:
case 13: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("13h00-14h00 Radio for Peace Int.\n15770\n13h30-14h00 Radio Slovaquie Int.\n6005",xyCenter,30);
g.drawString("13h00-14h00 Radio for Peace Int.\n15770\n13h30-14h00 Radio Slovaquie Int.\n6005",xyCenter,30); break;
break; case 14:
case 14: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("14h00-16h00 Radio saoudienne Int.\n17660\n14h00-16h00 Radio Chine Int.\n11920 13670\n14h55-15h25 T.W.R. Swaziland\n9585",xyCenter,30);
g.drawString("14h00-16h00 Radio saoudienne Int.\n17660\n14h00-16h00 Radio Chine Int.\n11920 13670\n14h55-15h25 T.W.R. Swaziland\n9585",xyCenter,30); break;
break; case 15:
case 15: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("15h00-15h30 Radio Tirana\n3985\n15h00-15h30 Radio Nationale Lao\n6130 567",xyCenter,30);
g.drawString("15h00-15h30 Radio Tirana\n3985\n15h00-15h30 Radio Nationale Lao\n6130 567",xyCenter,30); break;
break; case 16:
case 16: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("16h00-16h15 Vatican News\n11950\n16h30-17h15 Voix de l'Afrique\n9505",xyCenter,30);
g.drawString("16h00-16h15 Vatican News\n11950\n16h30-17h15 Voix de l'Afrique\n9505",xyCenter,30); break;
break; case 17:
case 17: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("17h00-18h00 R.F.I.\n13740 13770 17850\n17h30-18h25 Voix de la Turquie\n7360",xyCenter,30);
g.drawString("17h00-18h00 R.F.I.\n13740 13770 17850\n17h30-18h25 Voix de la Turquie\n7360",xyCenter,30); break;
break; case 18:
case 18: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("18h00-18h11 Radio Algérie Int.\n13820\n18h30-19h00 Radio Slovaquie Int.\n3985",xyCenter,30);
g.drawString("18h00-18h11 Radio Algérie Int.\n13820\n18h30-19h00 Radio Slovaquie Int.\n3985",xyCenter,30); break;
break; case 19:
case 19: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("19h00-19h30 Radio Taiwan Int.\n6005\n19h23-20h23 Voix de la République\nIslamique d'Iran\n7235",xyCenter,30);
g.drawString("19h00-19h30 Radio Taiwan Int.\n6005\n19h23-20h23 Voix de la République\nIslamique d'Iran\n7235",xyCenter,30); break;
break; case 20:
case 20: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("20h00-21h15 Radio Le Caire\n9810\n20h00-21h00 Voix de l'Indonésie\n3325 4750\n20h30-20h50 Radio Belarus\n3985",xyCenter,30);
g.drawString("20h00-21h15 Radio Le Caire\n9810\n20h00-21h00 Voix de l'Indonésie\n3325 4750\n20h30-20h50 Radio Belarus\n3985",xyCenter,30); break;
break; case 21:
case 21: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("21h00-21h30 Voix de l'Amérique\n5970 9490 9740 11900\n21h00-22h00 Radio for Peace Int.\n6070",xyCenter,30);
g.drawString("21h00-21h30 Voix de l'Amérique\n5970 9490 9740 11900\n21h00-22h00 Radio for Peace Int.\n6070",xyCenter,30); break;
break; case 22:
case 22: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("22h00-22h15 T.W.R. Bénin\n1566\n22h30-23h00 Radio Extérieure d'Espagne\n9690 11670 11940",xyCenter,30);
g.drawString("22h00-22h15 T.W.R. Bénin\n1566\n22h30-23h00 Radio Extérieure d'Espagne\n9690 11670 11940",xyCenter,30); break;
break; case 23:
case 23: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("23h23-00h23 Voix de la République\nIslamique d'Iran\n7230\n23h30-00h00 R. Argentine vers le monde\n7780",xyCenter,30);
g.drawString("23h23-00h23 Voix de la République\nIslamique d'Iran\n7230\n23h30-00h00 R. Argentine vers le monde\n7780",xyCenter,30); break;
break; default:
default: g.clearRect(0,25,240,80);
g.clearRect(0,25,240,80); g.drawString("17h00-18h00 R.F.I.\n13740 15300 17850\n17h00-18h00 R.F.I.\n7205 9790",xyCenter,30);
g.drawString("17h00-18h00 R.F.I.\n13740 15300 17850\n17h00-18h00 R.F.I.\n7205 9790",xyCenter,30); break;
break;
}
} }
drawStation();
// Local time // Local time
g.setFont("6x8",1); g.setFont("6x8",1).setColor("#cccccc");
g.setColor("#cccccc");
g.drawString("Loc",10,85); g.drawString("Loc",10,85);
g.setFont("7x11Numeric7Seg",4); g.setFont("7x11Numeric7Seg",4).setColor("#ffffff");
g.setColor("#ffffff");
g.drawString(`${hours}:${minutes}:${seconds}`, xyCenter, 115, true); g.drawString(`${hours}:${minutes}:${seconds}`, xyCenter, 115, true);
// UTC time // UTC time
g.setFont("6x8",1); g.setFont("6x8",1).setColor("#cccccc");
g.setColor("#cccccc");
g.drawString("UTC",10,155); g.drawString("UTC",10,155);
g.setFont("7x11Numeric7Seg",4); g.setFont("7x11Numeric7Seg",4).setColor("#ff0000");
g.setColor("#ff0000");
g.drawString(utc[0]+`:${minutes}:${seconds}`, xyCenter, 185,true); g.drawString(utc[0]+`:${minutes}:${seconds}`, xyCenter, 185,true);
// footer date // footer date
@ -147,6 +140,7 @@ function drawTime(){
} }
function setGpsTime(){ function setGpsTime(){
print("set GPS time");
Bangle.setGPSPower(1); Bangle.setGPSPower(1);
Bangle.on('GPS',function(fix) { Bangle.on('GPS',function(fix) {
if (fix.fix) { if (fix.fix) {
@ -157,7 +151,7 @@ function setGpsTime(){
start(); start();
} else { } else {
stop(); stop();
g.setFont("Vector",10); g.reset().setFont("Vector",10).setFontAlign(0,0);
g.setColor("#cccccc"); g.setColor("#cccccc");
g.clearRect(0,25,240,80); g.clearRect(0,25,240,80);
g.drawString("Mise à l'heure\npar satellites\nen cours...",xyCenter,40); g.drawString("Mise à l'heure\npar satellites\nen cours...",xyCenter,40);
@ -166,14 +160,13 @@ function setGpsTime(){
} }
function setButtons(){ function setButtons(){
// BTN 1 // Show launcher when button pressed
setWatch(() => { Bangle.setUI("clockupdown", btn=>{
if (btn!=-1) return;
// if up pressed, turn GPS on and wait for new time
setGpsTime(); setGpsTime();
Bangle.beep(500, 4000); Bangle.beep(500, 4000);
}, BTN1, {edge:"rising", repeat:true}); });
// BTN 2
setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
} }
var intervalRef = null; var intervalRef = null;