This commit is contained in:
Paulus Schoutsen committed 2019-07-31 12:25:30 -07:00
1 parent da05dfe708
commit 4de97abc3a
2676 files changed
+163166 -140084

No files matched your search

+35 -36
View File
@@ -19,28 +19,27 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
return
sensor_map = {
'bed_temperature': RepetierTempSensor,
'extruder_temperature': RepetierTempSensor,
'chamber_temperature': RepetierTempSensor,
'current_state': RepetierSensor,
'current_job': RepetierJobSensor,
'job_end': RepetierJobEndSensor,
'job_start': RepetierJobStartSensor,
"bed_temperature": RepetierTempSensor,
"extruder_temperature": RepetierTempSensor,
"chamber_temperature": RepetierTempSensor,
"current_state": RepetierSensor,
"current_job": RepetierJobSensor,
"job_end": RepetierJobEndSensor,
"job_start": RepetierJobStartSensor,
}
entities = []
for info in discovery_info:
printer_name = info['printer_name']
printer_name = info["printer_name"]
api = hass.data[REPETIER_API][printer_name]
printer_id = info['printer_id']
sensor_type = info['sensor_type']
temp_id = info['temp_id']
name = info['name']
printer_id = info["printer_id"]
sensor_type = info["sensor_type"]
temp_id = info["temp_id"]
name = info["name"]
if temp_id is not None:
name = '{}{}{}'.format(
name, SENSOR_TYPES[sensor_type][3], temp_id)
name = "{}{}{}".format(name, SENSOR_TYPES[sensor_type][3], temp_id)
else:
name = '{}{}'.format(name, SENSOR_TYPES[sensor_type][3])
name = "{}{}".format(name, SENSOR_TYPES[sensor_type][3])
sensor_class = sensor_map[sensor_type]
entity = sensor_class(api, temp_id, name, printer_id, sensor_type)
entities.append(entity)
@@ -104,17 +103,15 @@ class RepetierSensor(Entity):
async def async_added_to_hass(self):
"""Connect update callbacks."""
async_dispatcher_connect(
self.hass, UPDATE_SIGNAL, self.update_callback)
async_dispatcher_connect(self.hass, UPDATE_SIGNAL, self.update_callback)
def _get_data(self):
"""Return new data from the api cache."""
data = self._api.get_data(
self._printer_id, self._sensor_type, self._temp_id)
data = self._api.get_data(self._printer_id, self._sensor_type, self._temp_id)
if data is None:
_LOGGER.debug(
"Data not found for %s and %s",
self._sensor_type, self._temp_id)
"Data not found for %s and %s", self._sensor_type, self._temp_id
)
self._available = False
return None
self._available = True
@@ -125,7 +122,7 @@ class RepetierSensor(Entity):
data = self._get_data()
if data is None:
return
state = data.pop('state')
state = data.pop("state")
_LOGGER.debug("Printer %s State %s", self._name, state)
self._attributes.update(data)
self._state = state
@@ -146,11 +143,9 @@ class RepetierTempSensor(RepetierSensor):
data = self._get_data()
if data is None:
return
state = data.pop('state')
temp_set = data['temp_set']
_LOGGER.debug(
"Printer %s Setpoint: %s, Temp: %s",
self._name, temp_set, state)
state = data.pop("state")
temp_set = data["temp_set"]
_LOGGER.debug("Printer %s Setpoint: %s, Temp: %s", self._name, temp_set, state)
self._attributes.update(data)
self._state = state
@@ -179,17 +174,19 @@ class RepetierJobEndSensor(RepetierSensor):
data = self._get_data()
if data is None:
return
job_name = data['job_name']
start = data['start']
print_time = data['print_time']
from_start = data['from_start']
job_name = data["job_name"]
start = data["start"]
print_time = data["print_time"]
from_start = data["from_start"]
time_end = start + round(print_time, 0)
self._state = datetime.utcfromtimestamp(time_end).isoformat()
remaining = print_time - from_start
remaining_secs = int(round(remaining, 0))
_LOGGER.debug(
"Job %s remaining %s",
job_name, time.strftime('%H:%M:%S', time.gmtime(remaining_secs)))
job_name,
time.strftime("%H:%M:%S", time.gmtime(remaining_secs)),
)
class RepetierJobStartSensor(RepetierSensor):
@@ -205,11 +202,13 @@ class RepetierJobStartSensor(RepetierSensor):
data = self._get_data()
if data is None:
return
job_name = data['job_name']
start = data['start']
from_start = data['from_start']
job_name = data["job_name"]
start = data["start"]
from_start = data["from_start"]
self._state = datetime.utcfromtimestamp(start).isoformat()
elapsed_secs = int(round(from_start, 0))
_LOGGER.debug(
"Job %s elapsed %s",
job_name, time.strftime('%H:%M:%S', time.gmtime(elapsed_secs)))
job_name,
time.strftime("%H:%M:%S", time.gmtime(elapsed_secs)),
)