Revert bd3cdfd6 #3

Merged
Rich merged 16 commits from revert-bd3cdfd6 into master 2017-03-19 00:12:50 +00:00
16 Commits
Author SHA1 Message Date
rich 39b81c2cae Revert "Merge branch 'master' into 'Dev'"
This reverts commit bd3cdfd654
2017-03-18 20:06:13 -04:00
rich bd3cdfd654 Merge branch 'master' into 'Dev'
# Conflicts:
#   hue_off.py
#   off.lights
2017-03-18 20:01:47 -04:00
rich e421813237 Merge branch 'Dev' of http://gitlab/Rich/OffWith-Hue into Dev
deleted file from repo & failed to pull changes before making further edits to hue_off.py
2017-03-18 17:28:38 -04:00
rich a1b380ba21 Removing duplicate code for turning off lights upon run, also moved that action to after checking if bridge is reachable 2017-03-18 17:27:26 -04:00
rich 4287c06c26 Delete hue_off.py.bak 2017-03-17 19:29:46 -04:00
rich d69bb543dd removed hue_off.py.bak 2017-03-17 19:29:40 -04:00
rich 6d28516950 Fixed syntax error on line 158 2017-03-17 19:09:58 -04:00
rich 9b89b2ef23 Woah, there's a lot of changes here... for too many to list, but we can now monitor NUT! 2017-03-17 19:05:35 -04:00
rich e580baf8bd more work on NUT check 2017-03-01 21:42:54 -05:00
rich 79a7c177b7 Created Stub function for NutOutage check 2017-02-19 18:08:52 -05:00
rich e2da7d3770 Changed checkPowerOutage to checkCyberPowerOutage 2017-02-15 18:45:50 -05:00
rich b28f88257f Added mode option argument to be used for adding NUT server functionality 2017-02-15 17:52:49 -05:00
rich 0f6e68c1e1 Converted hue_off.py code to python 3, saved old python 2 as hue_off.py.bak 2017-02-15 17:35:14 -05:00
rich 5b53db293d After read in of off.lights file, added code to turn off the lights listed in file and debugged incorrect variable spellings 2016-04-17 20:08:56 -04:00
rich 43590d02e0 Added code to turn off lights listed in off.lights file 2016-04-17 17:00:01 -04:00
rich ca8d4b1510 uncommented read-in stuff 2016-04-15 10:35:33 -04:00