HydroBot/hydrobot-software Changeset - b433eae633b8

Changeset - b433eae633b8

Parent rev.

Child rev.

[Not reviewed]

refactor

3 4 0

matthewreed - 8 years ago 2017-07-16 19:38:31

Added config sensor type and removed old files that are no longer needed.

7 files changed with 153 insertions and 151 deletions:

hydrobot.py

hydrobot_can.json

hydrobot_data_test.py

hydrobot_def.json

133

hydrobot_sensor_sim.py

module.py

protocol.py

0 comments (0 inline, 0 general)

hydrobot.py

➞

Show inline comments

@@ @@ -38,42 +38,36 @@ logger.addHandler(fh) @@
 ch = logging.StreamHandler(sys.stdout)
 ch.setLevel(logging.DEBUG)
 formatter = logging.Formatter('[%(asctime)s][%(levelname)s][%(module)s][%(funcName)s] %(message)s') #('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 ch.setFormatter(formatter)
 logger.addHandler(ch)
 logger.info('Logger initialized')
 def main(argv):
     logger.info("Starting HydroBot!")
     if len(argv) < 1:
         logger.error("Please specify a can interface")
         return 1
     database = Database(config)
     module_network = network.Network(database, config)
     module_network.start_all_interfaces()
     scheduler = Scheduler(module_network, config)
     scheduler.start()
     #module = module_network.module_list.lookup_module_by_name("RelayDrive1")
     #message = HydroBotMessage(module.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name("can_id"), 0, 0x300)
     #module.send_message(message)
     #message = HydroBotMessage(module.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name("data_rate"), 0, 10)
     #module.send_message(message)
     while True:
         time.sleep(0.1)
 def close_program(signum, frame):
     logger.info("Closing now!")
     sys.exit(0)
 signal.signal(signal.SIGINT, close_program)
 if __name__ == "__main__":
     main(sys.argv[1:])

hydrobot_can.json

➞

Show inline comments

deleted file

hydrobot_data_test.py

➞

Show inline comments

deleted file

hydrobot_def.json

➞

Show inline comments

+{
     "devices" : [
+        {
             "id" : "0x00",
             "name" : "master",
             "display" : "Master",
             "class" : "None"
         },
+        {
             "id" : "0x01",
             "name" : "airsense",
             "display" : "AirSense",
             "class" : "AirSenseModule"
             "class" : "AirSenseModule",
             "sensors" : [
+                {
                     "name" : "temp",
                     "type" : "input",
                     "sensor_num" : "0",
                     "functions" : [
                         "air_temp"
+                    ]
                 },
+                {
                     "name" : "humidity",
                     "type" : "input",
                     "sensor_num" : "0",
                     "functions" : [
                         "air_humidity"
+                    ]
                 },
+                {
                     "name" : "pressure",
                     "type" : "input",
                     "sensor_num" : "0",
                     "functions" : [
                         "air_pressure"
+                    ]
                 },
+                {
                     "name" : "light",
                     "type" : "input",
                     "sensor_num" : "0",
                     "functions" : [
                         "ambient_light"
+                    ]
+                }
+            ]
         },
+        {
             "id" : "0x02",
             "name" : "relaydrive",
             "display" : "RelayDrive",
             "class" : "RelayDriveModule",
-            "io" : [
+            "sensors" : [
+                {
                     "name" : "input_1",
                     "type" : "input",
                     "sensor_num" : "1",
                     "functions" : [
                         "digital_in",
                         "freq_in"
+                    ]
                 },
+                {
                     "name" : "input_2",
                     "type" : "input",
                     "sensor_num" : "2",
                     "functions" : [
                         "digital_in",
                         "freq_in"
+                    ]
                 },
+                {
                     "name" : "input_3",
                     "type" : "input",
                     "sensor_num" : "3",
                     "functions" : [
                         "digital_in",
@@ @@ -68,56 +106,148 @@ @@
                     "type" : "input",
                     "sensor_num" : "6",
                     "functions" : [
                         "digital_in",
                         "freq_in"
+                    ]
                 },
+                {
                     "name" : "input_7",
                     "type" : "input",
                     "sensor_num" : "7",
                     "functions" : [
                         "digital_in",
                         "freq_in"
+                    ]
                 },
+                {
                     "name" : "input_8",
                     "type" : "input",
                     "sensor_num" : "8",
                     "functions" : [
                         "digital_in",
                         "freq_in"
+                    ]
                 },
+                {
                     "name" : "output_1",
                     "type" : "output",
                     "sensor_num" : "1",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_2",
                     "type" : "output",
                     "sensor_num" : "2",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_3",
                     "type" : "output",
                     "sensor_num" : "3",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_4",
                     "type" : "output",
                     "sensor_num" : "4",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_5",
                     "type" : "output",
                     "sensor_num" : "5",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_6",
                     "type" : "output",
                     "sensor_num" : "6",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_7",
                     "type" : "output",
                     "sensor_num" : "7",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
                 },
+                {
                     "name" : "output_8",
                     "type" : "output",
                     "sensor_num" : "8",
                     "functions" : [
                         "digital_out",
                         "pwm_out"
+                    ]
+                }
+            ]
         },
+        {
             "id" : "0x03",
             "name" : "watersense",
             "display" : "WaterSense",
             "class" : "WaterSenseModule"
             "class" : "WaterSenseModule",
             "sensors" : [
+                {
                     "name" : "temp",
                     "type" : "input",
                     "sensor_num" : "0",
                     "functions" : [
                         "water_temp"
+                    ]
                 },
+                {
                     "name" : "level",
                     "type" : "input",
                     "sensor_num" : "0",
                     "functions" : [
                         "water_level"
+                    ]
+                }
+            ]
         },
+        {
             "id" : "0x04",
             "name" : "protomodule",
             "display" : "ProtoModule",
             "class" : "ProtoModule"
+        }
     ],
     "data_keys" : [
+        {
             "key" : "0x0001",
             "name" : "digital_in",
             "display" : "Digital Input",
             "units" : "bool"
         },
+        {
             "key" : "0x0002",
             "name" : "freq_in",
             "display" : "Frequency Input",
             "units" : "Hz"
         },
+        {
             "key" : "0x0003",
             "name" : "analog_in",

hydrobot_sensor_sim.py

➞

Show inline comments

deleted file

module.py

➞

Show inline comments

@@ @@ -8,90 +8,88 @@ class ModuleList(): @@
     def __init__(self, network, database, config):
         self.network = network
         self.database = database
         self.config = config
         self._modules = []
         self.load_modules()
     def load_modules(self):
         for section in self.config.sections():
             if "module" in section:
                 module_name = self.config.get(section, "name")
                 module_type = self.config.get(section, "type")
                 module_address = int(self.config.get(section, "address"), 16)
                 module_interface = self.config.get(section, "interface")
                 network_interface = self.network.get_interface(module_interface)
                 module_id = protocol.lookup_device_id_by_name(module_type)
                 new_module = self.new_module(module_id, module_address, network_interface, module_name)
                 network_interface.address_lookup[module_address] = new_module.uuid
                 network_interface.uuid_lookup[new_module.uuid] = module_address
                 new_module.config("data_rate", int(self.config.get(section, "data_rate")))
                 new_module.config("led_brightness", int(self.config.get(section, "led_brightness")))
                 new_module.config("data_rate", 0, int(self.config.get(section, "data_rate")))
                 new_module.config("led_brightness", 0, int(self.config.get(section, "led_brightness")))
                 for sensor in protocol.lookup_sensors_by_device_name(module_type):
                     for item in self.config.items(section):
                         if item[0] == sensor.get('name'):
                             new_module.config(sensor.get('type'), int(sensor.get('sensor_num')), protocol.lookup_data_key_by_name(self.config.get(section, sensor.get('name'))))
     def add_module(self, module):
         assert isinstance(module, Module), 'invalid module'
         if module in self._modules:
             raise ValueError('Module %s already in database' % module)
         else:
             self._modules.append(module)
     def remove_module(self, module):
         assert isinstance(Module, module), 'invalid module'
         try:
             self._module.remove(module)
         except ValueError:
             raise ValueError('Module %s is not in database' % module)
     def lookup_module(self, uuid):
         for module in self._modules:
             if module.uuid == uuid:
                 return module
     def lookup_module_by_name(self, name):
         for module in self._modules:
             if module.name == name:
                 return module
     def new_module(self, device_id, address, interface, name = None):
         if name == None or self.lookup_module_by_name(name) != None:
             name = self.auto_assign_name(device_id)
         device_class = eval(protocol.lookup_device_class_by_id(device_id))
         module = device_class(address, interface, name, self.database)
         #if device_type == "airsense":
             #module = AirSenseModule(address, interface, name, self.database)
         #elif device_type == "relaydrive":
             #module = RelayDriveModule(address, interface, name, self.database)
         #else:
             #module = UnknownModule(address, interface, name, self.database)
         self.add_module(module)
         return module
     def auto_assign_name(self, device_id):
         keep_going = True
         num = 1
         device_name = protocol.lookup_device_display_by_id(device_id)
         while keep_going:
             name_taken = False
             for module in self._modules:
                 if module.name == device_name + str(num):
                     name_taken = True
                     break
             if not name_taken:
                 return device_name + str(num)
             else:
                 num = num + 1
 class Module(metaclass=ABCMeta):
     def __init__(self, address, interface, name, database):
         self.logger = logging.getLogger('hydrobot')
@@ @@ -114,70 +112,70 @@ class Module(metaclass=ABCMeta): @@
     @abstractmethod
     def update(self):
         pass
     @abstractmethod
     def config(self):
         pass
 class AirSenseModule(Module):
     def __init__(self, address, interface, name, database):
         super(AirSenseModule, self).__init__(address, interface, name, database)
     def send_message(self, message):
         self.interface.network.send_message(message)
     def receive_message(self, message):
         self.logger.debug("Receive message! From: " + self.name)
         self.database.log_message(self.name, message)
     def update(self):
         pass
     def config(self, data_key, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name(data_key), 0, value)
     def config(self, data_key, sensor_num, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name(data_key), sensor_num, value)
         self.interface.send_message(message)
 class RelayDriveModule(Module):
     def __init__(self, address, interface, name, database):
         super(RelayDriveModule, self).__init__(address, interface, name, database)
     def send_message(self, message):
         self.interface.network.send_message(message)
     def receive_message(self, message):
         self.logger.debug("Receive message! From: " + self.name)
         self.database.log_message(self.name, message)
     def update(self):
         pass
     def config(self, data_key, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name(data_key), 0, value)
     def config(self, data_key, sensor_num, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name(data_key), sensor_num, value)
         self.interface.send_message(message)
     def set_output(self, output, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("set_output")), protocol.lookup_data_key_by_name("digital_out"), int(output), value)
         self.send_message(message)
 class UnknownModule(Module):
     def __init__(self, address, interface, name, database):
         super(UnknownModule, self).__init__(address, interface, name, database)
     def send_message(self, message):
         pass
     def receive_message(self, message):
         self.logger.debug("Receive message! From: " + self.name)
     def update(self):
         pass
     def config(self, data_key, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name(data_key), 0, value)
     def config(self, data_key, sensor_num, value):
         message = HydroBotMessage(self.uuid, (0x80 | protocol.lookup_command_key_by_name("config")), protocol.lookup_data_key_by_name(data_key), sensor_num, value)
         self.interface.send_message(message)

protocol.py

➞

Show inline comments

@@ @@ -50,24 +50,30 @@ def lookup_data_key_by_name(name): @@
 def lookup_data_display_by_key(key):
     data_keys = _protocol_def['data_keys']
     for data_key in data_keys:
         if data_key.get('key') == "{0:#0{1}x}".format(key, 6):
             return data_key.get('display')
 def lookup_command_name_by_key(key):
     commands = _protocol_def['command_keys']
     for command in commands:
         if command.get('key') == "{0:#0{1}x}".format(key, 6):
             return command.get('name')
 def lookup_command_key_by_name(name):
     commands = _protocol_def['command_keys']
     for command in commands:
         if command.get('name') == name:
             return int(command.get('key'), 16)
 def lookup_command_display_by_key(key):
     commands = _protocol_def['command_keys']
     for command in commands:
         if command.get('key') == "{0:#0{1}x}".format(key, 6):
             return command.get('display')
 def lookup_sensors_by_device_name(name):
     devices = _protocol_def['devices']
     for device in devices:
         if device.get('name') == name:
             return device.get('sensors')

0 comments (0 inline, 0 general)