Integrated time-handling code from Billy J. West.

Author: Paul Jennings

API.py

@@ -145,16 +145,19 @@ class API_CT50v109(API):
 			{0: 'Off', 1: 'On'}
 		),
 		'day': APIEntry(
-			[('/tstat', 'time/day'), ('/tstat/time/day', 'day')],
+			#[('/tstat', 'time/day'), ('/tstat/time/day', 'day')],
+			[('/tstat', 'time/day')],
 			[],
-			{1: 'Sunday', 2: 'Monday', 3: 'Tuesday', 4: 'Wednesday', 5: 'Thursday', 6: 'Friday', 7: 'Saturday'}
+			{0: 'Monday', 1: 'Tuesday', 2: 'Wednesday', 3: 'Thursday', 4: 'Friday', 5: 'Saturday', 6: 'Sunday'}
 		),
 		'hour': APIEntry(
-			[('/tstat', 'time/hour'), ('/tstat/time/hour', 'day')],
+			#[('/tstat', 'time/hour'), ('/tstat/time/hour', 'day')],
+			[('/tstat', 'time/hour')],
 			[]
 		),
 		'minute': APIEntry(
-			[('/tstat', 'time/minute'), ('/tstat/time/minute', 'day')],
+			#[('/tstat', 'time/minute'), ('/tstat/time/minute', 'day')],
+			[('/tstat', 'time/minute')],
 			[]
 		),
 		'today_heat_runtime': APIEntry(

TStat.py

@@ -3,6 +3,9 @@
 #Copyright (c) 2011, Paul Jennings <pjennings-tstat@pjennings.net>
 #All rights reserved.
 
+#Contributors:
+# Billy J. West
+
 #Redistribution and use in source and binary forms, with or without 
 #modification, are permitted provided that the following conditions are met:
 #
@@ -341,8 +344,7 @@ def getFanState(self, raw=False):
 
 	def getTime(self, raw=False):
 		"""Returns current time."""
-		# TODO: time processing
-		pass
+		return {'day': self._get('day'),  'hour': self._get('hour'),  'minute': self._get('minute')}
 
 	def getHeatUsageToday(self, raw=False):
 		"""Returns heat usage for today."""