From 1e60f47fa96b02f26ab8032ea3bb6a69ee4ab78f Mon Sep 17 00:00:00 2001 From: Michael Bengfort Date: Fri, 15 May 2020 13:52:07 +0200 Subject: [PATCH] Revert "add settings to apps.json" This reverts commit 09ba504289ae95c113ed2f2beb95c67b39dcecab. --- apps.json | 3 +-- apps/metronome/metronome.js | 3 +-- apps/metronome/settings.js | 8 -------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/apps.json b/apps.json index 1caaf9369..92746025e 100644 --- a/apps.json +++ b/apps.json @@ -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/metronome.js b/apps/metronome/metronome.js index ac9b9d631..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]; @@ -53,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 b91dd9288..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, - max: 2, - step: 0.25, - onchange: save('buzzintens'), - }, }; E.showMenu(menu); }); \ No newline at end of file