1.2.11 voltage byte packing fix

Author: mishakh

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "BS1200_driver"
-version = "1.2.10"
+version = "1.2.11"
 authors = [{ name = "Mikhail Kharitonov", email = "mikhail.kharitonov@bloomy.com"}]
 description= "Python interface to the Bloomy BS1200"
 readme = "README.md"

src/bs1200/can_frames.py

@@ -107,8 +107,8 @@ def ao_set_1_2(box_id: int, ao1_voltage: float, ao2_voltage: float) -> Message:
     """
     try:
         arb_id = 544 + box_id
-        ao1 = pack("<e", ao1_voltage)
-        ao2 = pack("<e", ao2_voltage)
+        ao1 = pack("<h", ao1_voltage)
+        ao2 = pack("<h", ao2_voltage)
         ao_payload = ao1 + ao2 + bytes(4) #pad payload with 4 empty bytes (as seen in CAN DB)
         frame = Message(arbitration_id = arb_id,
                         is_extended_id = False,
@@ -210,7 +210,7 @@ def cell_voltage_set_all(box_id, v_all: float) -> Message:
     """
     try: 
         arb_id = 1280 + box_id
-        volt_val = pack("<e", v_all)
+        volt_val = pack("<h", v_all)
         frame = Message(arbitration_id= arb_id, 
                         is_extended_id = False, 
                         data = volt_val, 
@@ -224,13 +224,13 @@ def cell_voltage_set_all(box_id, v_all: float) -> Message:
         return None
 
 
-def cell_voltage_setpoint(box_id, channel: int, volt_val: float) -> Message:
+def cell_voltage_setpoint(box_id, channel: int, volt_val: int) -> Message:
     """
     Generates a message to set the source current for a signle channel
     """
     try: 
         arb_id = 1296 + box_id
-        source_val = pack("<e", volt_val)
+        source_val = pack("<h", volt_val)
         frame = Message(arbitration_id= arb_id, 
                         is_extended_id = False, 
                         data = bytes([channel-1])+source_val, 

src/bs1200/driver.py

@@ -52,22 +52,22 @@ def __exit__(self, exception_type, execption_val, tb):
                     "\nCell 5:\t{:5f} A\t| Cell 6:\t{:5f} A\t| Cell 7:\t{:5f} A\t| Cell 8:\t{:5f} A"+
                     "\nCell 9:\t{:5f} A\t| Cell 10:\t{:5f} A\t| Cell 11:\t{:5f} A\t| Cell 12:\t{:5f} A")
 
-    def scale_volts(self, voltsIn: float, to_eng_units: bool) -> float:
+    def scale_volts(self, voltsIn, recieving : bool):
         """
         Helper method to scale voltage value from or to microvolts.
-        Set to_eng_units True to scale from microvolts-> volts (for recieved vals)
-        Set False to scale from volts -> microvolts (for transmitted vals)
+        (for recieved vals) Set recieving True to scale from millivolts (int) -> volts 
+         (for transmitted vals) Set False to scale from volts (float) -> millivolts (int)
         """
-        return (voltsIn*0.0001) if to_eng_units else (voltsIn/0.0001)
+        return (float(voltsIn*0.0001)) if recieving  else (int(voltsIn/0.0001))
 
-    def scale_current(self, currentIn, to_eng_units: bool):
+    def scale_current(self, currentIn, recieving: bool):
         """
         Helper method to scale current values from Amps to scaled values used by BS1200
         set to_eng_units.
         True to convert Scaled milliamps -> Amps (for recieved vals)
         set False to convert Amps -> scaled Milliamps (to transmit)
         """
-        return (((currentIn/10) - 3276.8)/1000) if to_eng_units else int((currentIn*10)*1000)
+        return (((currentIn/10) - 3276.8)/1000) if recieving else int((currentIn*10)*1000)
 
     def close(self):
         self.bus.shutdown()
@@ -192,7 +192,7 @@ def readback_cell_V(self, boxid: int, channel: int) -> float:
                     if msg.arbitration_id == readbacks[frame_i].arbitration_id:
                         rx_msg = msg
                         break
-                cell_volts = self.scale_volts(unpack('<e', rx_msg.data[cell_i*2:cell_i*2+2])[0], True)
+                cell_volts = self.scale_volts(unpack('<h', rx_msg.data[cell_i*2:cell_i*2+2])[0], True)
                 return cell_volts
             except pcan.PcanError as e:
                 print("Error getting cell "+str(channel)+" Voltage: ", e)
@@ -218,7 +218,7 @@ def readback_V_all(self, boxid) -> list:
                     break
             for channel in range(1,13):
                 frame, start, end = ((channel-1)//4, 2*((channel-1)%4), 2*((channel-1)%4)+2)
-                cell_volts[channel-1] = self.scale_volts(unpack('<e', rx_frames[frame].data[start:end])[0], True)     
+                cell_volts[channel-1] = self.scale_volts(unpack('<h', rx_frames[frame].data[start:end])[0], True)     
             return cell_volts
 
     def set_cell_I_sink(self, boxid: int, channel: int, sink_current: float) -> Message:
@@ -318,7 +318,7 @@ def readback_ai_v(self, boxid: int, channel: int) -> float:
                     if msg.arbitration_id == readbacks[frame_i].arbitration_id:
                         rx_msg = msg
                         break
-                ai_volts = self.scale_volts(unpack('<e', rx_msg.data[cell_i*2:cell_i*2+2])[0], True)
+                ai_volts = self.scale_volts(unpack('<h', rx_msg.data[cell_i*2:cell_i*2+2])[0], True)
                 return ai_volts
             except pcan.PcanError as e:
                 print("Error getting AI Channel "+str(channel)+" Voltage: ", e)

tests/bs1200_cfg.json

@@ -1,6 +1,6 @@
 {
     "Protocol" : "CAN",
-    "Updated_IP" : "192.168.1.102",
+    "IP_Address" : "192.168.1.102",
     "Ethernet_Settings" : 
     {
         "TCP_Cmd_Port"      : 12345,