From f8657f93aa7b7987e2436e22dfa98c6bcad27465 Mon Sep 17 00:00:00 2001
From: bengwalker <63957296+bengwalker@users.noreply.github.com>
Date: Wed, 13 May 2020 17:47:47 +0200
Subject: [PATCH 01/21] Handle "Buzz in progess" Exception

---
 apps/metronome/metronome.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js
index c41305f77..27c36e06f 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -9,15 +9,16 @@ Bangle.setLCDTimeout(undefined);  //do not deaktivate display while running this
 function changecolor() {
   const maxColors = 2;
   const colors = {
-        0: { value: 0xFFFF, name: "White" },
-     //  1: { value: 0x000F, name: "Navy" },
-     //   2: { value: 0x03E0, name: "DarkGreen" },
-     //   3: { value: 0x03EF, name: "DarkCyan" },
-     //   4: { value: 0x7800, name: "Maroon" },
-     //   5: { value: 0x780F, name: "Purple" },
-     //   6: { value: 0x7BE0, name: "Olive" },
-     //   7: { value: 0xC618, name: "LightGray" },
-     //   8: { value: 0x7BEF, name: "DarkGrey" },
+        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: 0x7BEF, name: "DarkGrey" },
+     //   9: { value: 0x001F, name: "Blue" },
      //   9: { value: 0x001F, name: "Blue" },
      //   10: { value: 0x07E0, name: "Green" },
      //   11: { value: 0x07FF, name: "Cyan" },
@@ -42,7 +43,11 @@ function changecolor() {
 function updateScreen() {
   g.clearRect(0, 50, 250, 150);
   changecolor();
-  Bangle.buzz(50, 0.75);
+  try {
+    Bangle.buzz(50, 0.75);
+  }
+  catch(err) {
+  }
   g.setFont("Vector",48);
   g.drawString(Math.floor(bpm)+"bpm", 5, 60);
 }

From 3beaab82ceacf54d29ebf30256ee51635b7dd0ad Mon Sep 17 00:00:00 2001
From: bengwalker <michael.bengfort@posteo.de>
Date: Wed, 13 May 2020 22:31:11 +0200
Subject: [PATCH 02/21] adding settings

---
 apps/banglerun/ChangeLog                    |   0
 apps/buffgym/buffgym-scrn1.png              | Bin
 apps/buffgym/buffgym-scrn2.png              | Bin
 apps/buffgym/buffgym-scrn3.png              | Bin
 apps/buffgym/buffgym-scrn4.png              | Bin
 apps/buffgym/buffgym-scrn5.png              | Bin
 apps/buffgym/buffgym-scrn6.png              | Bin
 apps/buffgym/buffgym.app.js                 |   0
 apps/buffgym/buffgym.png                    | Bin
 apps/marioclock/mario-clock-screen-shot.png | Bin
 apps/metronome/metronome.js                 |  36 +++++++++++-------
 apps/metronome/settings.js                  |  40 ++++++++++++++++++++
 apps/miclock/clock-mixed.png                | Bin
 apps/minionclk/ChangeLog                    |   0
 apps/minionclk/app-icon.js                  |   0
 apps/minionclk/app.js                       |   0
 apps/minionclk/minionclk.png                | Bin
 apps/rpgdice/ChangeLog                      |   0
 apps/rpgdice/app-icon.js                    |   0
 apps/rpgdice/app.js                         |   0
 apps/rpgdice/rpgdice.png                    | Bin
 apps/sclock/clock-simple.png                | Bin
 apps/scolor/show-color.png                  | Bin
 bin/firmwaremaker.js                        |   0
 bin/sanitycheck.js                          |   0
 25 files changed, 62 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 apps/banglerun/ChangeLog
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn1.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn2.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn3.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn4.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn5.png
 mode change 100755 => 100644 apps/buffgym/buffgym-scrn6.png
 mode change 100755 => 100644 apps/buffgym/buffgym.app.js
 mode change 100755 => 100644 apps/buffgym/buffgym.png
 mode change 100755 => 100644 apps/marioclock/mario-clock-screen-shot.png
 create mode 100644 apps/metronome/settings.js
 mode change 100755 => 100644 apps/miclock/clock-mixed.png
 mode change 100755 => 100644 apps/minionclk/ChangeLog
 mode change 100755 => 100644 apps/minionclk/app-icon.js
 mode change 100755 => 100644 apps/minionclk/app.js
 mode change 100755 => 100644 apps/minionclk/minionclk.png
 mode change 100755 => 100644 apps/rpgdice/ChangeLog
 mode change 100755 => 100644 apps/rpgdice/app-icon.js
 mode change 100755 => 100644 apps/rpgdice/app.js
 mode change 100755 => 100644 apps/rpgdice/rpgdice.png
 mode change 100755 => 100644 apps/sclock/clock-simple.png
 mode change 100755 => 100644 apps/scolor/show-color.png
 mode change 100755 => 100644 bin/firmwaremaker.js
 mode change 100755 => 100644 bin/sanitycheck.js

diff --git a/apps/banglerun/ChangeLog b/apps/banglerun/ChangeLog
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn1.png b/apps/buffgym/buffgym-scrn1.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn2.png b/apps/buffgym/buffgym-scrn2.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn3.png b/apps/buffgym/buffgym-scrn3.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn4.png b/apps/buffgym/buffgym-scrn4.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn5.png b/apps/buffgym/buffgym-scrn5.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym-scrn6.png b/apps/buffgym/buffgym-scrn6.png
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym.app.js b/apps/buffgym/buffgym.app.js
old mode 100755
new mode 100644
diff --git a/apps/buffgym/buffgym.png b/apps/buffgym/buffgym.png
old mode 100755
new mode 100644
diff --git a/apps/marioclock/mario-clock-screen-shot.png b/apps/marioclock/mario-clock-screen-shot.png
old mode 100755
new mode 100644
diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js
index 27c36e06f..f1071c0e4 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -6,8 +6,26 @@ var tindex=0;  //index to iterate through time_diffs
 
 Bangle.setLCDTimeout(undefined);  //do not deaktivate display while running this app
 
+const storage = require("Storage");
+const SETTINGS_FILE = 'metronome.settings.json';
+
+//return setting
+function setting(key) {
+  //define default settings
+  const DEFAULTS = {
+    'beatsperbar': 4,
+  };
+  if (!settings) { loadSettings(); }
+  return (key in settings) ? settings[key] : DEFAULTS[key];
+}
+
+//load settings
+let settings;
+
+function loadSettings() {
+  settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+
 function changecolor() {
-  const maxColors = 2;
   const colors = {
         0: { value: 0xF800, name: "Red" },
         1: { value: 0xFFFF, name: "White" },
@@ -17,21 +35,10 @@ function changecolor() {
         5: { value: 0xFFFF, name: "White" },
         6: { value: 0x03E0, name: "DarkGreen" },
         7: { value: 0xFFFF, name: "White" },
-        8: { value: 0x7BEF, name: "DarkGrey" },
-     //   9: { value: 0x001F, name: "Blue" },
-     //   9: { value: 0x001F, name: "Blue" },
-     //   10: { value: 0x07E0, name: "Green" },
-     //   11: { value: 0x07FF, name: "Cyan" },
-        1: { value: 0xF800, name: "Red" },
-     //   13: { value: 0xF81F, name: "Magenta" },
-     //   14: { value: 0xFFE0, name: "Yellow" },
-     //   15: { value: 0xFFFF, name: "White" },
-     //   16: { value: 0xFD20, name: "Orange" },
-     //   17: { value: 0xAFE5, name: "GreenYellow" },
-     //   18: { value: 0xF81F, name: "Pink" },
+        8: { value: 0x03E0, name: "DarkGreen" },
     };
     g.setColor(colors[cindex].value);
-    if (cindex == maxColors-1) {
+    if (cindex == setting('beatsperbar')-1) {
       cindex = 0;
     }
     else {
@@ -52,6 +59,7 @@ function updateScreen() {
   g.drawString(Math.floor(bpm)+"bpm", 5, 60);
 }
 
+  
 Bangle.on('touch', function(button) {
 // setting bpm by tapping the screen. Uses the mean time difference between several tappings.
     if (tindex < time_diffs.length) {
diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
new file mode 100644
index 000000000..2aefa1052
--- /dev/null
+++ b/apps/metronome/settings.js
@@ -0,0 +1,40 @@
+// This file should contain exactly one function, which shows the app's settings
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+(function(back) {
+  const SETTINGS_FILE = 'metronome.settings.json';
+
+  // initialize with default settings...
+  let s = {
+    'beatsperbar': 4,
+  };
+  // ...and overwrite them with any saved values
+  // This way saved values are preserved if a new version adds more settings
+  const storage = require('Storage');
+  const saved = storage.readJSON(SETTINGS_FILE, 1) || {};
+  for (const key in saved) {
+    s[key] = saved[key];
+  }
+
+  // creates a function to safe a specific setting, e.g.  save('color')(1)
+  function save(key) {
+    return function(value) {
+      s[key] = value;
+      storage.write(SETTINGS_FILE, s);
+    };
+  }
+
+  const menu = {
+    '': { 'title': 'Metronome' },
+    '< Back': back,
+    'beats per bar': {
+      value: s.beatsperbar,
+      min: 1,
+      max: 8,
+      step: 1,
+      onchange: save('beatsperbar'),
+    },
+  };
+  E.showMenu(menu);
+});
\ No newline at end of file
diff --git a/apps/miclock/clock-mixed.png b/apps/miclock/clock-mixed.png
old mode 100755
new mode 100644
diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog
old mode 100755
new mode 100644
diff --git a/apps/minionclk/app-icon.js b/apps/minionclk/app-icon.js
old mode 100755
new mode 100644
diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
old mode 100755
new mode 100644
diff --git a/apps/minionclk/minionclk.png b/apps/minionclk/minionclk.png
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/ChangeLog b/apps/rpgdice/ChangeLog
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/app-icon.js b/apps/rpgdice/app-icon.js
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/app.js b/apps/rpgdice/app.js
old mode 100755
new mode 100644
diff --git a/apps/rpgdice/rpgdice.png b/apps/rpgdice/rpgdice.png
old mode 100755
new mode 100644
diff --git a/apps/sclock/clock-simple.png b/apps/sclock/clock-simple.png
old mode 100755
new mode 100644
diff --git a/apps/scolor/show-color.png b/apps/scolor/show-color.png
old mode 100755
new mode 100644
diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
old mode 100755
new mode 100644
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
old mode 100755
new mode 100644

From 0c1499253dff27d848355a807e2093aa302195c1 Mon Sep 17 00:00:00 2001
From: bengwalker <michael.bengfort@posteo.de>
Date: Wed, 13 May 2020 22:44:16 +0200
Subject: [PATCH 03/21] hotfix

---
 apps/metronome/metronome.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js
index f1071c0e4..829b7032a 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -24,6 +24,7 @@ let settings;
 
 function loadSettings() {
   settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+}
 
 function changecolor() {
   const colors = {

From 09ba504289ae95c113ed2f2beb95c67b39dcecab Mon Sep 17 00:00:00 2001
From: bengwalker <michael.bengfort@posteo.de>
Date: Thu, 14 May 2020 07:51:55 +0200
Subject: [PATCH 04/21] add settings to apps.json

---
 apps.json                   | 3 ++-
 apps/metronome/metronome.js | 3 ++-
 apps/metronome/settings.js  | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 92746025e..1caaf9369 100644
--- a/apps.json
+++ b/apps.json
@@ -1417,7 +1417,8 @@
         "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 829b7032a..ac9b9d631 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -14,6 +14,7 @@ function setting(key) {
   //define default settings
   const DEFAULTS = {
     'beatsperbar': 4,
+    'buzzintens': 0.75,
   };
   if (!settings) { loadSettings(); }
   return (key in settings) ? settings[key] : DEFAULTS[key];
@@ -52,7 +53,7 @@ function updateScreen() {
   g.clearRect(0, 50, 250, 150);
   changecolor();
   try {
-    Bangle.buzz(50, 0.75);
+    Bangle.buzz(50, setting('buzzintens'));
   }
   catch(err) {
   }
diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
index 2aefa1052..b91dd9288 100644
--- a/apps/metronome/settings.js
+++ b/apps/metronome/settings.js
@@ -8,6 +8,7 @@
   // 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
@@ -35,6 +36,13 @@
       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

From 7df65cad513258a005bd986b9f0edf33e1e5ec8d Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Thu, 14 May 2020 09:01:52 +0200
Subject: [PATCH 05/21] change version and update Readme

---
 apps.json                | 2 +-
 apps/metronome/ChangeLog | 1 +
 apps/metronome/README.md | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 1caaf9369..b478a8f69 100644
--- a/apps.json
+++ b/apps.json
@@ -1403,7 +1403,7 @@
     "id": "metronome",
     "name": "Metronome",
     "icon": "metronome_icon.png",
-    "version": "0.04",
+    "version": "0.05",
     "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 25628660e..61ff09c98 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,3 +2,4 @@
 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: Enable to set buzz intensity and beats per bar via settings
diff --git a/apps/metronome/README.md b/apps/metronome/README.md
index 1bb9a893c..8a76114f8 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,6 +8,7 @@ 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`.
+* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
 
 ## Attributions
 

From 0ce1556a702cc5197e63082b30e25a1bdcf54b55 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Thu, 14 May 2020 10:55:50 +0200
Subject: [PATCH 06/21] change README and ChangeLog entry

---
 apps/metronome/ChangeLog | 2 +-
 apps/metronome/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog
index 61ff09c98..909d6b983 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,4 +2,4 @@
 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: Enable to set buzz intensity and beats per bar via settings
+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 8a76114f8..f67b4adf1 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,7 +8,7 @@ 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`.
-* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
+* 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
 

From 21963f3835fb97cfdd3e91e85c60fbc771191652 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:34:54 +0200
Subject: [PATCH 07/21] Revert "change README and ChangeLog entry"

This reverts commit 0ce1556a702cc5197e63082b30e25a1bdcf54b55.
---
 apps/metronome/ChangeLog | 2 +-
 apps/metronome/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog
index 909d6b983..61ff09c98 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,4 +2,4 @@
 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
+0.05: Enable to set buzz intensity and beats per bar via settings
diff --git a/apps/metronome/README.md b/apps/metronome/README.md
index f67b4adf1..8a76114f8 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,7 +8,7 @@ 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.
+* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
 
 ## Attributions
 

From e3aea0fd61e7e4333b0508d52feb507e2e14351d Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:35:56 +0200
Subject: [PATCH 08/21] Revert "change version and update Readme"

This reverts commit 7df65cad513258a005bd986b9f0edf33e1e5ec8d.
---
 apps.json                | 2 +-
 apps/metronome/ChangeLog | 1 -
 apps/metronome/README.md | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps.json b/apps.json
index b478a8f69..1caaf9369 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",
diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog
index 61ff09c98..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: Enable to set buzz intensity and beats per bar via settings
diff --git a/apps/metronome/README.md b/apps/metronome/README.md
index 8a76114f8..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`.
-* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
 
 ## Attributions
 

From 2b77dabe519063dd3107653b785334a52d6fe87e Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:36:33 +0200
Subject: [PATCH 09/21] 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

From 4ceb67f2b2560e929aafe88b9dda2fdb47529488 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:38:03 +0200
Subject: [PATCH 10/21] update0005

---
 apps.json                   |  5 +++--
 apps/metronome/ChangeLog    |  1 +
 apps/metronome/README.md    |  1 +
 apps/metronome/metronome.js | 20 ++++++++++----------
 apps/metronome/settings.js  | 10 +++++++++-
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/apps.json b/apps.json
index 92746025e..b478a8f69 100644
--- a/apps.json
+++ b/apps.json
@@ -1403,7 +1403,7 @@
     "id": "metronome",
     "name": "Metronome",
     "icon": "metronome_icon.png",
-    "version": "0.04",
+    "version": "0.05",
     "readme": "README.md",
     "description": "Makes the watch blinking and vibrating with a given rate",
     "tags": "tool",
@@ -1417,7 +1417,8 @@
         "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 25628660e..909d6b983 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,3 +2,4 @@
 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 1bb9a893c..f67b4adf1 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,6 +8,7 @@ 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 829b7032a..add6fee16 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -14,6 +14,7 @@ function setting(key) {
   //define default settings
   const DEFAULTS = {
     'beatsperbar': 4,
+    'buzzintens': 0.75,
   };
   if (!settings) { loadSettings(); }
   return (key in settings) ? settings[key] : DEFAULTS[key];
@@ -27,16 +28,15 @@ function loadSettings() {
 }
 
 function changecolor() {
-  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" },
+  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" },
         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, 0.75);
+    Bangle.buzz(50, setting('buzzintens'));
   }
   catch(err) {
   }
diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
index 2aefa1052..1dd4d92df 100644
--- a/apps/metronome/settings.js
+++ b/apps/metronome/settings.js
@@ -8,6 +8,7 @@
   // 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
@@ -35,6 +36,13 @@
       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
+});

From afa6d0dc3aa3a567b29c42e8d8c398a147fe5fdb Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:47:55 +0200
Subject: [PATCH 11/21] Revert "update0005"

This reverts commit 4ceb67f2b2560e929aafe88b9dda2fdb47529488.
---
 apps.json                   |  5 ++---
 apps/metronome/ChangeLog    |  1 -
 apps/metronome/README.md    |  1 -
 apps/metronome/metronome.js | 20 ++++++++++----------
 apps/metronome/settings.js  | 10 +---------
 5 files changed, 13 insertions(+), 24 deletions(-)

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

From 131c918d3da19a892b1787c791c2e1dea438c0ea Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:51:04 +0200
Subject: [PATCH 12/21] Revert "Revert "add settings to apps.json""

This reverts commit 2b77dabe519063dd3107653b785334a52d6fe87e.
---
 apps.json                   | 3 ++-
 apps/metronome/metronome.js | 3 ++-
 apps/metronome/settings.js  | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 92746025e..1caaf9369 100644
--- a/apps.json
+++ b/apps.json
@@ -1417,7 +1417,8 @@
         "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 829b7032a..ac9b9d631 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -14,6 +14,7 @@ function setting(key) {
   //define default settings
   const DEFAULTS = {
     'beatsperbar': 4,
+    'buzzintens': 0.75,
   };
   if (!settings) { loadSettings(); }
   return (key in settings) ? settings[key] : DEFAULTS[key];
@@ -52,7 +53,7 @@ function updateScreen() {
   g.clearRect(0, 50, 250, 150);
   changecolor();
   try {
-    Bangle.buzz(50, 0.75);
+    Bangle.buzz(50, setting('buzzintens'));
   }
   catch(err) {
   }
diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
index 2aefa1052..b91dd9288 100644
--- a/apps/metronome/settings.js
+++ b/apps/metronome/settings.js
@@ -8,6 +8,7 @@
   // 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
@@ -35,6 +36,13 @@
       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

From e210fdaea3a53e2e2adff8099cc9d00d442e15c8 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:51:15 +0200
Subject: [PATCH 13/21] Revert "Revert "change version and update Readme""

This reverts commit e3aea0fd61e7e4333b0508d52feb507e2e14351d.
---
 apps.json                | 2 +-
 apps/metronome/ChangeLog | 1 +
 apps/metronome/README.md | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 1caaf9369..b478a8f69 100644
--- a/apps.json
+++ b/apps.json
@@ -1403,7 +1403,7 @@
     "id": "metronome",
     "name": "Metronome",
     "icon": "metronome_icon.png",
-    "version": "0.04",
+    "version": "0.05",
     "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 25628660e..61ff09c98 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,3 +2,4 @@
 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: Enable to set buzz intensity and beats per bar via settings
diff --git a/apps/metronome/README.md b/apps/metronome/README.md
index 1bb9a893c..8a76114f8 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,6 +8,7 @@ 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`.
+* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
 
 ## Attributions
 

From 618ade43b95a8ccc5b3c8fd29b2b89b3ecece301 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:51:23 +0200
Subject: [PATCH 14/21] Revert "Revert "change README and ChangeLog entry""

This reverts commit 21963f3835fb97cfdd3e91e85c60fbc771191652.
---
 apps/metronome/ChangeLog | 2 +-
 apps/metronome/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog
index 61ff09c98..909d6b983 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,4 +2,4 @@
 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: Enable to set buzz intensity and beats per bar via settings
+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 8a76114f8..f67b4adf1 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,7 +8,7 @@ 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`.
-* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
+* 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
 

From 45b2316e0493042919a06225211d740c4d081b09 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:51:33 +0200
Subject: [PATCH 15/21] Revert "change README and ChangeLog entry"

This reverts commit 0ce1556a702cc5197e63082b30e25a1bdcf54b55.
---
 apps/metronome/ChangeLog | 2 +-
 apps/metronome/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog
index 909d6b983..61ff09c98 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,4 +2,4 @@
 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
+0.05: Enable to set buzz intensity and beats per bar via settings
diff --git a/apps/metronome/README.md b/apps/metronome/README.md
index f67b4adf1..8a76114f8 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,7 +8,7 @@ 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.
+* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
 
 ## Attributions
 

From 886195a339686bc9fcc0b983aa17b92a6c0f3aa7 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:51:57 +0200
Subject: [PATCH 16/21] Revert "change version and update Readme"

This reverts commit 7df65cad513258a005bd986b9f0edf33e1e5ec8d.
---
 apps.json                | 2 +-
 apps/metronome/ChangeLog | 1 -
 apps/metronome/README.md | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps.json b/apps.json
index b478a8f69..1caaf9369 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",
diff --git a/apps/metronome/ChangeLog b/apps/metronome/ChangeLog
index 61ff09c98..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: Enable to set buzz intensity and beats per bar via settings
diff --git a/apps/metronome/README.md b/apps/metronome/README.md
index 8a76114f8..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`.
-* Using the settings app, you can change the intensity of buzzing and the beats per bar (default 4). The first beat per bar will be marked in red.
 
 ## Attributions
 

From 1e60f47fa96b02f26ab8032ea3bb6a69ee4ab78f Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:52:07 +0200
Subject: [PATCH 17/21] 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

From 2498881609fc9d94cde99b387ea2714ede1674e3 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:52:15 +0200
Subject: [PATCH 18/21] Revert "hotfix"

This reverts commit 0c1499253dff27d848355a807e2093aa302195c1.
---
 apps/metronome/metronome.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js
index 829b7032a..f1071c0e4 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -24,7 +24,6 @@ let settings;
 
 function loadSettings() {
   settings = storage.readJSON(SETTINGS_FILE, 1) || {};
-}
 
 function changecolor() {
   const colors = {

From 4fa752397f980842e4f48afb03aa861b549af8bd Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:52:25 +0200
Subject: [PATCH 19/21] Revert "adding settings"

This reverts commit 3beaab82ceacf54d29ebf30256ee51635b7dd0ad.
---
 apps/banglerun/ChangeLog                    |   0
 apps/buffgym/buffgym-scrn1.png              | Bin
 apps/buffgym/buffgym-scrn2.png              | Bin
 apps/buffgym/buffgym-scrn3.png              | Bin
 apps/buffgym/buffgym-scrn4.png              | Bin
 apps/buffgym/buffgym-scrn5.png              | Bin
 apps/buffgym/buffgym-scrn6.png              | Bin
 apps/buffgym/buffgym.app.js                 |   0
 apps/buffgym/buffgym.png                    | Bin
 apps/marioclock/mario-clock-screen-shot.png | Bin
 apps/metronome/metronome.js                 |  36 +++++++-----------
 apps/metronome/settings.js                  |  40 --------------------
 apps/miclock/clock-mixed.png                | Bin
 apps/minionclk/ChangeLog                    |   0
 apps/minionclk/app-icon.js                  |   0
 apps/minionclk/app.js                       |   0
 apps/minionclk/minionclk.png                | Bin
 apps/rpgdice/ChangeLog                      |   0
 apps/rpgdice/app-icon.js                    |   0
 apps/rpgdice/app.js                         |   0
 apps/rpgdice/rpgdice.png                    | Bin
 apps/sclock/clock-simple.png                | Bin
 apps/scolor/show-color.png                  | Bin
 bin/firmwaremaker.js                        |   0
 bin/sanitycheck.js                          |   0
 25 files changed, 14 insertions(+), 62 deletions(-)
 mode change 100644 => 100755 apps/banglerun/ChangeLog
 mode change 100644 => 100755 apps/buffgym/buffgym-scrn1.png
 mode change 100644 => 100755 apps/buffgym/buffgym-scrn2.png
 mode change 100644 => 100755 apps/buffgym/buffgym-scrn3.png
 mode change 100644 => 100755 apps/buffgym/buffgym-scrn4.png
 mode change 100644 => 100755 apps/buffgym/buffgym-scrn5.png
 mode change 100644 => 100755 apps/buffgym/buffgym-scrn6.png
 mode change 100644 => 100755 apps/buffgym/buffgym.app.js
 mode change 100644 => 100755 apps/buffgym/buffgym.png
 mode change 100644 => 100755 apps/marioclock/mario-clock-screen-shot.png
 delete mode 100644 apps/metronome/settings.js
 mode change 100644 => 100755 apps/miclock/clock-mixed.png
 mode change 100644 => 100755 apps/minionclk/ChangeLog
 mode change 100644 => 100755 apps/minionclk/app-icon.js
 mode change 100644 => 100755 apps/minionclk/app.js
 mode change 100644 => 100755 apps/minionclk/minionclk.png
 mode change 100644 => 100755 apps/rpgdice/ChangeLog
 mode change 100644 => 100755 apps/rpgdice/app-icon.js
 mode change 100644 => 100755 apps/rpgdice/app.js
 mode change 100644 => 100755 apps/rpgdice/rpgdice.png
 mode change 100644 => 100755 apps/sclock/clock-simple.png
 mode change 100644 => 100755 apps/scolor/show-color.png
 mode change 100644 => 100755 bin/firmwaremaker.js
 mode change 100644 => 100755 bin/sanitycheck.js

diff --git a/apps/banglerun/ChangeLog b/apps/banglerun/ChangeLog
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym-scrn1.png b/apps/buffgym/buffgym-scrn1.png
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym-scrn2.png b/apps/buffgym/buffgym-scrn2.png
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym-scrn3.png b/apps/buffgym/buffgym-scrn3.png
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym-scrn4.png b/apps/buffgym/buffgym-scrn4.png
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym-scrn5.png b/apps/buffgym/buffgym-scrn5.png
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym-scrn6.png b/apps/buffgym/buffgym-scrn6.png
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym.app.js b/apps/buffgym/buffgym.app.js
old mode 100644
new mode 100755
diff --git a/apps/buffgym/buffgym.png b/apps/buffgym/buffgym.png
old mode 100644
new mode 100755
diff --git a/apps/marioclock/mario-clock-screen-shot.png b/apps/marioclock/mario-clock-screen-shot.png
old mode 100644
new mode 100755
diff --git a/apps/metronome/metronome.js b/apps/metronome/metronome.js
index f1071c0e4..27c36e06f 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -6,26 +6,8 @@ var tindex=0;  //index to iterate through time_diffs
 
 Bangle.setLCDTimeout(undefined);  //do not deaktivate display while running this app
 
-const storage = require("Storage");
-const SETTINGS_FILE = 'metronome.settings.json';
-
-//return setting
-function setting(key) {
-  //define default settings
-  const DEFAULTS = {
-    'beatsperbar': 4,
-  };
-  if (!settings) { loadSettings(); }
-  return (key in settings) ? settings[key] : DEFAULTS[key];
-}
-
-//load settings
-let settings;
-
-function loadSettings() {
-  settings = storage.readJSON(SETTINGS_FILE, 1) || {};
-
 function changecolor() {
+  const maxColors = 2;
   const colors = {
         0: { value: 0xF800, name: "Red" },
         1: { value: 0xFFFF, name: "White" },
@@ -35,10 +17,21 @@ function changecolor() {
         5: { value: 0xFFFF, name: "White" },
         6: { value: 0x03E0, name: "DarkGreen" },
         7: { value: 0xFFFF, name: "White" },
-        8: { value: 0x03E0, name: "DarkGreen" },
+        8: { value: 0x7BEF, name: "DarkGrey" },
+     //   9: { value: 0x001F, name: "Blue" },
+     //   9: { value: 0x001F, name: "Blue" },
+     //   10: { value: 0x07E0, name: "Green" },
+     //   11: { value: 0x07FF, name: "Cyan" },
+        1: { value: 0xF800, name: "Red" },
+     //   13: { value: 0xF81F, name: "Magenta" },
+     //   14: { value: 0xFFE0, name: "Yellow" },
+     //   15: { value: 0xFFFF, name: "White" },
+     //   16: { value: 0xFD20, name: "Orange" },
+     //   17: { value: 0xAFE5, name: "GreenYellow" },
+     //   18: { value: 0xF81F, name: "Pink" },
     };
     g.setColor(colors[cindex].value);
-    if (cindex == setting('beatsperbar')-1) {
+    if (cindex == maxColors-1) {
       cindex = 0;
     }
     else {
@@ -59,7 +52,6 @@ function updateScreen() {
   g.drawString(Math.floor(bpm)+"bpm", 5, 60);
 }
 
-  
 Bangle.on('touch', function(button) {
 // setting bpm by tapping the screen. Uses the mean time difference between several tappings.
     if (tindex < time_diffs.length) {
diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
deleted file mode 100644
index 2aefa1052..000000000
--- a/apps/metronome/settings.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file should contain exactly one function, which shows the app's settings
-/**
- * @param {function} back Use back() to return to settings menu
- */
-(function(back) {
-  const SETTINGS_FILE = 'metronome.settings.json';
-
-  // initialize with default settings...
-  let s = {
-    'beatsperbar': 4,
-  };
-  // ...and overwrite them with any saved values
-  // This way saved values are preserved if a new version adds more settings
-  const storage = require('Storage');
-  const saved = storage.readJSON(SETTINGS_FILE, 1) || {};
-  for (const key in saved) {
-    s[key] = saved[key];
-  }
-
-  // creates a function to safe a specific setting, e.g.  save('color')(1)
-  function save(key) {
-    return function(value) {
-      s[key] = value;
-      storage.write(SETTINGS_FILE, s);
-    };
-  }
-
-  const menu = {
-    '': { 'title': 'Metronome' },
-    '< Back': back,
-    'beats per bar': {
-      value: s.beatsperbar,
-      min: 1,
-      max: 8,
-      step: 1,
-      onchange: save('beatsperbar'),
-    },
-  };
-  E.showMenu(menu);
-});
\ No newline at end of file
diff --git a/apps/miclock/clock-mixed.png b/apps/miclock/clock-mixed.png
old mode 100644
new mode 100755
diff --git a/apps/minionclk/ChangeLog b/apps/minionclk/ChangeLog
old mode 100644
new mode 100755
diff --git a/apps/minionclk/app-icon.js b/apps/minionclk/app-icon.js
old mode 100644
new mode 100755
diff --git a/apps/minionclk/app.js b/apps/minionclk/app.js
old mode 100644
new mode 100755
diff --git a/apps/minionclk/minionclk.png b/apps/minionclk/minionclk.png
old mode 100644
new mode 100755
diff --git a/apps/rpgdice/ChangeLog b/apps/rpgdice/ChangeLog
old mode 100644
new mode 100755
diff --git a/apps/rpgdice/app-icon.js b/apps/rpgdice/app-icon.js
old mode 100644
new mode 100755
diff --git a/apps/rpgdice/app.js b/apps/rpgdice/app.js
old mode 100644
new mode 100755
diff --git a/apps/rpgdice/rpgdice.png b/apps/rpgdice/rpgdice.png
old mode 100644
new mode 100755
diff --git a/apps/sclock/clock-simple.png b/apps/sclock/clock-simple.png
old mode 100644
new mode 100755
diff --git a/apps/scolor/show-color.png b/apps/scolor/show-color.png
old mode 100644
new mode 100755
diff --git a/bin/firmwaremaker.js b/bin/firmwaremaker.js
old mode 100644
new mode 100755
diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
old mode 100644
new mode 100755

From c7aed0d192986ed981e977b1c1b9b3655114a3d5 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:53:30 +0200
Subject: [PATCH 20/21] update v005 - Use settings

---
 apps.json                   |  5 ++--
 apps/metronome/ChangeLog    |  1 +
 apps/metronome/README.md    |  1 +
 apps/metronome/metronome.js | 55 +++++++++++++++++++++----------------
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/apps.json b/apps.json
index 92746025e..b478a8f69 100644
--- a/apps.json
+++ b/apps.json
@@ -1403,7 +1403,7 @@
     "id": "metronome",
     "name": "Metronome",
     "icon": "metronome_icon.png",
-    "version": "0.04",
+    "version": "0.05",
     "readme": "README.md",
     "description": "Makes the watch blinking and vibrating with a given rate",
     "tags": "tool",
@@ -1417,7 +1417,8 @@
         "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 25628660e..909d6b983 100644
--- a/apps/metronome/ChangeLog
+++ b/apps/metronome/ChangeLog
@@ -2,3 +2,4 @@
 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 1bb9a893c..f67b4adf1 100644
--- a/apps/metronome/README.md
+++ b/apps/metronome/README.md
@@ -8,6 +8,7 @@ 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 27c36e06f..add6fee16 100644
--- a/apps/metronome/metronome.js
+++ b/apps/metronome/metronome.js
@@ -6,32 +6,40 @@ var tindex=0;  //index to iterate through time_diffs
 
 Bangle.setLCDTimeout(undefined);  //do not deaktivate display while running this app
 
+const storage = require("Storage");
+const SETTINGS_FILE = 'metronome.settings.json';
+
+//return setting
+function setting(key) {
+  //define default settings
+  const DEFAULTS = {
+    'beatsperbar': 4,
+    'buzzintens': 0.75,
+  };
+  if (!settings) { loadSettings(); }
+  return (key in settings) ? settings[key] : DEFAULTS[key];
+}
+
+//load settings
+let settings;
+
+function loadSettings() {
+  settings = storage.readJSON(SETTINGS_FILE, 1) || {};
+}
+
 function changecolor() {
-  const maxColors = 2;
-  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" },
+  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" },
         7: { value: 0xFFFF, name: "White" },
-        8: { value: 0x7BEF, name: "DarkGrey" },
-     //   9: { value: 0x001F, name: "Blue" },
-     //   9: { value: 0x001F, name: "Blue" },
-     //   10: { value: 0x07E0, name: "Green" },
-     //   11: { value: 0x07FF, name: "Cyan" },
-        1: { value: 0xF800, name: "Red" },
-     //   13: { value: 0xF81F, name: "Magenta" },
-     //   14: { value: 0xFFE0, name: "Yellow" },
-     //   15: { value: 0xFFFF, name: "White" },
-     //   16: { value: 0xFD20, name: "Orange" },
-     //   17: { value: 0xAFE5, name: "GreenYellow" },
-     //   18: { value: 0xF81F, name: "Pink" },
     };
     g.setColor(colors[cindex].value);
-    if (cindex == maxColors-1) {
+    if (cindex == setting('beatsperbar')-1) {
       cindex = 0;
     }
     else {
@@ -44,7 +52,7 @@ function updateScreen() {
   g.clearRect(0, 50, 250, 150);
   changecolor();
   try {
-    Bangle.buzz(50, 0.75);
+    Bangle.buzz(50, setting('buzzintens'));
   }
   catch(err) {
   }
@@ -52,6 +60,7 @@ function updateScreen() {
   g.drawString(Math.floor(bpm)+"bpm", 5, 60);
 }
 
+  
 Bangle.on('touch', function(button) {
 // setting bpm by tapping the screen. Uses the mean time difference between several tappings.
     if (tindex < time_diffs.length) {

From 78cc747c439fce03f58637262a2108c2315d76e5 Mon Sep 17 00:00:00 2001
From: Michael Bengfort <michael.bengfort@posteo.de>
Date: Fri, 15 May 2020 13:56:56 +0200
Subject: [PATCH 21/21] add settings.js

---
 apps/metronome/settings.js | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 apps/metronome/settings.js

diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
new file mode 100644
index 000000000..1dd4d92df
--- /dev/null
+++ b/apps/metronome/settings.js
@@ -0,0 +1,48 @@
+// This file should contain exactly one function, which shows the app's settings
+/**
+ * @param {function} back Use back() to return to settings menu
+ */
+(function(back) {
+  const SETTINGS_FILE = 'metronome.settings.json';
+
+  // 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
+  const storage = require('Storage');
+  const saved = storage.readJSON(SETTINGS_FILE, 1) || {};
+  for (const key in saved) {
+    s[key] = saved[key];
+  }
+
+  // creates a function to safe a specific setting, e.g.  save('color')(1)
+  function save(key) {
+    return function(value) {
+      s[key] = value;
+      storage.write(SETTINGS_FILE, s);
+    };
+  }
+
+  const menu = {
+    '': { 'title': 'Metronome' },
+    '< Back': back,
+    'beats per bar': {
+      value: s.beatsperbar,
+      min: 1,
+      max: 8,
+      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);
+});