use unsigned short

Author: mishakh

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("<h", ao1_voltage)
-        ao2 = pack("<h", 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("<h", v_all)
+        volt_val = pack("<H", v_all)
         frame = Message(arbitration_id= arb_id, 
                         is_extended_id = False, 
                         data = volt_val, 
@@ -230,7 +230,7 @@ def cell_voltage_setpoint(box_id, channel: int, volt_val: int) -> Message:
     """
     try: 
         arb_id = 1296 + box_id
-        source_val = pack("<h", 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

@@ -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('<h', 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('<h', 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('<h', 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)