Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Optional Packages:

Additional packages are required for development and testing. See `requirements.txt` for a more complete list.

Debian packages are available for pySerial, pytz, pythone-gevent, and python-openssl. They can be installed with :
Debian packages are available for pySerial, pytz, python-gevent, and python-openssl. They can be installed with :

sudo apt-get install git python-dev python-serial python-tz python-gevent python-openssl

Expand Down
4 changes: 2 additions & 2 deletions pytomation/interfaces/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def _init(self, *args, **kwargs):
#self._interface.read(100)

def _readInterface(self, lastPacketHash):
#check to see if there is anyting we need to read
#check to see if there is anything we need to read
responses = self._interface.read()
if len(responses) != 0:
for response in responses.split():
Expand Down Expand Up @@ -172,7 +172,7 @@ def _processAnalogInput(self, response, lastPacketHash):
def _processRegister(self, response, lastPacketHash):
foundCommandHash = None

#find our pending command in the list so we can say that we're done (if we are running in syncronous mode - if not well then the caller didn't care)
#find our pending command in the list so we can say that we're done (if we are running in synchronous mode - if not well then the caller didn't care)
for (commandHash, commandDetails) in self._pendingCommandDetails.items():
if commandDetails['modemCommand'] == self._modemCommands['read_register']:
#Looks like this is our command. Lets deal with it
Expand Down
2 changes: 1 addition & 1 deletion pytomation/interfaces/hw_thermostat.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _readInterface(self, lastPacketHash):
# We need to dial back how often we check the thermostat.. Lets not bombard it!
if not self._iteration < self._poll_secs:
self._iteration = 0
#check to see if there is anyting we need to read
#check to see if there is anything we need to read
responses = self._interface.read('tstat')
if len(responses) != 0:
for response in responses.split():
Expand Down
2 changes: 1 addition & 1 deletion pytomation/interfaces/sparkio.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def _readInterface(self, lastPacketHash):
# We need to dial back how often we check the thermostat.. Lets not bombard it!
if not self._iteration < self._poll_secs:
self._iteration = 0
#check to see if there is anyting we need to read
#check to see if there is anything we need to read
responses = self._interface.read('v1/:id/events')
if len(responses) != 0:
for response in responses.split():
Expand Down
4 changes: 2 additions & 2 deletions pytomation/interfaces/stargate.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def _init(self, *args, **kwargs):
self._logger.error('Startgggg')

def _readInterface(self, lastPacketHash):
#check to see if there is anyting we need to read
#check to see if there is anything we need to read
responses = self._interface.read()
if len(responses) != 0:
for response in responses.split():
Expand Down Expand Up @@ -147,7 +147,7 @@ def _decode_echo_mode_activity(self, activity):
def _processRegister(self, response, lastPacketHash):
foundCommandHash = None

#find our pending command in the list so we can say that we're done (if we are running in syncronous mode - if not well then the caller didn't care)
#find our pending command in the list so we can say that we're done (if we are running in synchronous mode - if not well then the caller didn't care)
for (commandHash, commandDetails) in self._pendingCommandDetails.items():
if commandDetails['modemCommand'] == self._modemCommands['read_register']:
#Looks like this is our command. Lets deal with it
Expand Down
2 changes: 1 addition & 1 deletion pytomation/interfaces/tomato.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def _readInterface(self, lastPacketHash):
# We need to dial back how often we check the thermostat.. Lets not bombard it!
if not self._iteration < self._poll_secs:
self._iteration = 0
#check to see if there is anyting we need to read
#check to see if there is anything we need to read
# responses = self._interface.read('tstat')
# if len(responses) != 0:
# for response in responses.split():
Expand Down
6 changes: 3 additions & 3 deletions pytomation/interfaces/upb.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def get_register(self, start=0, end=255, timeout=None):
timeout=timeout)

def _readInterface(self, lastPacketHash):
#check to see if there is anyting we need to read
#check to see if there is anything we need to read
responses = self._interface.read()
if len(responses) != 0:
self._logger.debug("[UPB] Response>\n" + hex_dump(responses) + "\n")
Expand All @@ -221,7 +221,7 @@ def _readInterface(self, lastPacketHash):
def _processUBP(self, response, lastPacketHash):
foundCommandHash = None

#find our pending command in the list so we can say that we're done (if we are running in syncronous mode - if not well then the caller didn't care)
#find our pending command in the list so we can say that we're done (if we are running in synchronous mode - if not well then the caller didn't care)
for (commandHash, commandDetails) in self._pendingCommandDetails.items():
if commandDetails['modemCommand'] == self._modemCommands['send_upb']:
#Looks like this is our command. Lets deal with it
Expand All @@ -246,7 +246,7 @@ def _processUBP(self, response, lastPacketHash):
def _processRegister(self, response, lastPacketHash):
foundCommandHash = None

#find our pending command in the list so we can say that we're done (if we are running in syncronous mode - if not well then the caller didn't care)
#find our pending command in the list so we can say that we're done (if we are running in synchronous mode - if not well then the caller didn't care)
for (commandHash, commandDetails) in self._pendingCommandDetails.items():
if commandDetails['modemCommand'] == self._modemCommands['read_register']:
#Looks like this is our command. Lets deal with it
Expand Down
2 changes: 1 addition & 1 deletion pytomation/utility/miranda.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Notes from Issac:
# http://code.google.com/p/miranda-upnp/
# Marks this file as GPL3 licensed by the author
# I have made minor modificatinos to get it to work with the wemo
# I have made minor modifications to get it to work with the wemo
#
################################

Expand Down
4 changes: 2 additions & 2 deletions pytomation_web/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function init() {
load_settings();
if (currentTheme !== 'a') theme_changed(currentTheme);

//resize sliders, taking the hidden text box into accout
//resize sliders, taking the hidden text box into account
$(window).resize(function() {
clearTimeout(resizeTimer);
resizeTimer = setTimeout(recalc_device_content_size, 200);
Expand Down Expand Up @@ -511,7 +511,7 @@ function reload_device_grid() {
});
if (style !== "compact") $(".command").click(on_device_command);

//resize slider, taking the hidden text box into accout
//resize slider, taking the hidden text box into account
recalc_slider_size();

//recalculate slider size when scrollbars appear (only in desktop version)
Expand Down
6 changes: 3 additions & 3 deletions pytomation_web/js/jquery.mobile.iscrollview.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function jqmIscrollviewRemoveLayerXYProps(e) {
$window: $(window),
$wrapper: [], // The wrapper element
$scroller: [], // The scroller element (first child of wrapper)
$scrollerContent: [], // Content of scroller, sandwitched between any pull-down/pull-up
$scrollerContent: [], // Content of scroller, sandwiched between any pull-down/pull-up
$pullDown: [], // The pull-down element (if any)
$pullUp: [], // The pull-up element (if any)
$pullUpSpacer: [],
Expand Down Expand Up @@ -1079,7 +1079,7 @@ function jqmIscrollviewRemoveLayerXYProps(e) {

//-----------------------------------------------------------------------
// Determine the box-sizing model of an element
// While jQuery normalizes box-sizing models when retriving geometry,
// While jQuery normalizes box-sizing models when retrieving geometry,
// it doesn't consider it when SETTING geometry. So, this is useful when
// setting geometry. (e.g. the height of the wrapper)
//-----------------------------------------------------------------------
Expand Down Expand Up @@ -1126,7 +1126,7 @@ function jqmIscrollviewRemoveLayerXYProps(e) {
// modifying it. This function is called before any removal of
// padding, though. So, if $wrapper, use same calculation as for padding-box,
// ignoring padding.
// (We actually don't call this for anything but $wrapper, but preseve
// (We actually don't call this for anything but $wrapper, but preserve
// functionality in case we ever use it on another element)
adjust = $elem.outerHeight($elem !== this.$wrapper ) - $elem.height();
break;
Expand Down