HydroBot/hydrobot-software Changeset - 12301ec2a5ea

Changeset - 12301ec2a5ea

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

matthewreed - 9 years ago 2016-07-26 19:26:53

Fixed some WaterSense bugs

2 files changed with 5 insertions and 4 deletions:

hydrobot.py

hydrobot_can.json

0 comments (0 inline, 0 general)

hydrobot.py

➞

Show inline comments

@@ @@ -11,12 +11,13 @@ from influxdb import InfluxDBClient @@
 from influxdb import SeriesHelper
 from apscheduler.schedulers.background import BackgroundScheduler
 #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")
 DEBUG_CAN = config.getboolean("debug", "can")
 DEBUG_CAN_DETAIL = config.getboolean("debug", "can_detail")
 DEBUG_TIMER = config.getboolean("debug", "timer")
@@ @@ -60,21 +61,19 @@ class Database: @@
         if message == msgdb.AirSense:
             MySeriesHelper(measurement='air_temp', value=(float)(message.Temperature.value))
             MySeriesHelper(measurement='air_humidity', value=(float)(message.Humidity.value))
             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))
             MySeriesHelper(measurement='input_4', value=(float)(message.Input4.value))
         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:
     def __init__(self, database):

hydrobot_can.json

➞

Show inline comments

@@ @@ -41,13 +41,15 @@ @@
                     "56": {"name": "Input4", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"}
+                   }
         },
+        {
         "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": "%"}
+                   }
+        }
+    ]
+}

0 comments (0 inline, 0 general)