Merge pull request #116 from sebi5361/master

clock2x3, setting clock type, simplifying app code

apps.json

@@ -143,16 +143,17 @@
       {"name":"aclock.img","url":"clock-analog-icon.js","evaluate":true}
     ]
   },
-  { "id": "clck3x2",
-    "name": "3x2 Pixel Clock",
-    "icon": "clock3x2.png",
-    "version":"0.03",
-    "description": "This is a simple clock using minimalistic 3x2 pixel numerical digits",
+  { "id": "clock2x3",
+    "name": "2x3 Pixel Clock",
+    "icon": "clock2x3.png",
+    "version":"0.04",
+    "description": "This is a simple clock using minimalist 2x3 pixel numerical digits",
     "tags": "clock",
+    "type": "clock",
     "allow_emulator":true,
     "storage": [
-      {"name":"clck3x2.app.js","url":"clock3x2.js"},
-      {"name":"clck3x2.img","url":"clock3x2-icon.js","evaluate":true}
+      {"name":"clock2x3.app.js","url":"clock2x3-app.js"},
+      {"name":"clock2x3.img","url":"clock2x3-icon.js","evaluate":true}
     ]
   },
   { "id": "trex",

apps/clock2x3/ChangeLog

@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Added 'reset' so we don't get the font color from widgets
+0.04: Changed name from clck3x2 to clock2x3

apps/clock2x3/clock2x3-app.js

@@ -76,8 +76,7 @@ function drawTime() {
   }
 
   let t = d.getSeconds()*1000 + d.getMilliseconds();
-  let delta = (60000 - t) % 60000; // time till next minute
-  idTimeout = setTimeout(drawTime, delta);
+  idTimeout = setTimeout(drawTime, 60000 - t); // time till next minute
 }
 
 // special function to handle display switch on

apps/locale/locales.js

@@ -130,8 +130,8 @@ var locales = {
         temperature: "°C",
         ampm: {0:"",1:""},
         timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" },
-        datePattern: { 0: "%A %B %d %Y", "1": "%d/%m/%Y" }, // dimanche 1 mars 2020 //  01/03/2020
-        abmonth: "anv,févr,mars,avril,mai,juin,juil,août,sept,oct,nov,déc",
+        datePattern: { 0: "%A %d %B %Y", "1": "%d/%m/%Y" }, // dimanche 1 mars 2020 //  01/03/2020
+        abmonth: "janv,févr,mars,avril,mai,juin,juil,août,sept,oct,nov,déc",
         month: "janvier,février,mars,avril,mai,juin,juillet,août,septembre,octobre,novembre,décembre",
         abday: "dim,lun,mar,mer,jeu,ven,sam",
         day: "dimanche,lundi,mardi,mercredi,jeudi,vendredi,samedi",