From 64e113d5d73d22e6ab57dbd6a9abb0343814965e Mon Sep 17 00:00:00 2001
From: david <allemang.d@gmail.com>
Date: Wed, 19 Apr 2017 02:25:56 -0400
Subject: [PATCH] Corrected duplicate hour time formatting

---
 clock.json      | 11 ++++++++++-
 panel_script.py |  8 ++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/clock.json b/clock.json
index e930081..72a4415 100644
--- a/clock.json
+++ b/clock.json
@@ -1,7 +1,7 @@
 [
   {
     "surf": "panel_script::time",
-    "anchor": "0.5,0.4",
+    "anchor": "0.5, 0.4",
     "args": {
       "size": 360
     }
@@ -49,5 +49,14 @@
         "anchor": ".5 .5"
       }
     ]
+  },
+  {
+    "surf": "panel_script::weather",
+    "args": {
+      "fmt": "Weather updated {current_conditions.last_updated}",
+      "size": 30
+    },
+    "anchor": ".5 1",
+    "position": "0 -20"
   }
 ]
\ No newline at end of file
diff --git a/panel_script.py b/panel_script.py
index fbde3ee..5b3533c 100644
--- a/panel_script.py
+++ b/panel_script.py
@@ -27,11 +27,11 @@ class Font(object):
 roboto = Font('res/RobotoSlab-Regular.ttf')
 
 
-def __do_eval(text):
+def __do_eval(t):
     try:
-        return eval(text)
+        return eval(t)
     except:
-        return text
+        return t
 
 
 def text(size=60, t="", do_eval=False):
@@ -40,7 +40,7 @@ def text(size=60, t="", do_eval=False):
     return roboto[size].render(t, True, WHITE)
 
 
-def time(size=60, fmt='%I:%H', strip='0'):
+def time(size=60, fmt='%I:%M', strip='0'):
     return roboto[size].render(format(datetime.now(), fmt).lstrip(strip), True, WHITE)