Uart bug fixes

Lisa · Lisa · commit 83791386f9cf · 2018-05-06T19:30:30.000+02:00
diff --git a/src/core.py b/src/core.py
@@ -22,7 +22,7 @@
 __email__               = "info@upyeasy.com"
 __status__              = "Beta"
 __logname__             = "uPyEasy"
-__build__               = "65"
+__build__               = "7be16ae8462bb326f9b6d1bcc07357d538124218"
 
 upyeasy_starttime       = 0
 initial_upyeasyname     = "uPyEasy"
diff --git a/src/db.py b/src/db.py
@@ -32,7 +32,7 @@ class configTable(uorm.Model):
         ("sleepenable", ""),
         ("sleeptime",  60),
         ("sleepfailure", ""),
-        ("version", int(core.__build__)),
+        ("version", core.__build__),
     ])
 
     @classmethod
diff --git a/src/hal.py b/src/hal.py
@@ -779,9 +779,6 @@ def wifiscan(self):
     def hardwaredb_init(self):
         self._log.debug("Hal: hardwaredb init")
         
-        #connect to database
-        _dbc.connect()
-
         if self._utils.get_platform() == 'linux':
             self._log.debug("Hal: hardwaredb linux")
             # create hardwareTable
@@ -804,12 +801,9 @@ def hardwaredb_init(self):
             db.hardwareTable.create(boardled1="")
         else:
             self._log.error("Hal: hardwaredb failure")
-        
-        _dbc.close()
-        
  
     def pin(self, vpin, mode = None, pull = None):
-        self._log.debug("Hal: pin = "+vpin)
+        self._log.debug("Hal: pin = {}".format(vpin))
         
         from machine import Pin
         
@@ -882,13 +876,26 @@ def pin(self, vpin, mode = None, pull = None):
             self._log.error("Hal: pin failure")
 
         return pin
+
+    def vpin2pin(self, vpin):
+        self._log.debug("Hal: vpin2pin = {}".format(vpin))
+
+        # check if id is present
+        if not vpin: 
+            self._log.error("Hal: vpin = None!")
+            return None
+        
+        # get dx map
+        dxmap = db.dxmapTable.getrow()
+
+        # received virtual pin, transforming to actual pin
+        pin = dxmap[vpin].split(';')[0]        
+        
+        return pin
         
     def dxmaps_init(self):
         self._log.debug("Hal: dxmaps_init")
         
-        #connect to database
-        _dbc.connect()
-
         if self._utils.get_platform() == 'linux':
             self._log.debug("Hal: dxmaps_init linux")
             # Create pin mapping
@@ -910,8 +917,6 @@ def dxmaps_init(self):
             db.dxmapTable.create(count=12,d0="0;GPIO0",d1="1;GPIO1",d2="2;GPIO2",d3="3;GPIO3",d4="4;GPIO4",d5="5;GPIO5",d6="9;GPIO9",d7="10;GPIO10",d8="12;GPIO12",d9="13;GPIO13",d10="14;GPIO14",d11="15;GPIO15")        
         else:
             self._log.error("Hal: dxmaps_init failure")
-        
-        _dbc.close()
 
     def board(self):
         self._log.debug("Hal: board info")
@@ -1015,7 +1020,7 @@ def get_i2c(self, id=1):
 
             # Create new or reuse existing
             if id not in self._i2c.keys():
-                self._log.debug("Hal: get i2c esp32, create i2c object with id: "+str(id))
+                self._log.debug("Hal: get i2c esp32, create i2c object with id: {}, sda={}, scl={} ".format(id,hardware["sda"],hardware["scl"]))
                 try:
                     self._i2c[id] = I2C(sda=self.pin(hardware["sda"]), scl=self.pin(hardware["scl"]))
                 except ValueError:
@@ -1155,9 +1160,11 @@ def get_uart(self, id=1):
 
             # Create new or reuse existing
             if id not in self._uart.keys():
-                self._log.debug("Hal: get uart esp32, create uart object with id: "+str(id))
+                txpin = int(self.vpin2pin(hardware["tx"]))
+                rxpin = int(self.vpin2pin(hardware["rx"]))
+                self._log.debug("Hal: get uart esp32, create uart object with id: {}, tx={}, rx={}".format(id,txpin,rxpin))
                 try:
-                    self._uart[id] = UART(id, tx=int(hardware["tx"][1:]), rx=int(hardware["rx"][1:]))
+                    self._uart[id] = UART(id, tx=txpin, rx=rxpin)
                 except ValueError:
                     self._log.error("Hal: get uart esp32, exception valueerror")
                     return None
diff --git a/src/plugin.py b/src/plugin.py
@@ -124,11 +124,13 @@ def initdevice(self, device):
                             db.deviceTable.update({"timestamp":device['timestamp']},enable="off")
                     except Exception as e:
                         self._log.error("Plugins: Init device: "+device['name']+" with plugin: "+str(device['pluginid'])+" failed, exception: "+repr(e))
-                
-                _initcomplete = True
+                    else: 
+                        _initcomplete = True
                 
         if not _initcomplete: 
             self._log.debug("Plugins: Init device {} failed!".format(device['name']))
+            # device init failed, disable!
+            db.deviceTable.update({"timestamp":device['timestamp']},enable="off")
                                      
     def loadform(self, plugindata): 
         self._log.debug("Plugins: Loadform plugin "+plugindata['name'])
