Index: HemodialysisDevice.py =================================================================== diff -u -r64e64e45f1fe18efa87a7e4f3379db48f50d0daf -r3212865df6217fe18df05654a518d3821b340747 --- HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 64e64e45f1fe18efa87a7e4f3379db48f50d0daf) +++ HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 3212865df6217fe18df05654a518d3821b340747) @@ -157,11 +157,11 @@ rst = self.outer_instance.integer2ByteArray(reset) sta = self.outer_instance.integer2ByteArray(state) - cargo = rst + sta + payload = rst + sta message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8002, - payload=cargo) + payload=payload) print("override off button") @@ -194,11 +194,11 @@ rst = self.outer_instance.integer2ByteArray(reset) sta = self.outer_instance.integer2ByteArray(state) - cargo = rst + sta + payload = rst + sta message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8003, - payload=cargo) + payload=payload) print("override stop button") @@ -250,11 +250,11 @@ rst = self.outer_instance.integer2ByteArray(reset) sta = self.outer_instance.integer2ByteArray(state) tsk = self.outer_instance.integer2ByteArray(task) - cargo = rst + sta + tsk + payload = rst + sta + tsk message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8005, - payload=cargo) + payload=payload) print("override watchdog task check-in state") @@ -306,11 +306,11 @@ rst = self.outer_instance.integer2ByteArray(reset) sta = self.outer_instance.integer2ByteArray(state) alm = self.outer_instance.integer2ByteArray(alarm) - cargo = rst + sta + alm + payload = rst + sta + alm message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8006, - payload=cargo) + payload=payload) print("override alarm state") @@ -344,11 +344,11 @@ rst = self.outer_instance.integer2ByteArray(reset) ms = self.outer_instance.integer2ByteArray(time_ms) alm = self.outer_instance.integer2ByteArray(alarm) - cargo = rst + ms + alm + payload = rst + ms + alm message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8007, - payload=cargo) + payload=payload) print("override alarm time since activated") @@ -389,11 +389,11 @@ """ rst = self.outer_instance.integer2ByteArray(reset) pat = self.outer_instance.integer2ByteArray(pattern) - cargo = rst + pat + payload = rst + pat message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8004, - payload=cargo) + payload=payload) print("override alarm lamp pattern") @@ -477,11 +477,11 @@ rst = self.outer_instance.integer2ByteArray(reset) flo = self.outer_instance.integer2ByteArray(flow) - cargo = rst + flo + payload = rst + flo message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8008, - payload=cargo) + payload=payload) print("override blood flow set point") @@ -514,11 +514,11 @@ rst = self.outer_instance.integer2ByteArray(reset) flo = self.outer_instance.integer2ByteArray(flow) - cargo = rst + flo + payload = rst + flo message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x8009, - payload=cargo) + payload=payload) print("override measured blood flow") @@ -555,11 +555,11 @@ rst = self.outer_instance.integer2ByteArray(reset) spd = self.outer_instance.integer2ByteArray(speed) - cargo = rst + spd + payload = rst + spd message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x800A, - payload=cargo) + payload=payload) print("override measured blood pump speed") @@ -592,11 +592,11 @@ rst = self.outer_instance.integer2ByteArray(reset) cur = self.outer_instance.integer2ByteArray(curr) - cargo = rst + cur + payload = rst + cur message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x800B, - payload=cargo) + payload=payload) print("override measured blood pump motor current") @@ -629,11 +629,11 @@ rst = self.outer_instance.integer2ByteArray(reset) mis = self.outer_instance.integer2ByteArray(ms) - cargo = rst + mis + payload = rst + mis message = DenaliMessage.buildMessage(channel_id=0x400, message_id=0x800C, - payload=cargo) + payload=payload) print("override blood flow broadcast interval")