Seconds display on tap and README update

Author: lemnet

README.MD

@@ -1,8 +1,13 @@
-This watchface is an adaptation of Simple Weather for Pebble by Evandro Muller.
+This clockface is an adaptation of Simple Weather for Pebble by Evandro Muller.
 It uses OpenWeather as weather service and the icon are from the Oxygen project (https://techbase.kde.org/Projects/Oxygen) under LGPLv3 licence.
+
 Weather is updated every half hour.
-Tap to switch form steps to heart rate, calories and floors.
 
-No configuration. It uses your system settings.
+Tap on time to display it in minutes:seconds until another tap or the screen goes off.
+Tap somewhere else to switch form steps to heart rate, calories and floors.
+
+It uses your system settings for date, time and temperature format.
+Text color can be configured.
+
 
 Feel free to contribute or open an issue on github : https://github.com/lemnet/SimpleWeather/

README_FR.MD

@@ -1,8 +1,13 @@
-Cette watchface est une adaptation de Simple Weather pour Pebble par Evandro Muller.
+Cette clockface est une adaptation de Simple Weather pour Pebble par Evandro Muller.
 Elle utilise OpenWeather pour la météo and les icônes viennent du projet Oxygen (https://techbase.kde.org/Projects/Oxygen) sous licence LGPLv3.
+
 La météo est mise à jour toutes les demies heures.
-Taper to passer des pas au rythme cardiaque, aux calories, et aux étages.
 
-Pas de configuration. Elle utilise vos paramètres systèmes.
+Tapez sur l'heure pour l'afficher en minutes:secondes jusqu'a ce que vous tapiez encore ou que l'écran s'éteigne.
+Tapez ailleurs pour passer des pas au rythme cardiaque, aux calories, et aux étages.
+
+Elle utilise vos paramètres systèmes pour le format de la date, de l'heure et de la température.
+La couleur est paramétrable.
+
 
 N'hésitez pas à contribuer ou ouvrir un ticket sur github : https://github.com/lemnet/SimpleWeather/

app/index.js

@@ -4,7 +4,8 @@ import { units } from "user-settings";
 import * as util from "../common/utils";
 import { gettext } from "i18n";
 import { getDate } from "./date";
-import { getTime } from './time';
+import { getTimeHM } from './time';
+import { getTimeMS } from './time';
 import { today } from 'user-activity'
 import { HeartRateSensor } from 'heart-rate';
 import { display } from "display";
@@ -15,7 +16,6 @@ import { me as device } from "device";
 import * as messaging from "messaging";
 import * as fs from "fs";
 
-
 // Update the clock every minute
 clock.granularity = "minutes";
 
@@ -40,6 +40,7 @@ let currentAct = 0;
 let latitude = 0;
 let longitude = 0;
 let lastfetch = 0;
+let secDisplay = 0;
 
 
 // load weather
@@ -72,7 +73,7 @@ hrm.addEventListener("reading", () => {
     if (currentAct == 1)
       display.on ? hrm.start() : hrm.stop();
   });
-    actText.text = hrm.heartRate;
+  actText.text = hrm.heartRate;
 });
 
 
@@ -168,7 +169,10 @@ clock.ontick = (evt) => {
     actText.text = today.adjusted.calories || 0;
   else if (currentAct == 3) //elevation
     actText.text = today.adjusted.elevationGain || 0;
-  timeText.text = getTime(currentDate);
+  if (secDisplay == 0)
+    timeText.text = getTimeHM(currentDate);
+  else
+    timeText.text = getTimeMS(currentDate);
   //try to get location and weather
   setTimeout(function(){
     if ((currentDate.getTime() - lastfetch) > 1800000) { //every 30 min
@@ -191,28 +195,49 @@ clock.ontick = (evt) => {
 
 
 //onclick
-main.onclick = () => {
+main.onclick = (evt) => {
   vibration.start('bump');
-  if (currentAct == 0) { //steps
-    hrm.start(); 
-    actIcon.href="icons/heart.png"
-    actText.text = hrm.heartRate;
-    currentAct = 1;
-  }
-  else if (currentAct == 1) { //HR
-    hrm.stop();
-    actIcon.href="icons/flame.png"
-    actText.text = today.adjusted.calories || 0;
-    currentAct = 2;
-  }
-  else if (currentAct == 2) { // calo
-    actIcon.href="icons/stairs.png"
-    actText.text = today.adjusted.elevationGain || 0;
-    currentAct = 3;
+  if ((evt.screenX) > 150 && (evt.screenY) < 150) {
+    if (secDisplay == 0) {
+      clock.granularity = "seconds";
+      secDisplay = 1;
+    }
+    else {
+      secDisplay = 0;
+      setTimeout(function(){
+        clock.granularity = "minutes";
+      }, 1500);
+    }
   }
-  else if (currentAct == 3) { // elevation
-    actIcon.href="icons/step.png"
-    actText.text = today.adjusted.steps || 0;
-    currentAct = 0;
+  else {
+    if (currentAct == 0) { //steps
+      hrm.start(); 
+      actIcon.href="icons/heart.png"
+      actText.text = hrm.heartRate;
+      currentAct = 1;
+    }
+    else if (currentAct == 1) { //HR
+      hrm.stop();
+      actIcon.href="icons/flame.png"
+      actText.text = today.adjusted.calories || 0;
+      currentAct = 2;
+    }
+    else if (currentAct == 2) { // calo
+      actIcon.href="icons/stairs.png"
+      actText.text = today.adjusted.elevationGain || 0;
+      currentAct = 3;
+    }
+    else if (currentAct == 3) { // elevation
+      actIcon.href="icons/step.png"
+      actText.text = today.adjusted.steps || 0;
+      currentAct = 0;
+    }
   }
-}
+}
+
+display.addEventListener("change", () => {
+  if (!display.on) {
+    secDisplay = 0;
+    clock.granularity = "minutes";
+  }    
+});

app/time.js

@@ -10,7 +10,7 @@ const zeroPad = number => {
   return padded;
 };
 
-export function getTime(date) {
+export function getTimeHM(date) {
   const hours = date.getHours();
   const ret;
   if (preferences.clockDisplay === '12h') {
@@ -23,4 +23,12 @@ export function getTime(date) {
   ret += ":"
   ret += zeroPad(date.getMinutes());
   return ret;
+};
+
+export function getTimeMS(date) {
+  const ret;
+  ret = zeroPad(date.getMinutes());
+  ret += ":"
+  ret += zeroPad(date.getSeconds());
+  return ret;
 };