Index: DialityCoreCanProtocol.py =================================================================== diff -u -r4d47d0f6dae31a46ae5abf514f59d10a2d400dd4 -r51197ba092f454f59d3e9da522c1806020a31e6e --- DialityCoreCanProtocol.py (.../DialityCoreCanProtocol.py) (revision 4d47d0f6dae31a46ae5abf514f59d10a2d400dd4) +++ DialityCoreCanProtocol.py (.../DialityCoreCanProtocol.py) (revision 51197ba092f454f59d3e9da522c1806020a31e6e) @@ -332,7 +332,7 @@ return int.from_bytes(packet[1:3], byteorder='big') -def print_received_packet(packet, sync=False): +def test_print_received_packet(packet, sync=False): channel_id = packet[0] packet[0] = 0xA5 @@ -344,61 +344,53 @@ print(introduction, packet, " in channel: ", channel_id) -def print_to_screen(packet): +def test_print_to_screen(packet): if packet is None: print("Timeout!!!") else: - print_received_packet(packet) + test_print_received_packet(packet) -def function_for_sync(packet): - print_received_packet(packet, sync=True) +def test_function_for_sync(packet): + test_print_received_packet(packet, sync=True) if __name__ == "__main__": - the_messenger = DialityCanMessenger() - channel_id = 0x100 + test_messenger = DialityCanMessenger() + test_channel_id = 0x100 - received_channel_id = 0x20 - received_request_id = 0x100 + test_received_channel_id = 0x20 + test_received_request_id = 0x100 - the_messenger.registerSyncFunction(received_channel_id, received_request_id, function_for_sync) + test_messenger.registerSyncFunction(test_received_channel_id, test_received_request_id, test_function_for_sync) - dg_simulator_received_channel_id = 0x01 - dg_simulator_sync_req_id = 0x05 - dg_simulator_req_id = 0x03 + test_dg_simulator_received_channel_id = 0x01 + test_dg_simulator_sync_req_id = 0x05 + test_dg_simulator_req_id = 0x03 - the_messenger.registerSyncFunction(dg_simulator_received_channel_id, dg_simulator_sync_req_id, function_for_sync) + test_messenger.registerSyncFunction(test_dg_simulator_received_channel_id, test_dg_simulator_sync_req_id, test_function_for_sync) - the_messenger.start() + test_messenger.start() - packet = DialityPacket.buildPacket(0x100, [1]) - dg_packet = DialityPacket.buildPacket(dg_simulator_req_id, []) + test_packet = DialityPacket.buildPacket(0x100, [1]) + test_dg_packet = DialityPacket.buildPacket(test_dg_simulator_req_id, []) sleep(3.0) - print("Sending to board: ", packet, " in channel: ", channel_id) - response = the_messenger.send(channel_id, packet) - print_to_screen(response) + print("Sending to board: ", test_packet, " in channel: ", test_channel_id) + test_response = test_messenger.send(test_channel_id, test_packet) + test_print_to_screen(test_response) sleep(3.0) - print("Sending to board: ", packet, " in channel: ", channel_id) - response = the_messenger.send(channel_id, packet) - print_to_screen(response) + print("Sending to board: ", test_packet, " in channel: ", test_channel_id) + test_response = test_messenger.send(test_channel_id, test_packet) + test_print_to_screen(test_response) - # sleep(3.0) - print("Sending to DG simulator: ", dg_packet, " in channel", dg_simulator_received_channel_id, end=" ---> ") - response = the_messenger.send(dg_simulator_received_channel_id, dg_packet) - print_to_screen(response) - sleep(3.0) - print("Sending to DG simulator: ", dg_packet, " in channel", dg_simulator_received_channel_id, end=" ---> ") - response = the_messenger.send(dg_simulator_received_channel_id, dg_packet) - print_to_screen(response) + print("Sending to DG simulator: ", test_dg_packet, " in channel", test_dg_simulator_received_channel_id, end=" ---> ") + test_response = test_messenger.send(test_dg_simulator_received_channel_id, test_dg_packet) + test_print_to_screen(test_response) -## the_messenger.stop() - -## the_test = DialityPacket.buildPacket(request_id=8000, cargo=b'123') -## print(the_test) - -## the_test1 = DialityPacket.buildPacket(request_id=8000, cargo=b'12345') -## print(the_test1) + sleep(3.0) + print("Sending to DG simulator: ", test_dg_packet, " in channel", test_dg_simulator_received_channel_id, end=" ---> ") + test_response = test_messenger.send(test_dg_simulator_received_channel_id, test_dg_packet) + test_print_to_screen(test_response) \ No newline at end of file Fisheye: Tag 51197ba092f454f59d3e9da522c1806020a31e6e refers to a dead (removed) revision in file `DialityCoreSerialProtocol.py'. Fisheye: No comparison available. Pass `N' to diff? Index: document/Doxyfile =================================================================== diff -u -r45dc69508ab8752571ff888887a59c6d7d12ff05 -r51197ba092f454f59d3e9da522c1806020a31e6e --- document/Doxyfile (.../Doxyfile) (revision 45dc69508ab8752571ff888887a59c6d7d12ff05) +++ document/Doxyfile (.../Doxyfile) (revision 51197ba092f454f59d3e9da522c1806020a31e6e) @@ -51,7 +51,7 @@ # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = /home/fw/PycharmProjects/Dialin/document/logo.jpg +PROJECT_LOGO = /home/fw/PycharmProjects/Dialin2/document/logo.jpg # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -900,7 +900,7 @@ # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories use the pattern */test/* -EXCLUDE_SYMBOLS = the* +EXCLUDE_SYMBOLS = test_* # The EXAMPLE_PATH tag can be used to specify one or more files or directories # that contain example code fragments that are included (see the \include @@ -2499,4 +2499,4 @@ OPTIMIZE_OUTPUT_JAVA = YES EXTRACT_ALL = YES FILE_PATTERNS = "*.py" -INPUT = "/home/fw/PycharmProjects/Dialin" +INPUT = "/home/fw/PycharmProjects/Dialin2"