HydroBot/hydrobot-software Changeset - da6947ec7d99

Changeset - da6947ec7d99

Parent rev.

Child rev.

[Not reviewed]

default

0 2 1

matthewreed - 9 years ago 2016-08-07 18:19:07

Added cron task check to set correct state when starting up. Also added untested PID control for outputs.

3 files changed with 127 insertions and 5 deletions:

PID.py

hydrobot.py

hydrobot_can.json

0 comments (0 inline, 0 general)

PID.py

➞

Show inline comments

@@ new file 100644 @@
 import time
 class PID:
     def __init__(self, setpoint = 0):
         self.setpoint = float(setpoint)
         self.Kp = 0
         self.Ki = 0
         self.Kd = 0
         self.min_out = 0
         self.max_out = 1000
         self.Reset()
     def SetMin(self, min_out):
         self.min_out = min_out
     def SetMax(self, max_out):
         self.max_out = max_out
     def SetSetpoint(self, setpoint):
         self.setpoint = float(setpoint)
     def SetKp(self, Kp):
         self.Kp = float(Kp)
     def SetKi(self, Ki):
         self.Ki = float(Ki)
     def SetKd(self, Kd):
         self.Kd = float(Kd)
     def Reset(self):
         self.current_time = time.time()
         self.last_time = self.current_time
         self.last_error = 0
         self.Cp = 0
         self.Ci = 0
         self.Cd = 0
     def Update(self, value):
         print("PID input: " + str(value))
         error = self.setpoint - value
         self.current_time = time.time()
         dt = self.current_time - self.last_time
         de = error - self.last_error
         self.Cp = self.Kp * error
         self.Ci += error * dt
         self.Cd = 0
         if dt > 0:
             self.Cd = de/dt
         self.last_time = self.current_time
         self.last_error = error
         output = self.Cp + (self.Ki * self.Ci) + (self.Kd * self.Cd)
         if output > self.max_out:
             output = self.max_out
         if output < self.min_out:
             output = self.min_out
         print("PID output: " + str(output))
         return output

hydrobot.py

➞

Show inline comments

@@ @@ -3,16 +3,18 @@ import time @@
 import _thread
 import ast
 import configparser
 import datetime
 from canard import can, messaging
 from canard.hw import socketcan
 from canard.hw import cantact
 from canard.file import jsondb
 from influxdb import InfluxDBClient
 from influxdb import SeriesHelper
 from apscheduler.schedulers.background import BackgroundScheduler
 import PID
 #TODO
 #fix temperature offsets
 #database time interval logging
 #set initial state for cron timers
@@ @@ -77,12 +79,14 @@ class CanBus: @@
     def __init__(self, database):
         self.database = database
         self.dev = socketcan.SocketCanDev("can0")
         #self.dev = cantact.CantactDev("/dev/ttyACM8")
         #self.dev.set_bitrate(500000)
         parser = jsondb.JsonDbParser()
         self.msgdb = parser.parse('hydrobot_can.json')
         self.temp_msg = self.msgdb.AirSense
         self.relay_msg = self.msgdb.RelayDriveIn
@@ @@ -120,12 +124,13 @@ class CanBus: @@
             print("Send CAN message! ID: " + hex(self.relay_send_msg.id))
         if DEBUG_CAN_DETAIL:
             print(self.relay_send_msg)
         self.dev.send(self.relay_send_msg.encode())
     def set_output(self, module, output, state):
         print("Output! " + module + " " + output + " " + str(state))
         msg = self.msgdb.lookup_message(module)
         msg.lookup_signal(output).value = state
         self.dev.send(msg.encode())
         if msg.lookup_signal(output) == msg.Output1:
             MySeriesHelper(measurement='output_1', value=state)
@@ @@ -162,19 +167,54 @@ class Scheduler: @@
                         off_time = ast.literal_eval(item[1])
                     if item[0] == 'on_duration':
                         on_duration = ast.literal_eval(item[1])
                     if item[0] == 'off_duration':
                         off_duration = ast.literal_eval(item[1])
                 if trigger == 'cron':
                     self.apscheduler.add_job(self.canbus.set_output, trigger, [module, output, 1], day = on_time[0], day_of_week = on_time[1], hour = on_time[2], minute = on_time[3], second = on_time[4])
                     self.apscheduler.add_job(self.canbus.set_output, trigger, [module, output, 0], day = off_time[0], day_of_week = off_time[1], hour = off_time[2], minute = off_time[3], second = off_time[4])
                     on_job = self.apscheduler.add_job(self.canbus.set_output, trigger, [module, output, 1], day = on_time[0], day_of_week = on_time[1], hour = on_time[2], minute = on_time[3], second = on_time[4])
                     off_job = self.apscheduler.add_job(self.canbus.set_output, trigger, [module, output, 0], day = off_time[0], day_of_week = off_time[1], hour = off_time[2], minute = off_time[3], second = off_time[4])
                     #evalute the current state of the cron trigger and set output on if needed
                     if on_job.next_run_time > off_job.next_run_time:
                         self.canbus.set_output(module, output, 1)
                 if trigger == 'interval':
                     self.apscheduler.add_job(self.interval_off, trigger, [module, output, section + "_off", section + "_on", on_duration], id = section + "_off", weeks = off_duration[0], days = off_duration[1], hours = off_duration[2], minutes = off_duration[3], seconds = off_duration[4])
                     timer = self.apscheduler.add_job(self.interval_on, trigger, [module, output, section + "_off", section + "_on", off_duration], id = section + "_on", weeks = on_duration[0], days = on_duration[1], hours = on_duration[2], minutes = on_duration[3], seconds = on_duration[4])
                     timer.pause()
             if "pid" in section:
                 items = config.items(section)
                 for item in items:
                     if item[0] == 'module_out':
                         module_out = item[1]
                     if item[0] == 'output':
                         signal_out = item[1]
                     if item[0] == 'module_in':
                         module_in = item[1]
                     if item[0] == 'input':
                         signal_in = item[1]
                     if item[0] == 'kp':
                         kp = item[1]
                     if item[0] == 'ki':
                         ki = item[1]
                     if item[0] == 'kd':
                         kd = item[1]
                     if item[0] == 'rate':
                         rate = item[1]
                     if item[0] == 'setpoint':
                         setpoint = item[1]
                 pid = PID.PID(float(setpoint))
                 pid.SetKp(kp)
                 pid.SetKi(ki)
                 pid.SetKd(kd)
                 pid.Reset()
                 self.apscheduler.add_job(self.process_PID, "interval", [pid, module_out, signal_out, module_in, signal_in], seconds = int(rate))
     def interval_off(self, module, output, timer_off, timer_on, on_duration):
         self.canbus.set_output(module, output, 1)
         self.apscheduler.get_job(timer_on).reschedule("interval", weeks = on_duration[0], days = on_duration[1], hours = on_duration[2], minutes = on_duration[3], seconds = on_duration[4])
         self.apscheduler.get_job(timer_on).resume()
         self.apscheduler.get_job(timer_off).pause()
         if DEBUG_TIMER:
@@ @@ -185,12 +225,21 @@ class Scheduler: @@
         self.apscheduler.get_job(timer_off).reschedule("interval", weeks = off_duration[0], days = off_duration[1], hours = off_duration[2], minutes = off_duration[3], seconds = off_duration[4])
         self.apscheduler.get_job(timer_off).resume()
         self.apscheduler.get_job(timer_on).pause()
         if DEBUG_TIMER:
             print("Turning " + timer_off + "! " + str(datetime.datetime.now().time()))
     def process_PID(self, pid, module_out, signal_out, module_in, signal_in):
         msg = self.canbus.msgdb.lookup_message(module_in)
         input_reading = msg.lookup_signal(signal_in).value
         input_reading = 19
         pid_out = pid.Update(input_reading)
         if pid_out > 0:
             self.canbus.set_output(module_out, signal_out, 1)
             run_time = datetime.datetime.now() + datetime.timedelta(milliseconds=pid_out)
             self.apscheduler.add_job(self.canbus.set_output, "date", run_date=run_time, args=[module_out, signal_out, 0])
 def func():
     print(1)
 def main():
@@ @@ -202,12 +251,12 @@ def main(): @@
     canbus.start_receive()
     scheduler = Scheduler(canbus)
     scheduler.start()
     while True:
         time.sleep(1)
         canbus.dev.send(can.Frame(0x7FF, 8, [0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88]))
         time.sleep(0.001)
 if __name__ == "__main__":
     main()

hydrobot_can.json

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ @@
         },
+        {
         "name": "WaterSense",
         "id": "0x206",
         "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": "%"}
+                    "32": {"name": "PercentFull", "bit_length": 8, "factor": 1, "offset": 0, "unit": "%"}
+                   }
+        }
+    ]
+}

0 comments (0 inline, 0 general)