Changeset - 12301ec2a5ea
[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:
0 comments (0 inline, 0 general)
hydrobot.py
Show inline comments
 
import sys
 
import time
 
import _thread
 
import ast
 
import configparser
 
import datetime
 
from canard import can, messaging
 
from canard.hw import socketcan
 
from canard.file import jsondb
 
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")
 

	
 
    
 
class MySeriesHelper(SeriesHelper):
 
    
 
    # Meta class stores time series helper configuration.
 
    class Meta:
 
        # The client should be an instance of InfluxDBClient.
 
        #client = myclient
 
        # The series name must be a string. Add dependent fields/tags in curly brackets.
 
        series_name = '{measurement}'
 
        # Defines all the fields in this time series.
 
        fields = ['value']
 
        # Defines all the tags for the series.
 
        tags = ['measurement']
 
        # Defines the number of data points to store prior to writing on the wire.
 
        bulk_size = 5
 
        # autocommit must be set to True when using bulk_size
 
        autocommit = True
 
@@ -42,57 +43,55 @@ class MySeriesHelper(SeriesHelper):
 

	
 
class Database:
 
    
 
    def __init__(self):
 
        host = config.get("database", "host")
 
        port = config.get("database", "port")
 
        username = config.get("database", "username")
 
        password = config.get("database", "password")
 
        database = config.get("database", "database")
 
        self.name = config.get("system", "name")
 
        self.client = InfluxDBClient(host, port, username, password, database)
 
        MySeriesHelper.Meta.client = self.client
 
        MySeriesHelper.Meta.series_name = self.name + '.{measurement}'
 
        
 
        # To manually submit data points which are not yet written, call commit:
 
        #MySeriesHelper.commit()
 

	
 
    def log_data(self, msgdb, message):
 
        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):
 
        
 
        self.database = database
 

	
 
        self.dev = socketcan.SocketCanDev("can0")
 
        
 
        parser = jsondb.JsonDbParser()
 
        self.msgdb = parser.parse('hydrobot_can.json')
 
        
 
        self.temp_msg = self.msgdb.AirSense
 
        self.relay_msg = self.msgdb.RelayDriveIn
 
        self.relay_send_msg = self.msgdb.RelayDriveOut
 
        
 
    def start(self):
 
        self.dev.start()
 
        
 
    def start_receive(self):
 
        _thread.start_new_thread(self.process_can, ())
 

	
 
    def process_can(self):
hydrobot_can.json
Show inline comments
 
@@ -23,31 +23,33 @@
 
        {
 
        "name": "RelayDriveIn",
 
        "id": "0x204",
 
        "signals": { "0": {"name": "FlowRate", "bit_length": 16, "factor": 0.133, "offset": 0, "unit": "Hz"},
 
                    "16": {"name": "Nothing", "bit_length": 16, "factor": 1, "offset": 0, "unit": ""},
 
                    "32": {"name": "Input1", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"},
 
                    "40": {"name": "Input2", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"},
 
                    "48": {"name": "Input3", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"},
 
                    "56": {"name": "Input4", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"}
 
                   }
 
        },
 
        {
 
        "name": "Stuff",
 
        "id": "0x205",
 
        "signals": { "0": {"name": "Nothing", "bit_length": 32, "factor": 1, "offset": 0, "unit": ""},
 
                    "32": {"name": "Input1", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"},
 
                    "40": {"name": "Input2", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"},
 
                    "48": {"name": "Input3", "bit_length": 8, "factor": 1, "offset": 0, "unit": "bool"},
 
                    "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)