Skip to content

Commit 7b2c456

Browse files
author
Melissa LeBlanc-Williams
committed
Fied error messages
1 parent c75df9f commit 7b2c456

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

adafruit_featherwing/rtc_featherwing.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,12 +292,20 @@ def unixtime(self):
292292
try:
293293
return time.mktime(self._rtc.datetime)
294294
except (ValueError, RuntimeError) as error:
295+
<<<<<<< Updated upstream
295296
print("There was an error attempting to run time.mktime() on this board")
297+
=======
298+
print("Error attempting to run time.mktime() on this board\n", error)
299+
>>>>>>> Stashed changes
296300

297301
@unixtime.setter
298302
def unixtime(self, unixtime):
299303
if isinstance(unixtime, int):
300304
try:
301305
self._rtc.datetime = time.localtime(unixtime)
302306
except (ValueError, RuntimeError) as error:
307+
<<<<<<< Updated upstream
303308
print("There was an error attempting to run time.localtime() on this board")
309+
=======
310+
print("Error attempting to run time.localtime() on this board\n", error)
311+
>>>>>>> Stashed changes

0 commit comments

Comments
 (0)