diff --git a/apps.json b/apps.json index b478a8f69..92746025e 100644 --- a/apps.json +++ b/apps.json @@ -1403,7 +1403,7 @@ "id": "metronome", "name": "Metronome", "icon": "metronome_icon.png", - "version": "0.05", + "version": "0.04", "readme": "README.md", "description": "Makes the watch blinking and vibrating with a given rate", "tags": "tool", @@ -1417,8 +1417,7 @@ "name": "metronome.img", "url": "metronome-icon.js", "evaluate": true - }, - {"name":"metronome.settings.js","url":"settings.js"} + } ] }, { "id": "blackjack", diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog index 909d6b983..25628660e 100644 --- a/apps/metronome/ChangeLog +++ b/apps/metronome/ChangeLog @@ -2,4 +2,3 @@ 0.02: Watch vibrates with every beat 0.03: Uses mean of three time intervalls to calculate bmp 0.04: App shows instructions, Widgets remain visible, color changed -0.05: Buzz intensity and beats per bar can be changed via settings-app diff --git a/apps/metronome/README.md b/apps/metronome/README.md index f67b4adf1..1bb9a893c 100644 --- a/apps/metronome/README.md +++ b/apps/metronome/README.md @@ -8,7 +8,6 @@ This metronome makes your watch blink and vibrate with a given rate. * Use `BTN1` to increase the bmp value by one. * Use `BTN3` to decrease the bmp value by one. * You can change the bpm value any time by tapping the screen or using `BTN1` and `BTN3`. -* Intensity of buzzing and the beats per bar (default 4) can be changed with the settings-app. The first beat per bar will be marked in red. ## Attributions diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js index add6fee16..829b7032a 100644 --- a/apps/metronome/metronome.js +++ b/apps/metronome/metronome.js @@ -14,7 +14,6 @@ function setting(key) { //define default settings const DEFAULTS = { 'beatsperbar': 4, - 'buzzintens': 0.75, }; if (!settings) { loadSettings(); } return (key in settings) ? settings[key] : DEFAULTS[key]; @@ -28,15 +27,16 @@ function loadSettings() { } function changecolor() { - const colors = { - 0: { value: 0xF800, name: "Red" }, - 1: { value: 0xFFFF, name: "White" }, - 2: { value: 0x9492, name: "gray" }, - 3: { value: 0xFFFF, name: "White" }, - 4: { value: 0x9492, name: "gray" }, - 5: { value: 0xFFFF, name: "White" }, - 6: { value: 0x9492, name: "gray" }, + const colors = { + 0: { value: 0xF800, name: "Red" }, + 1: { value: 0xFFFF, name: "White" }, + 2: { value: 0x03E0, name: "DarkGreen" }, + 3: { value: 0xFFFF, name: "White" }, + 4: { value: 0x03E0, name: "DarkGreen" }, + 5: { value: 0xFFFF, name: "White" }, + 6: { value: 0x03E0, name: "DarkGreen" }, 7: { value: 0xFFFF, name: "White" }, + 8: { value: 0x03E0, name: "DarkGreen" }, }; g.setColor(colors[cindex].value); if (cindex == setting('beatsperbar')-1) { @@ -52,7 +52,7 @@ function updateScreen() { g.clearRect(0, 50, 250, 150); changecolor(); try { - Bangle.buzz(50, setting('buzzintens')); + Bangle.buzz(50, 0.75); } catch(err) { } diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js index 1dd4d92df..2aefa1052 100644 --- a/apps/metronome/settings.js +++ b/apps/metronome/settings.js @@ -8,7 +8,6 @@ // initialize with default settings... let s = { 'beatsperbar': 4, - 'buzzintens': 0.75, }; // ...and overwrite them with any saved values // This way saved values are preserved if a new version adds more settings @@ -36,13 +35,6 @@ step: 1, onchange: save('beatsperbar'), }, - 'buzz intensity': { - value: s.buzzintens, - min: 0.0, - max: 1.0, - step: 0.25, - onchange: save('buzzintens'), - }, }; E.showMenu(menu); -}); +}); \ No newline at end of file