Fix 12h and 24h clocks, fix #81

apps.json

@@ -437,10 +437,10 @@
 
 
   { "id": "sclock",
-    "name": "Simple Clock",
+    "name": "Simple 24hr Clock",
     "icon": "clock-simple.png",
-    "version":"0.02",
-    "description": "Simple Digital Clock",
+    "version":"0.03",
+    "description": "Simple Digital 24 Hour Clock",
     "tags": "clock",
     "type":"clock",
     "allow_emulator":true,
@@ -451,17 +451,17 @@
     ]
   },
   { "id": "stclck",
-    "name": "Simple 12H Clock",
+    "name": "Simple 12hr Clock",
     "icon": "clock-simple.png",
-    "version":"0.02",
-    "description": "Simple Digital 12-Hour Clock",
+    "version":"0.03",
+    "description": "Simple Digital 12 Hour Clock",
     "tags": "clock",
     "type":"clock",
     "allow_emulator":true,
     "storage": [
-      {"name":"+sclock","url":"clock-simple.json"},
-      {"name":"-sclock","url":"clock-simple.js"},
-      {"name":"*sclock","url":"clock-simple-icon.js","evaluate":true}
+      {"name":"+stclck","url":"clock-simple.json"},
+      {"name":"-stclck","url":"clock-simple.js"},
+      {"name":"*stclck","url":"clock-simple-icon.js","evaluate":true}
     ]
   },
   { "id": "gesture",

apps/sclock/ChangeLog

@@ -1 +1,2 @@
 0.02: Modified for use with new bootloader and firmware
+0.03: Actually make into 24h clock since there's a 12h variant

apps/sclock/clock-simple.js

@@ -11,7 +11,6 @@ const yposYear = 175;
 const yposGMT = 220;
 
 function drawSimpleClock() {
-
   // get date
   var d = new Date();
   var da = d.toString().split(" ");
@@ -20,17 +19,11 @@ function drawSimpleClock() {
   g.setFontAlign(0, 0);
 
   // draw time
-    var time = da[4].substr(0, 5);
-    var hoursminutes = time.split(":");
-    var meridian = "AM";
-    if (Number(hoursminutes[0]) > 12) {
-        hoursminutes[0] = String(Number(hoursminutes[0]) - 12);
-        meridian = "PM";
-    }
+  var time = da[4].substr(0, 5).split(":");
+  var hours = time[0],
+    minutes = time[1];
   g.setFont(font, timeFontSize);
-    g.drawString(`${hoursminutes[0]}:${hoursminutes[1]}`, xyCenter, yposTime, true);
-    g.setFont(font, gmtFontSize);
-    g.drawString(meridian, xyCenter + 100, yposTime + 10, true);
+  g.drawString(`${hours}:${minutes}`, xyCenter, yposTime, true);
 
   // draw Day, name of month, Date
   var date = [da[0], da[1], da[2]].join(" ");
@@ -46,7 +39,6 @@ function drawSimpleClock() {
   var gmt = da[5];
   g.setFont(font, gmtFontSize);
   g.drawString(gmt, xyCenter, yposGMT, true);
-
 }
 
 // handle switch display on by pressing BTN1

apps/sclock/clock-simple.json

@@ -1,5 +1,6 @@
 {
-  "name":"Simple Clock","type":"clock",
+  "name":"24h Clock",
+  "type":"clock",
   "icon":"*sclock",
   "src":"-sclock",
   "sortorder":-10

apps/stclck/ChangeLog

@@ -1 +1,2 @@
 0.02: Modified for use with new bootloader and firmware
+0.03: Actually made this work

apps/stclck/clock-simple.js

@@ -20,15 +20,19 @@ function drawSimpleClock() {
 
   // draw time
   var time = da[4].substr(0, 5).split(":");
-  var hours = time[0],
+  var hours = parseInt(time[0],10),
     minutes = time[1];
   var meridian = "AM";
-  if (Number(hours) > 12) {
-    hours -= String(Number(hours) - 12);
+  if (hours == 0) {
+    hours = 12;
+    meridian = "PM";
+  }
+  if (hours > 12) {
+    hours -= 12;
     meridian = "PM";
   }
   g.setFont(font, timeFontSize);
-  g.drawString(`${hours}:${minutes}`, xyCenter, yposTime, true);
+  g.drawString(`${(" "+hours).substr(-2)}:${minutes}`, xyCenter, yposTime, true);
   g.setFont(font, gmtFontSize);
   g.drawString(meridian, xyCenter + 102, yposTime + 10, true);
 
@@ -49,9 +53,8 @@ function drawSimpleClock() {
 }
 
 // handle switch display on by pressing BTN1
-Bangle.on("lcdPower", function(on) {
-  if (on)
-    drawSimpleClock();
+Bangle.on('lcdPower', function(on) {
+  if (on) drawSimpleClock();
 });
 
 // clean app screen

apps/stclck/clock-simple.json

@@ -1,7 +1,7 @@
 {
-  "name": "Simple 12H Clock",
+  "name": "12h Clock",
   "type": "clock",
-  "icon": "*sclock",
-  "src": "-sclock",
+  "icon": "*stclck",
+  "src": "-stclck",
   "sortorder": -10
 }