Index: HD_DialOutFlow.py =================================================================== diff -u -r09680e63c3b35ef6e8c29dee008ea3dcd96c97cc -r0fb8c7f8a8c074812ae63daa12eb8bdb90270d7a --- HD_DialOutFlow.py (.../HD_DialOutFlow.py) (revision 09680e63c3b35ef6e8c29dee008ea3dcd96c97cc) +++ HD_DialOutFlow.py (.../HD_DialOutFlow.py) (revision 0fb8c7f8a8c074812ae63daa12eb8bdb90270d7a) @@ -3,6 +3,7 @@ from DialityCoreCanProtocol import DenaliChannels import matplotlib.pyplot as plt import sys +import numpy as np class DialOutStates(Enum): @@ -110,14 +111,14 @@ payload = DenaliMessage.getPayload(message) - state_num = int.from_bytes(bytearray(payload[0:2]), byteorder=DenaliMessage.BYTE_ORDER, signed=True) + state_num = int.from_bytes(bytearray(payload[0:2]), byteorder=DenaliMessage.BYTE_ORDER, signed=True) self.DialOutBroadcast['state'] = DialOutStates(state_num).name self.DialOutBroadcast['target_volume'] = int.from_bytes(bytearray(payload[2:4]), byteorder=DenaliMessage.BYTE_ORDER, signed=True) - self.DialOutBroadcast['measured_volume'] = int.from_bytes(bytearray(payload[4:6]), - byteorder=DenaliMessage.BYTE_ORDER, signed=True) - self.DialOutBroadcast['pwm'] = int.from_bytes(bytearray(payload[6:8]), - byteorder=DenaliMessage.BYTE_ORDER, signed=True) + self.DialOutBroadcast['measured_volume'] = np.int16(int.from_bytes(bytearray(payload[4:6]), + byteorder=DenaliMessage.BYTE_ORDER, signed=True)) + self.DialOutBroadcast['pwm'] = np.int16(int.from_bytes(bytearray(payload[6:8]), + byteorder=DenaliMessage.BYTE_ORDER, signed=True)) self.BroadCastSignals['time'].append(self.time) self.BroadCastSignals['state'].append(state_num*100) @@ -138,4 +139,6 @@ plt.plot(time, state,'o', time, target, 'b-', time, volume, 'b--', time, pwm, 'g--') plt.legend(('state', 'target vol', 'act vol', 'pwm')) - plt.show() \ No newline at end of file + plt.xlabel("Seconds") + plt.title("Demo for the outlet pump control") + plt.show()