From c69ac747a13471e1ca502bcad42c8f95b1630de2 Mon Sep 17 00:00:00 2001 From: Michael Bengfort Date: Sun, 10 May 2020 16:42:27 +0200 Subject: [PATCH 1/3] Metronome shows manual instructions --- apps.json | 2 +- apps/metronome/ChangeLog | 1 + apps/metronome/metronome.js | 18 +++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps.json b/apps.json index 7eb64929c..92746025e 100644 --- a/apps.json +++ b/apps.json @@ -1403,7 +1403,7 @@ "id": "metronome", "name": "Metronome", "icon": "metronome_icon.png", - "version": "0.03", + "version": "0.04", "readme": "README.md", "description": "Makes the watch blinking and vibrating with a given rate", "tags": "tool", diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog index a65efbaaf..56ad24b76 100644 --- a/apps/metronome/ChangeLog +++ b/apps/metronome/ChangeLog @@ -1,3 +1,4 @@ 0.01: New App! 0.02: Watch vibrates with every beat 0.03: Uses mean of three time intervalls to calculate bmp +0.04: App gives manual instructions diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js index acd4b70b8..5ccf915ec 100644 --- a/apps/metronome/metronome.js +++ b/apps/metronome/metronome.js @@ -10,7 +10,7 @@ function changecolor() { const maxColors = 2; const colors = { 0: { value: 0xFFFF, name: "White" }, - 1: { value: 0x000F, name: "Navy" }, + // 1: { value: 0x000F, name: "Navy" }, // 2: { value: 0x03E0, name: "DarkGreen" }, // 3: { value: 0x03EF, name: "DarkCyan" }, // 4: { value: 0x7800, name: "Maroon" }, @@ -21,7 +21,7 @@ function changecolor() { // 9: { value: 0x001F, name: "Blue" }, // 10: { value: 0x07E0, name: "Green" }, // 11: { value: 0x07FF, name: "Cyan" }, - // 12: { value: 0xF800, name: "Red" }, + 1: { value: 0xF800, name: "Red" }, // 13: { value: 0xF81F, name: "Magenta" }, // 14: { value: 0xFFE0, name: "Yellow" }, // 15: { value: 0xFFFF, name: "White" }, @@ -40,11 +40,12 @@ function changecolor() { } function updateScreen() { - g.clear(); + //g.clear(); + g.clearRect(0, 50, 250, 200); changecolor(); Bangle.buzz(50, 0.75); g.setFont("Vector",48); - g.drawString(Math.floor(bpm)+"bpm", -1, 70); + g.drawString(Math.floor(bpm)+"bpm", 5, 80); } Bangle.on('touch', function(button) { @@ -66,10 +67,8 @@ Bangle.on('touch', function(button) { tStart = Date.now(); clearInterval(time_diff); - g.clear(); - g.setFont("Vector",48); bpm = (60 * 1000/(time_diff)); - g.drawString(Math.floor(bpm)+"bpm", -1, 70); + updateScreen(); clearInterval(interval); interval = setInterval(updateScreen, 60000 / bpm); return bpm; @@ -91,3 +90,8 @@ setWatch(() => { }, BTN3, {repeat:true}); interval = setInterval(updateScreen, 60000 / bpm); + +g.drawString('Touch the screen to set tempo.\nUse BTN1 to increase, and\nBTN3 to decrease bpm value by 1.', 15, 20); + +Bangle.loadWidgets(); +Bangle.drawWidgets(); From 3e90f92e35b0af79ca8c151a24918d47d37c94aa Mon Sep 17 00:00:00 2001 From: Michael Bengfort Date: Sun, 10 May 2020 16:48:24 +0200 Subject: [PATCH 2/3] switch manual and bpm string-positions --- apps/metronome/metronome.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js index 5ccf915ec..c41305f77 100644 --- a/apps/metronome/metronome.js +++ b/apps/metronome/metronome.js @@ -40,12 +40,11 @@ function changecolor() { } function updateScreen() { - //g.clear(); - g.clearRect(0, 50, 250, 200); + g.clearRect(0, 50, 250, 150); changecolor(); Bangle.buzz(50, 0.75); g.setFont("Vector",48); - g.drawString(Math.floor(bpm)+"bpm", 5, 80); + g.drawString(Math.floor(bpm)+"bpm", 5, 60); } Bangle.on('touch', function(button) { @@ -91,7 +90,8 @@ setWatch(() => { interval = setInterval(updateScreen, 60000 / bpm); -g.drawString('Touch the screen to set tempo.\nUse BTN1 to increase, and\nBTN3 to decrease bpm value by 1.', 15, 20); +g.clear(); +g.drawString('Touch the screen to set tempo.\nUse BTN1 to increase, and\nBTN3 to decrease bpm value by 1.', 15, 150); Bangle.loadWidgets(); Bangle.drawWidgets(); From 39eab0895e8ff06047bb6aa3eef71677e855d1cf Mon Sep 17 00:00:00 2001 From: Michael Bengfort Date: Sun, 10 May 2020 17:01:56 +0200 Subject: [PATCH 3/3] update Metronome/ChangeLog --- apps/metronome/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog index 56ad24b76..25628660e 100644 --- a/apps/metronome/ChangeLog +++ b/apps/metronome/ChangeLog @@ -1,4 +1,4 @@ 0.01: New App! 0.02: Watch vibrates with every beat 0.03: Uses mean of three time intervalls to calculate bmp -0.04: App gives manual instructions +0.04: App shows instructions, Widgets remain visible, color changed