Merge branch 'espruino:master' into promenu-0.11

Author: devsnd

apps/bthome/clkinfo.js

@@ -14,4 +14,4 @@
       }
     })
   };
-}) // must not have a semi-colon!
+})

apps/clkinfogpsspeed/clkinfo.js

@@ -24,4 +24,4 @@
     ]
   };
   return ci;
-}) // must not have a semi-colon!
+})

apps/clkinfomag/clkinfo.js

@@ -46,4 +46,4 @@
     ]
   };
   return ci;
-}) // must not have a semi-colon!
+})

apps/dsky_clock/ChangeLog

@@ -0,0 +1,2 @@
+0.01: Initial commit
+0.02: Added Alt modes

apps/dsky_clock/README.md

@@ -0,0 +1,38 @@
+# DSKY Clock
+
+This is a clockface inspired by the Apollo DSKY interface.
+
+## Features
+- battery level indicator (PROG indicator)
+- month (VERB indicator)
+- date (NOUN indicator)
+- Current local time (DATA 1)
+- UTC time (DATA 2)
+- Step counter (DATA 3)
+
+Indicator lights are:
+- COMP ACTY (GPS/HRM active)
+- MSG (Messages waiting)
+- LOCK (Screen is locked)
+- BT (Bluetooth is disconnected)
+- BATT (Low battery or battery charging)
+- ALARM (Alarm is set)
+- STEP (Reached STEP goal))
+
+----
+## Alt Modes
+Swipe left/right to switch between different PROGRAM modes.
+
+- HRM (BPM/Confidence)
+- GPS (Latitude/Longitude/Speed)
+- Weather (Humidity/Rain/Temperature/Wind/Condition Code)
+- Accelerometer (X/Y/Z)
+- Compass (HEADING)
+
+In the interests of usability these change the "LIGHT" on the left side to show the current mode.
+
+----
+This is my first watch face, may add features and customization later.
+
+## Creator
+Written by Carl Chan | [github](https://github.com/carlchan)