This commit is contained in:
tkl
2021-11-07 09:35:10 +01:00
parent 387a447b99
commit d1f6944216
2 changed files with 24 additions and 13 deletions

View File

@@ -85,7 +85,9 @@ class FakeLight(object):
sun = self.city.sun(now, local=True)
sunset = sun['sunset']
if now.hour >= self.opening_hour and now < sunset:
close_time = now - datetime.timedelta(minutes=30)
if now.hour >= self.opening_hour and close_time < sunset:
fake_light = 1
return fake_light
@@ -129,8 +131,8 @@ class Gate(object):
self.__light_read_timeout = current_time + LIGHT_READ_DELAY_S
light_read = self.__light_sensor.read()
self.__light_data.push(light_read)
logging.info('light - abs: ' + str(light_read) + ', avg: ' + \
str(self.__light_data.average()))
# logging.info('light - abs: ' + str(light_read) + ', avg: ' + \
# str(self.__light_data.average()))
power_read = self.__power_sensor.power_mw()
self.__power_data.push(power_read)
self.__state_handler[self.__next_state](self.__light_data.average())
@@ -235,8 +237,8 @@ class Gate(object):
self.__client.loop_start()
self.__client.publish(MQTT_TOPIC, msg, qos=2, retain=True)
self.__client.loop_stop()
except (ValueError, TypeError, socket.error, ssl.CertificateError):
logging.info('unable to publish to mqtt')
except (ValueError, TypeError, socket.error, ssl.CertificateError) as err:
logging.info('unable to publish to mqtt ({})'.format(err))
if check_to_close(light_avg) is True:
next_state = STATE_CLOSING_1
self.__update_state(next_state)
@@ -251,8 +253,8 @@ class Gate(object):
self.__client.loop_start()
self.__client.publish(MQTT_TOPIC, msg, qos=2, retain=True)
self.__client.loop_stop()
except (ValueError, TypeError, socket.error, ssl.CertificateError):
logging.info('unable to publish to mqtt')
except (ValueError, TypeError, socket.error, ssl.CertificateError) as err:
logging.info('unable to publish to mqtt ({})'.format(err))
if check_to_open(light_avg) is True:
next_state = STATE_OPENING_1
self.__update_state(next_state)
@@ -267,8 +269,8 @@ class Gate(object):
self.__client.loop_start()
self.__client.publish(MQTT_TOPIC, msg, qos=2, retain=True)
self.__client.loop_stop()
except (ValueError, TypeError, socket.error, ssl.CertificateError):
logging.info('unable to publish to mqtt')
except (ValueError, TypeError, socket.error, ssl.CertificateError) as err:
logging.info('unable to publish to mqtt ({})'.format(err))
self.__gate_run_time = time.time()
# workaround for high power after starting engine
@@ -316,8 +318,8 @@ class Gate(object):
self.__client.loop_start()
self.__client.publish(MQTT_TOPIC, msg, qos=2, retain=True)
self.__client.loop_stop()
except (ValueError, TypeError, socket.error, ssl.CertificateError):
logging.info('unable to publish to mqtt')
except (ValueError, TypeError, socket.error, ssl.CertificateError) as err:
logging.info('unable to publish to mqtt ({})'.format(err))
self.__gate_run_time = time.time()
# workaround for high power after starting engine
@@ -360,3 +362,4 @@ class Gate(object):
self.__engine_2.stop()
next_state = STATE_INIT_1
self.__update_state(next_state)