Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -rcdd3a485aebd088ffcab9848e6f1d0ec50e29624 -r4ec11967a99778fb8b4cb1177d1a049c47df7823 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision cdd3a485aebd088ffcab9848e6f1d0ec50e29624) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 4ec11967a99778fb8b4cb1177d1a049c47df7823) @@ -52,8 +52,6 @@ """ HDPressureOcclusion constructor - \param outer_instance: reference to the HD (outer) class. - \returns HDPressureOcclusion object. """ self.can_interface = can_interface @@ -317,19 +315,20 @@ # TEST CODE *************************************** def test_can_message(self, seq): - zero = self.outer_instance.integer2ByteArray(0) - seq1 = self.outer_instance.integer2ByteArray(seq) - seq2 = self.outer_instance.integer2ByteArray(seq+1) - seq3 = self.outer_instance.integer2ByteArray(seq+2) - seq4 = self.outer_instance.integer2ByteArray(seq+3) - seq5 = self.outer_instance.integer2ByteArray(seq+4) + zero = integer_to_bytearray(0) + seq1 = integer_to_bytearray(seq) + seq2 = integer_to_bytearray(seq+1) + seq3 = integer_to_bytearray(seq+2) + seq4 = integer_to_bytearray(seq+3) + seq5 = integer_to_bytearray(seq+4) payload = seq1 + zero + seq2 + zero + seq3 + zero + seq4 + zero + seq5 - message = DenaliMessage.buildMessage(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, message_id=6, payload=payload) - received_message = self.outer_instance.can_interface.send(message, 0) + received_message = self.can_interface.send(message, 0) return True + Index: tests/SeansHDTestScript.py =================================================================== diff -u -rcdd3a485aebd088ffcab9848e6f1d0ec50e29624 -r4ec11967a99778fb8b4cb1177d1a049c47df7823 --- tests/SeansHDTestScript.py (.../SeansHDTestScript.py) (revision cdd3a485aebd088ffcab9848e6f1d0ec50e29624) +++ tests/SeansHDTestScript.py (.../SeansHDTestScript.py) (revision 4ec11967a99778fb8b4cb1177d1a049c47df7823) @@ -22,21 +22,19 @@ if __name__ == "__main__": # create an HD object called hd hd = HD() - sleep(2) # log into HD -# if hd.cmd_log_in_to_hd() == 0: -# exit(1) + if not hd.cmd_log_in_to_hd(): + sys.exit() # reset sequence counter x = 0 -# sleep(2) + # sleep(2) # send large CAN test messages (6 frames each) every 100ms while True: sleep(0.1) hd.pressure_occlusion.test_can_message(x) x += 6 - exit(1)