convert flag/float to int

comment unreachable code
josefe17 · Jun 11, 2023 · f0c0ad9 · f0c0ad9
1 parent ab5ae49
commit f0c0ad9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/dataeditor.py b/dataeditor.py
@@ -552,7 +552,7 @@ def init(self, req):
             item_name.setFlags(item_name.flags() ^ core.Qt.ItemIsEditable)
             item_bc.setFlags(item_bc.flags() ^ core.Qt.ItemIsEditable)
 
-            item_bc.setTextAlignment(core.Qt.AlignHCenter | core.Qt.AlignVCenter)
+            item_bc.setTextAlignment(int(core.Qt.AlignHCenter) | int(core.Qt.AlignVCenter))
 
             item_sb.valueChanged.connect(lambda state,
                                                 di=dataitem, slf=item_sb: self.start_byte_changed(di, slf))

diff --git a/elm.py b/elm.py
@@ -455,9 +455,9 @@ def expect_carriage_return(self, time_out=1):
             if (tc - tb) > time_out:
                 return self.buff + b"TIMEOUT"
 
-        self.close()
-        self.connectionStatus = False
-        return ''
+        # self.close()
+        # self.connectionStatus = False
+        # return ''
 
     def expect(self, pattern, time_out=1):
         tb = time.time()  # start time
@@ -479,9 +479,9 @@ def expect(self, pattern, time_out=1):
             if (tc - tb) > time_out:
                 return self.buff + _("TIMEOUT")
 
-        self.close()
-        self.connectionStatus = False
-        return ''
+        # self.close()
+        # self.connectionStatus = False
+        # return ''
 
     def check_elm(self):
 
@@ -1054,7 +1054,7 @@ def send_can_cfc0(self, command):
             # receiving consecutive frames
             while len(responses) < nframes:
                 # now we should send ff
-                sBS = hex(min(nframes - len(responses), 0xf))[2:]
+                sBS = hex(min(int(nframes) - len(responses), 0xf))[2:]
                 frsp = self.send_raw('300' + sBS + '00' + sBS)
 
                 # analyse response
@@ -1122,7 +1122,6 @@ def send_raw(self, command, expect='>'):
             self.buff = self.port.expect(expect, self.portTimeout)
             if not self.port.connectionStatus:
                 break
-                return ''
             tc = time.time()
             if (tc - tb) > self.portTimeout and "TIMEOUT" not in self.buff:
                 self.buff += " TIMEOUT"