diff --git a/hydrobot.py b/hydrobot.py --- a/hydrobot.py +++ b/hydrobot.py @@ -14,6 +14,7 @@ from apscheduler.schedulers.background i #TODO #fix temperature offsets #database time interval logging +#set initial state for cron timers config = configparser.ConfigParser(allow_no_value = True) config.read("hydrobot.conf") @@ -63,7 +64,6 @@ class Database: MySeriesHelper(measurement='air_pressure', value=(float)(message.Pressure.value)) if message == msgdb.RelayDriveIn: MySeriesHelper(measurement='water_flow_rate', value=(float)(message.FlowRate.value)) - print(message.FlowRate.value) MySeriesHelper(measurement='input_1', value=(float)(message.Input1.value)) MySeriesHelper(measurement='input_2', value=(float)(message.Input2.value)) MySeriesHelper(measurement='input_3', value=(float)(message.Input3.value)) @@ -71,7 +71,6 @@ class Database: if message == msgdb.WaterSense: MySeriesHelper(measurement='water_level', value=(float)(message.PercentFull.value)) MySeriesHelper(measurement='water_temp', value=(float)(message.Temperature.value)) - MySeriesHelper(measurement='water_raw_debug', value=(float)(message.RawDebug.value)) class CanBus: diff --git a/hydrobot_can.json b/hydrobot_can.json --- a/hydrobot_can.json +++ b/hydrobot_can.json @@ -44,8 +44,10 @@ { "name": "WaterSense", "id": "0x206", - "signals": { "0": {"name": "PercentFull", "bit_length": 8, "factor": 1, "offset": 0, "unit": "%"}, - "8": {"name": "Temperature", "bit_length": 8, "factor": 0.5, "offset": 40, "unit": "C"} + "signals": { "0": {"name": "Temperature", "bit_length": 8, "factor": 0.5, "offset": 40, "unit": "C"}, + "8": {"name": "Nothing", "bit_length": 16, "factor": 1, "offset": 0, "unit": ""}, + "16": {"name": "PercentFull", "bit_length": 8, "factor": 1, "offset": 0, "unit": "%"} + } }