HydroBot/hydrobot-software Changeset - daaed5044a8c

Changeset - daaed5044a8c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

matthewreed - 9 years ago 2016-07-16 15:28:53

Converted to more object oriented structure

1 file changed with 52 insertions and 33 deletions:

hydrobot.py

0 comments (0 inline, 0 general)

hydrobot.py

➞

Show inline comments

@@ @@ -12,7 +12,17 @@ config.read("config.txt") @@
 DEBUG_CAN = config.getboolean("debug", "can")
 DEBUG_CAN_DETAIL = config.getboolean("debug", "can_detail")
 def log_data(msgdb, client, message):
 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.client = InfluxDBClient(host, port, username, password, database)
     def log_data(self, msgdb, message):
     if message == msgdb.AirSense:
         json_body = [
+            {
@@ @@ -34,7 +44,7 @@ def log_data(msgdb, client, message): @@
+                }
+            }
+        ]
         client.write_points(json_body)
+            self.client.write_points(json_body)
     if message == msgdb.RelayDriveIn:
         json_body = [
+            {
@@ @@ -62,13 +72,34 @@ def log_data(msgdb, client, message): @@
+                }
+            }
+        ]
         client.write_points(json_body)
+            self.client.write_points(json_body)
 def process_can(dev, msgdb, client):
 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):
     while True:
         frame = dev.recv()
         message = msgdb.decode(frame)
             frame = self.dev.recv()
             message = self.msgdb.decode(frame)
         if message:
             for s in message._signals.values():
                 if DEBUG_CAN:
@@ @@ -76,43 +107,31 @@ def process_can(dev, msgdb, client): @@
                 if DEBUG_CAN_DETAIL:
                     print(s)
                     print(s.value)
-                log_data(msgdb, client, message)
+                    self.database.log_data(self.msgdb, message)
 def send_can(dev, msgdb, relay_send_msg):
     relay_send_msg.Nothing.value = 0
     relay_send_msg.Output1.value = 0
     relay_send_msg.Output2.value = 0
     relay_send_msg.Output3.value = 0
     relay_send_msg.Output4.value = 0
     def send_can(self):
         self.relay_send_msg.Nothing.value = 0
         self.relay_send_msg.Output1.value = 0
         self.relay_send_msg.Output2.value = 0
         self.relay_send_msg.Output3.value = 0
         self.relay_send_msg.Output4.value = 0
     if DEBUG_CAN:
         print("Send CAN message! ID: " + hex(relay_send_msg.id))
+            print("Send CAN message! ID: " + hex(self.relay_send_msg.id))
     if DEBUG_CAN_DETAIL:
         print(relay_send_msg)
     dev.send(relay_send_msg.encode())
             print(self.relay_send_msg)
         self.dev.send(self.relay_send_msg.encode())
 def main():
     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")
     client = InfluxDBClient(host, port, username, password, database)
     parser = jsondb.JsonDbParser()
     msgdb = parser.parse('hydrobot_can.json')
     temp_msg = msgdb.AirSense
     relay_msg = msgdb.RelayDriveIn
     relay_send_msg = msgdb.RelayDriveOut
     dev = socketcan.SocketCanDev("can0")
     dev.start()
     _thread.start_new_thread(process_can, (dev, msgdb, client))
     database = Database()
     canbus = CanBus(database)
     canbus.start()
     canbus.start_receive()
     while True:
-        send_can(dev, msgdb, relay_send_msg)
+        canbus.send_can()
         time.sleep(1)

0 comments (0 inline, 0 general)