Merge remote-tracking branch 'upstream/music_message_handling' into app-loader

Author: thyttan

apps/android/ChangeLog

@@ -47,3 +47,4 @@
       version 85 when it's out)
 0.43: Ensure listRecs doesn't list old-style recorded tracks (Otherwise Gadgetbridge fails parsing the filename)
 0.44: Pass HTTP request timeout to Gadgetbridge
+0.45: Don't pass on music messages if nothing has changed

apps/android/lib.js

@@ -2,7 +2,7 @@ exports.gbSend = function(message) {
   Bluetooth.println("");
   Bluetooth.println(JSON.stringify(message));
 }
-let lastMsg, // for music messages - may not be needed now...
+let lastMsg, // for GadgetBridge workaround - may not be needed now...
     gpsState = {}, // keep information on GPS via Gadgetbridge
     settings = Object.assign({rp:true,as:true,vibrate:".."},
       require("Storage").readJSON("android.settings.json",1)||{}
@@ -38,6 +38,8 @@ exports.gbHandler = (event) => {
     },
     // {t:"musicstate", state:"play/pause",position,shuffle,repeat}
     "musicstate" : function() {
+      if (event.state===exports.musicState) return; // no change - avoid spamming message handling with identical messages
+      exports.musicState = event.state;
       require("messages").pushMessage({t:"modify",id:"music",title:"Music",state:event.state});
     },
     // {t:"musicinfo", artist,album,track,dur,c(track count),n(track num}

apps/android/metadata.json

@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.44",
+  "version": "0.45",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",

apps/clock_info/ChangeLog

@@ -22,4 +22,6 @@
 0.20: Altitude ClockInfo now uses the distance units set in locale.
 0.21: Add haptics when changing infos and a setting to toggle it on or off
 0.22: Tapping on step counter now disable step counting on 2v29+ firmwares
-0.23: Use filter function for better image borders if it exists (2v22)
+0.23: Use filter function for better image borders if it exists (2v22)
+0.24: Only save settings once (not once per clockinfo)
+      Add .setFocus function to allow a clockinfo to be focused without faking a click on it

apps/clock_info/lib.js

@@ -235,6 +235,7 @@ clockInfoMenu is the 'options' parameter, with the following added:
 * `remove` : function - remove this clockInfo item
 * `redraw` : function - force a redraw
 * `focus` : bool to show if menu is focused or not
+* `setFocus(f)` function - set if we're focussed or not
 
 You can have more than one clock_info at once as well, for instance:
 
@@ -255,27 +256,21 @@ exports.addInteractive = function(menu, options) {
   if ("function" == typeof options) options = {draw:options}; // backwards compatibility
   options.index = 0|exports.loadCount;
   exports.loadCount = options.index+1;
+  if (!exports.clockInfos.length)
+    E.on("kill", exports.save); // only need one save handler
   exports.clockInfos[options.index] = options;
   options.focus = options.index==0 && options.x===undefined; // focus if we're the first one loaded and no position has been defined
-  const appName = (options.app||"default")+":"+options.index;
-
+  options.appName = (options.app||"default")+":"+options.index;
   // load the currently showing clock_infos
   let settings = exports.loadSettings();
-  if (settings.apps[appName]) {
-    let a = settings.apps[appName].a|0;
-    let b = settings.apps[appName].b|0;
+  if (settings.apps[options.appName]) {
+    let a = settings.apps[options.appName].a|0;
+    let b = settings.apps[options.appName].b|0;
     if (menu[a] && menu[a].items[b]) { // all ok
       options.menuA = a;
       options.menuB = b;
     }
   }
-  const save = () => {
-    // save the currently showing clock_info
-    const settings = exports.loadSettings();
-    settings.apps[appName] = {a:options.menuA, b:options.menuB};
-    require("Storage").writeJSON("clock_info.json",settings);
-  };
-  E.on("kill", save);
 
   if (options.menuA===undefined) options.menuA = 0;
   if (options.menuB===undefined) options.menuB = Math.min(exports.loadCount, menu[options.menuA].items.length)-1;
@@ -307,6 +302,7 @@ exports.addInteractive = function(menu, options) {
       options.menuB += ud;
       if (options.menuB<0) options.menuB = menu[options.menuA].items.length-1;
       if (options.menuB>=menu[options.menuA].items.length) options.menuB = 0;
+      options.modified = true;
     } else if (lr) {
       if (menu.length==1) return; // 1 item - can't move
       oldMenuItem = menu[options.menuA].items[options.menuB];
@@ -324,6 +320,7 @@ exports.addInteractive = function(menu, options) {
       while ((options.menuB < menu[options.menuA].items.length-1) &&
              exports.clockInfos.some(m => (m!=options) && m.menuA==options.menuA && m.menuB==options.menuB))
           options.menuB++;
+      options.modified = true;
     }
     if (oldMenuItem) {
       menuHideItem(oldMenuItem);
@@ -383,15 +380,16 @@ exports.addInteractive = function(menu, options) {
   menuShowItem(menu[options.menuA].items[options.menuB]);
   // return an object with info that can be used to remove the info
   options.remove = function() {
-    save();
-    E.removeListener("kill", save);
+    exports.save();
     Bangle.removeListener("swipe",swipeHandler);
     if (touchHandler) Bangle.removeListener("touch",touchHandler);
     if (lockHandler) Bangle.removeListener("lock", lockHandler);
     Bangle.CLKINFO_FOCUS--;
     menuHideItem(menu[options.menuA].items[options.menuB]);
     exports.loadCount--;
     delete exports.clockInfos[options.index];
+    if (!exports.clockInfos.length) // if no more clockinfos, no need to save
+      E.removeListener("kill", exports.save);
     // If nothing loaded now, clear our list of loaded menus
     if (exports.loadCount==0)
       exports.clockInfoMenus = undefined;
@@ -416,12 +414,16 @@ exports.addInteractive = function(menu, options) {
 
     return true;
   };
+  options.setFocus = function(f) {
+    if (f==options.focus) return;
+    if (f) focus(); else blur();
+  };
   if (options.focus) focus();
   delete settings; // don't keep settings in RAM - save space
   return options;
 };
 
-/* clockinfos usually return a 24x24 image. This draws that image but
+/** clockinfos usually return a 24x24 image. This draws that image but
 recolors it such that it is transparent, with the middle of the image as background
 and the image itself as foreground. options is passed to g.drawImage */
 exports.drawFilledImage = function(img,x,y,options) {
@@ -442,7 +444,7 @@ exports.drawFilledImage = function(img,x,y,options) {
   return g.drawImage(gfx, x-scale,y-scale,options);
 };
 
-/* clockinfos usually return a 24x24 image. This creates a 26x26 gfx of the image but
+/** clockinfos usually return a 24x24 image. This creates a 26x26 gfx of the image but
 recolors it such that it is transparent, with the middle and border of the image as background
 and the image itself as foreground. options is passed to g.drawImage */
 exports.drawBorderedImage = function(img,x,y,options) {
@@ -470,6 +472,17 @@ exports.drawBorderedImage = function(img,x,y,options) {
   return g.drawImage(gfx, x-o,y-o,options);
 };
 
+/** Save clockinfos if modified */
+exports.save = function() {
+  if (!exports.clockInfos.some(ci=>ci.modified)) return; // all written?
+  const settings = exports.loadSettings();
+  exports.clockInfos.forEach(ci => {
+    settings.apps[ci.appName] = {a:ci.menuA, b:ci.menuB};
+    ci.modified = false;
+  });
+  require("Storage").writeJSON("clock_info.json",settings);
+};
+
 // Code for testing (plots all elements from first list)
 /*
 g.clear();

apps/clock_info/metadata.json

@@ -1,7 +1,7 @@
 { "id": "clock_info",
   "name": "Clock Info Module",
   "shortName": "Clock Info",
-  "version":"0.23",
+  "version":"0.24",
   "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
   "icon": "app.png",
   "type": "module",

apps/confthyttan/ChangeLog

@@ -8,3 +8,4 @@
       loading apps.
 0.08: hide bt indicator when connected (`widbt_notify`). Add "Message Twist to
       Scroll". Add "Big Clock Info app".
+      Auto open messages if locked.

apps/confthyttan/messages.settings.json

@@ -1 +1 @@
-{vibrateTimeout:10,vibrate:":",vibrateCalls:":::",flash:false}
+{vibrateTimeout:10,vibrate:":",vibrateCalls:":::",flash:false, autoOpen:2}

apps/fwupdate/custom.html

@@ -112,6 +112,7 @@
     else if (crcs[0] == 4148062987 || crcs[0] == 3675049818) version = "2v25";
     else if (crcs[0] == 2489937616) version = "2v26";
     else if (crcs[0] == 3325639688) version = "2v27";
+    else if (crcs[0] == 3143424848) version = "2v28";
     else { // for other versions all 7 pages are used, check those
       var crc = crcs[1];
       if (crc==1339551013) { version = "2v10.219"; ok = false; }
@@ -380,6 +381,7 @@
 function createJS_bootloader(binary, startAddress, endAddress) {
   var crc = CRC32(binary);
   console.log("CRC 0x"+crc.toString(16));
+  // it is possible to do E.memoryArea(0xF7000,0x7000).match(/BL (2v[^\n]*)/) - can take 1s
   hexJS = `\x10if (E.CRC32(E.memoryArea(${startAddress},${endAddress-startAddress}))==${crc}) { print("DFU UP TO DATE!"); load();}\n`;
   hexJS += `\x10var _fw = new Uint8Array(${binary.length})\n`;
   var CHUNKSIZE = 1024;

apps/invader/ChangeLog

@@ -1,3 +1,4 @@
 0.01: New App!
 0.11: Changes...
 0.12: Minor code improvements
+0.13: Fix app on dark theme screens (fix #1940)