cantools 44.2.1__tar.gz → 45.0.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {cantools-44.2.1 → cantools-45.0.0}/PKG-INFO +1 -1
- {cantools-44.2.1 → cantools-45.0.0}/docs/index.rst +5 -0
- {cantools-44.2.1 → cantools-45.0.0}/pyproject.toml +1 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/kcd.py +20 -5
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/sym.py +7 -2
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/data.py +12 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/database.py +11 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/did.py +11 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/utils.py +1 -1
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/plot.py +13 -7
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/PKG-INFO +1 -1
- cantools-45.0.0/src/cantools.egg-info/scm_version.json +8 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_database.py +56 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_plot.py +74 -0
- cantools-44.2.1/src/cantools.egg-info/scm_version.json +0 -8
- {cantools-44.2.1 → cantools-45.0.0}/.gitattributes +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/.github/FUNDING.yml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/.github/dependabot.yml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/.github/release.yml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/.github/workflows/pythonpackage.yml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/.gitignore +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/.readthedocs.yml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/LICENSE +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/MANIFEST.in +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/README.rst +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/Makefile +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/conf.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/make.bat +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/monitor.png +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/plot-1.png +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/plot-2-axes.png +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/plot-2-subplots.png +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/plot-seaborn.png +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/docs/requirements.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/dbc_io/dbc_input.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/dbc_io/main.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/diagnostics/did.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/hello_world.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/motor_tester/README.rst +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/motor_tester/main.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/motor_tester/motor.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/examples/motor_tester/system.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/setup.cfg +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/__main__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/autosar/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/autosar/end_to_end.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/autosar/secoc.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/autosar/snakeauth.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/bus.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/c_source.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/database.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/bus_specifics.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/database_specifics.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/ecu_extract_loader.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/end_to_end_properties.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/message_specifics.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/node_specifics.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/secoc_properties.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/system_loader.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/utils.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/dbc_attribute.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/dbc_attribute_definition.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/dbc_environment_variable.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/dbc_loader.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/dbc_specifics.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/dbc/dbc_writer.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/utils.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/internal_database.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/message.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/node.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/signal.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/signal_group.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/conversion.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/formats/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/formats/cdd.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/diagnostics/internal_database.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/errors.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/namedsignalvalue.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/errors.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/j1939.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/logreader.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/py.typed +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/__utils__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/convert.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/decode.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/dump/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/dump/formatting.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/generate_c_source.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/list.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/subparsers/monitor.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/tester.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools/typechecking.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/SOURCES.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/dependency_links.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/entry_points.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/requires.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/scm_file_list.json +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/src/cantools.egg-info/top_level.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/__init__.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/compu_method_no_category.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/ecu-extract-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-3.2.3.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-DAI-3.1.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-bad-root-tag-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-dangling-reference-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-float-limits-missing-compu-scale-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-float-values.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-illegal-namespace-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-illegal-root-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-illegal-version-4.2.2.1.0.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-missing-denominator-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-missing-factor-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/arxml/system-missing-rational-4.2.arxml +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/abs.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/abs.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/camel_case_empty.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/camel_case_empty.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/choices.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/choices.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/floating_point.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/floating_point.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/floating_point_bit_fields.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/floating_point_bit_fields.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/floating_point_use_float.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/floating_point_use_float.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/letter_terminated_can_id_6_0.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/letter_terminated_can_id_6_0.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/min_max_only_6_0.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/min_max_only_6_0.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_bit_fields.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_bit_fields.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_no_floating_point_numbers.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_no_floating_point_numbers.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_sender_node.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_sender_node.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_sender_node_no_floating_point_numbers.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_sender_node_no_floating_point_numbers.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_use_round.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/motohawk_use_round.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex_2.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex_2.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex_2_fuzzer.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex_2_fuzzer.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/multiplex_2_fuzzer.mk +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/my_database_name.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/my_database_name.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/no_signals.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/no_signals.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator_no_floating_point_numbers.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator_no_floating_point_numbers.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator_sender_node.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator_sender_node.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator_sender_node_no_floating_point_numbers.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/open_actuator_sender_node_no_floating_point_numbers.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/padding_bit_order.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/padding_bit_order.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/signed.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/signed.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/signed_bit_fields.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/signed_bit_fields.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/vehicle.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/c_source/vehicle.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/cdd/example-diddatarefs.cdd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/cdd/example.cdd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/cdd/invalid-bo-example.cdd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/cdd/le-example.cdd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/BU_BO_REL_.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/BU_BO_REL_Message.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/BU_EV_REL_.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/CamelCaseEmpty.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/abs.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/add_two_dbc_files_1.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/add_two_dbc_files_2.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/attribute_Event.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/attributes.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/bad_message_length.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/big_numbers.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/bus_comment.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/bus_comment_bare.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/bus_comment_bare_out.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/choices.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/choices_issue_with_name.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/comments_hex_and_motorola_converted_from_sym.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/cp1252.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/dump_signal_choices.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/emc32.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/empty_choice.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/empty_ns.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/environment_variable_data.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/environment_variable_multiple_access_nodes.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/fd_test.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/fd_test_int.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/floating_point.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/floating_point_use_float.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/foobar.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/is_in_phys_range.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_163_newline.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_168.DBC +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_184_extended_mux_cascaded.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_184_extended_mux_cascaded_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_184_extended_mux_independent_multiplexors.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_184_extended_mux_independent_multiplexors_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_184_extended_mux_multiple_values.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_184_extended_mux_multiple_values_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_199.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_199_extended.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_207_sig_plus.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_228.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_62.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_63.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_636_negative_scaling.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_725.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/issue_784.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/j1939.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/long_names.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/long_names_multiple_relations.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/long_names_multiple_relations_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/message-dlc-zero.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/mod_name_len_dest.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/mod_name_len_src.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/motohawk.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/motohawk_fd.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/motohawk_use_round.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/motohawk_with_comments.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/msxii_system_can.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiple_senders.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiplex.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiplex_2.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiplex_2_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiplex_choices.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiplex_choices_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/multiplex_dumped.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/no_sender.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/no_signals.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/open_actuator.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/padding_bit_order.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/relation_attributes.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/sig_groups.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/sig_groups_del.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/sig_groups_out.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/signed.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/socialledge-written-by-cantools-with-default-sort-signals.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/socialledge-written-by-cantools-with-sort-signals-by-name.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/socialledge-written-by-cantools.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/socialledge.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/test_extended_id_dump.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/test_multiplex_dump.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/timing.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/val_table.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/variable_dlc.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/vehicle.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/dbc/vframeformat_int.dbc +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/auto_message_length.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/bad_message_length.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/dump.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/empty.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/message_layout.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/signal_range.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/tester.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/the_homer.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/kcd/vehicle.kcd +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/bad_message_length.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/big-endian.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/comments_hex_and_motorola.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/empty-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/empty-enum-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/issue_138.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/jopp-5.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/jopp-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/letter-terminated-can-id-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/min-max-only-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/multiplexed_variables.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/receive-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/send-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/sendreceive-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/signal-types-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/special-chars-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/test_extended_id_dump.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/test_multiline_enum.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/test_multiplex_dump.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/type-extended-cycle-dash-p.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/files/sym/variables-color-enum-6.0.sym +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_autosar.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/.gitignore +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/CMakeLists.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_basic.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_basic.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_bit_fields.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_bit_fields.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_framework/CMakeLists.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_framework/LICENSE.txt +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_framework/unity.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_framework/unity.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_framework/unity_internals.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_initial_values.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_initial_values.h +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_c_code/test_runner.c +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_command_line.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_conversion.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_convert.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_database_utils.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_diagnostics_database.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_dump.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_list.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_logreader.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_monitor.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_plot_unittests.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_plot_without_mock.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tests/test_tester.py +0 -0
- {cantools-44.2.1 → cantools-45.0.0}/tox.ini +0 -0
|
@@ -78,6 +78,11 @@ Functions and classes
|
|
|
78
78
|
.. autoclass:: cantools.database.conversion.BaseConversion
|
|
79
79
|
:members:
|
|
80
80
|
|
|
81
|
+
.. deprecated::
|
|
82
|
+
The diagnostics functionality (CDD format, ``cantools.database.diagnostics``) is
|
|
83
|
+
deprecated and will be removed in a future version.
|
|
84
|
+
Export your CDD data to PDX/ODX format and use `odxtools <https://github.com/mercedes-benz/odxtools>`_ instead.
|
|
85
|
+
|
|
81
86
|
.. autoclass:: cantools.database.diagnostics.Database
|
|
82
87
|
:members:
|
|
83
88
|
|
|
@@ -425,10 +425,25 @@ def _dump_version(version, parent):
|
|
|
425
425
|
SubElement(parent, 'Document', version=version)
|
|
426
426
|
|
|
427
427
|
|
|
428
|
-
def _dump_nodes(nodes, node_refs, parent):
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
428
|
+
def _dump_nodes(nodes, messages, node_refs, parent):
|
|
429
|
+
# Senders and receivers need not be in the node list (a SYM file
|
|
430
|
+
# has none), but KCD refers to nodes by id, so declare them too.
|
|
431
|
+
# Both are lists, so the node ids follow the order in the database
|
|
432
|
+
# and do not change from run to run.
|
|
433
|
+
declared = [node.name for node in nodes]
|
|
434
|
+
undeclared = []
|
|
435
|
+
|
|
436
|
+
for message in messages:
|
|
437
|
+
for name in [*message.senders,
|
|
438
|
+
*(receiver
|
|
439
|
+
for signal in message.signals
|
|
440
|
+
for receiver in signal.receivers)]:
|
|
441
|
+
if name not in declared and name not in undeclared:
|
|
442
|
+
undeclared.append(name)
|
|
443
|
+
|
|
444
|
+
for node_id, name in enumerate(declared + undeclared, 1):
|
|
445
|
+
SubElement(parent, 'Node', id=str(node_id), name=name)
|
|
446
|
+
node_refs[name] = node_id
|
|
432
447
|
|
|
433
448
|
|
|
434
449
|
def _dump_messages(messages, node_refs, parent, sort_signals):
|
|
@@ -458,7 +473,7 @@ def dump_string(database: InternalDatabase, *, sort_signals:type_sort_signals=SO
|
|
|
458
473
|
database.version = ''
|
|
459
474
|
|
|
460
475
|
_dump_version(database.version, network_definition)
|
|
461
|
-
_dump_nodes(database.nodes, node_refs, network_definition)
|
|
476
|
+
_dump_nodes(database.nodes, database.messages, node_refs, network_definition)
|
|
462
477
|
_dump_messages(database.messages, node_refs, network_definition, sort_signals)
|
|
463
478
|
|
|
464
479
|
_indent_xml(network_definition, ' ')
|
|
@@ -826,6 +826,11 @@ def _get_signal_type(signal: Signal) -> str:
|
|
|
826
826
|
|
|
827
827
|
return 'unsigned'
|
|
828
828
|
|
|
829
|
+
def _dump_comment(comment: str) -> str:
|
|
830
|
+
# A SYM comment ends at the end of its line, so line breaks in a
|
|
831
|
+
# comment (allowed in DBC, KCD and ARXML) are written as spaces.
|
|
832
|
+
return ' // ' + re.sub(r'\r\n?|\n', ' ', comment)
|
|
833
|
+
|
|
829
834
|
def _dump_signal(signal: Signal) -> str:
|
|
830
835
|
# Example:
|
|
831
836
|
# Sig=alt_current unsigned 16 /u:A /f:0.05 /o:-1600 /max:1676.75 /d:0 // Alternator Current
|
|
@@ -847,7 +852,7 @@ def _dump_signal(signal: Signal) -> str:
|
|
|
847
852
|
if signal.choices:
|
|
848
853
|
signal_str += f' /e:{_get_enum_name(signal)}'
|
|
849
854
|
if signal.comment:
|
|
850
|
-
signal_str +=
|
|
855
|
+
signal_str += _dump_comment(signal.comment)
|
|
851
856
|
|
|
852
857
|
return signal_str
|
|
853
858
|
|
|
@@ -892,7 +897,7 @@ def _dump_message(message: Message, signals: list[Signal], min_frame_id: int | N
|
|
|
892
897
|
frame_id = f'ID={min_frame_id:03X}h'
|
|
893
898
|
frame_id_newline = '\n'
|
|
894
899
|
if message.comment is not None:
|
|
895
|
-
comment =
|
|
900
|
+
comment = _dump_comment(message.comment)
|
|
896
901
|
frame_id_range = ''
|
|
897
902
|
if max_frame_id is not None:
|
|
898
903
|
if message.is_extended_frame:
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# DID data.
|
|
2
2
|
|
|
3
|
+
import warnings
|
|
4
|
+
|
|
3
5
|
from cantools.database.conversion import BaseConversion, IdentityConversion
|
|
4
6
|
from cantools.database.namedsignalvalue import NamedSignalValue
|
|
5
7
|
from cantools.typechecking import ByteOrder, Choices, SignalValueType
|
|
@@ -9,6 +11,10 @@ class Data:
|
|
|
9
11
|
"""A data data with position, size, unit and other information. A data
|
|
10
12
|
is part of a DID.
|
|
11
13
|
|
|
14
|
+
.. deprecated::
|
|
15
|
+
The diagnostics functionality is deprecated and will be removed in a future version.
|
|
16
|
+
Export your CDD data to PDX/ODX format and use `odxtools <https://github.com/mercedes-benz/odxtools>`_ instead.
|
|
17
|
+
|
|
12
18
|
"""
|
|
13
19
|
|
|
14
20
|
def __init__(self,
|
|
@@ -21,6 +27,12 @@ class Data:
|
|
|
21
27
|
maximum: float | None = None,
|
|
22
28
|
unit: str | None = None,
|
|
23
29
|
) -> None:
|
|
30
|
+
warnings.warn(
|
|
31
|
+
"cantools.database.diagnostics.Data is deprecated and will be removed in a future version. "
|
|
32
|
+
"Export your CDD data to PDX/ODX format and use odxtools (https://github.com/mercedes-benz/odxtools) instead.",
|
|
33
|
+
DeprecationWarning,
|
|
34
|
+
stacklevel=2,
|
|
35
|
+
)
|
|
24
36
|
#: The data name as a string.
|
|
25
37
|
self.name: str = name
|
|
26
38
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import logging
|
|
2
|
+
import warnings
|
|
2
3
|
from typing import TextIO
|
|
3
4
|
|
|
4
5
|
from cantools.database.diagnostics.did import Did
|
|
@@ -17,9 +18,19 @@ class Database:
|
|
|
17
18
|
:func:`load_string()<cantools.database.load_string()>` returns
|
|
18
19
|
instances of this class.
|
|
19
20
|
|
|
21
|
+
.. deprecated::
|
|
22
|
+
The diagnostics functionality is deprecated and will be removed in a future version.
|
|
23
|
+
Export your CDD data to PDX/ODX format and use `odxtools <https://github.com/mercedes-benz/odxtools>`_ instead.
|
|
24
|
+
|
|
20
25
|
"""
|
|
21
26
|
|
|
22
27
|
def __init__(self, dids: list[Did] | None = None):
|
|
28
|
+
warnings.warn(
|
|
29
|
+
"cantools.database.diagnostics.Database is deprecated and will be removed in a future version. "
|
|
30
|
+
"Export your CDD data to PDX/ODX format and use odxtools (https://github.com/mercedes-benz/odxtools) instead.",
|
|
31
|
+
DeprecationWarning,
|
|
32
|
+
stacklevel=2,
|
|
33
|
+
)
|
|
23
34
|
self._name_to_did: dict[str, Did] = {}
|
|
24
35
|
self._identifier_to_did: dict[int, Did] = {}
|
|
25
36
|
self._dids = dids or []
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
# A DID.
|
|
2
2
|
|
|
3
3
|
import binascii
|
|
4
|
+
import warnings
|
|
4
5
|
from typing import TypedDict
|
|
5
6
|
|
|
6
7
|
from cantools.database.diagnostics.data import Data
|
|
@@ -17,6 +18,10 @@ class _Codec(TypedDict):
|
|
|
17
18
|
class Did:
|
|
18
19
|
"""A DID with identifier and other information.
|
|
19
20
|
|
|
21
|
+
.. deprecated::
|
|
22
|
+
The diagnostics functionality is deprecated and will be removed in a future version.
|
|
23
|
+
Export your CDD data to PDX/ODX format and use `odxtools <https://github.com/mercedes-benz/odxtools>`_ instead.
|
|
24
|
+
|
|
20
25
|
"""
|
|
21
26
|
|
|
22
27
|
def __init__(self,
|
|
@@ -24,6 +29,12 @@ class Did:
|
|
|
24
29
|
name: str,
|
|
25
30
|
length: int,
|
|
26
31
|
datas: list[Data]) -> None:
|
|
32
|
+
warnings.warn(
|
|
33
|
+
"cantools.database.diagnostics.Did is deprecated and will be removed in a future version. "
|
|
34
|
+
"Export your CDD data to PDX/ODX format and use odxtools (https://github.com/mercedes-benz/odxtools) instead.",
|
|
35
|
+
DeprecationWarning,
|
|
36
|
+
stacklevel=2,
|
|
37
|
+
)
|
|
27
38
|
self._identifier = identifier
|
|
28
39
|
self._name = name
|
|
29
40
|
self._length = length
|
|
@@ -369,7 +369,7 @@ def prune_signal_choices(signal: "Signal") -> None:
|
|
|
369
369
|
# that ends with an underscore from all of them provided that the
|
|
370
370
|
# names of the choices stay valid identifiers
|
|
371
371
|
choice_values = [ str(x) for x in signal.choices.values() ]
|
|
372
|
-
full_prefix = os.path.commonprefix(choice_values)
|
|
372
|
+
full_prefix = os.path.commonprefix(choice_values) # noqa: RUF071
|
|
373
373
|
i = full_prefix.rfind('_')
|
|
374
374
|
|
|
375
375
|
if i >= 0:
|
|
@@ -65,6 +65,7 @@ except ImportError:
|
|
|
65
65
|
|
|
66
66
|
from .. import database, errors
|
|
67
67
|
from ..database.namedsignalvalue import NamedSignalValue
|
|
68
|
+
from ..logreader import CAN_ERR_FLAG
|
|
68
69
|
|
|
69
70
|
PYPLOT_BASE_COLORS = "bgrcmykwC"
|
|
70
71
|
|
|
@@ -86,12 +87,14 @@ if plt is not None:
|
|
|
86
87
|
plt.rcParams["date.autoformatter.microsecond"] = "%H:%M:%S.%f"
|
|
87
88
|
|
|
88
89
|
|
|
89
|
-
# Matches 'candump' output, i.e. "vcan0 1F0 [8] 00 00 00 00 00 00 1B C1"
|
|
90
|
-
|
|
90
|
+
# Matches 'candump' output, i.e. "vcan0 1F0 [8] 00 00 00 00 00 00 1B C1",
|
|
91
|
+
# with the ASCII column of 'candump -a' and the ERRORFRAME marker of 'candump -e'.
|
|
92
|
+
RE_CANDUMP = re.compile(r"^\s*(?:\((?P<time>.*?)\))?\s*\S+\s+(?P<frameid>[0-9A-F]+)\s*\[\d+\]\s*(?:remote request|(?P<data>(?:[0-9A-F]{2}(?: *[0-9A-F]{2})*)?))\s*(?:'.*'\s*)?(?:ERRORFRAME)?(?:::.*)?$")
|
|
91
93
|
# Matches 'cantools decode' output, i.e. ")" or " voltage: 0 V,".
|
|
92
94
|
RE_DECODE = re.compile(r'\w+\(|\s+\w+:\s+[0-9.+-]+(\s+.*)?,?|\)')
|
|
93
|
-
# Matches 'candump -l' (or -L) output, i.e. "(1594172461.968006) vcan0 1F0#0000000000001BC1"
|
|
94
|
-
|
|
95
|
+
# Matches 'candump -l' (or -L) output, i.e. "(1594172461.968006) vcan0 1F0#0000000000001BC1",
|
|
96
|
+
# CAN FD frames "(1594172461.968006) vcan0 1F0##00000000000001BC1" and remote frames "1F0#R".
|
|
97
|
+
RE_CANDUMP_LOG = re.compile(r'^\((?P<time>\d+\.\d+)\)\s+\S+\s+(?P<frameid>[\dA-F]+)#(?:#[\dA-F])?(?:R[0-8]?|(?P<data>(?:[\dA-Fa-f]{2})*))(\s+[RT])?$')
|
|
95
98
|
|
|
96
99
|
|
|
97
100
|
def _mo_unpack(mo):
|
|
@@ -101,9 +104,8 @@ def _mo_unpack(mo):
|
|
|
101
104
|
frame_id = '0' * (8 - len(frame_id)) + frame_id
|
|
102
105
|
frame_id = binascii.unhexlify(frame_id)
|
|
103
106
|
frame_id = struct.unpack('>I', frame_id)[0]
|
|
104
|
-
data
|
|
105
|
-
data = data.replace(' ', '')
|
|
106
|
-
data = binascii.unhexlify(data)
|
|
107
|
+
# A remote frame leaves the data group unmatched and carries no payload.
|
|
108
|
+
data = binascii.unhexlify((mo.group('data') or '').replace(' ', ''))
|
|
107
109
|
|
|
108
110
|
return timestamp, frame_id, data
|
|
109
111
|
|
|
@@ -391,6 +393,10 @@ def _do_decode(args):
|
|
|
391
393
|
continue
|
|
392
394
|
elif args.stop is not None and timestamp > args.stop:
|
|
393
395
|
break
|
|
396
|
+
if frame_id & CAN_ERR_FLAG:
|
|
397
|
+
# Error frames carry no signals. Skip them, as logreader does.
|
|
398
|
+
line_number += 1
|
|
399
|
+
continue
|
|
394
400
|
plotter.add_msg(timestamp, frame_id, data)
|
|
395
401
|
elif RE_DECODE.match(line):
|
|
396
402
|
continue
|
|
@@ -2105,6 +2105,33 @@ class CanToolsDatabaseTest(unittest.TestCase):
|
|
|
2105
2105
|
self.assertEqual(by_name['HasSignals'], ['Speed'])
|
|
2106
2106
|
self.assertEqual(by_name['NoSignals'], [])
|
|
2107
2107
|
|
|
2108
|
+
def test_as_sym_string_multiline_comments(self):
|
|
2109
|
+
# A SYM comment runs to the end of its line. Line breaks in a
|
|
2110
|
+
# message or signal comment must not end it early; the text after
|
|
2111
|
+
# the break would be read as SYM syntax and the file not load.
|
|
2112
|
+
signal = Signal(name='Speed', start=0, length=8,
|
|
2113
|
+
comment='line one\nline two\r\nline three\rend')
|
|
2114
|
+
message = Message(frame_id=0x100, name='Msg', length=8,
|
|
2115
|
+
signals=[signal], comment='first\nsecond')
|
|
2116
|
+
db = cantools.database.Database(messages=[message])
|
|
2117
|
+
|
|
2118
|
+
reloaded = cantools.database.load_string(db.as_sym_string(), 'sym')
|
|
2119
|
+
reloaded_message = reloaded.get_message_by_name('Msg')
|
|
2120
|
+
self.assertEqual(reloaded_message.comment, 'first second')
|
|
2121
|
+
self.assertEqual(reloaded_message.get_signal_by_name('Speed').comment,
|
|
2122
|
+
'line one line two line three end')
|
|
2123
|
+
|
|
2124
|
+
def test_as_sym_string_dbc_multiline_comment(self):
|
|
2125
|
+
db = cantools.database.load_file('tests/files/dbc/abs.dbc')
|
|
2126
|
+
|
|
2127
|
+
reloaded = cantools.database.load_string(db.as_sym_string(), 'sym')
|
|
2128
|
+
diag_fl = reloaded.get_message_by_name(
|
|
2129
|
+
'BREMSE_53').get_signal_by_name('Diag_FL')
|
|
2130
|
+
self.assertEqual(
|
|
2131
|
+
diag_fl.comment,
|
|
2132
|
+
'Value to show faults related to the wheel speed sensor. '
|
|
2133
|
+
'0 - Signal ok, 1 - Wiring related fault, 2 - Signal related fault')
|
|
2134
|
+
|
|
2108
2135
|
def test_signal_types_6_0_sym(self):
|
|
2109
2136
|
db = cantools.database.load_file('tests/files/sym/signal-types-6.0.sym')
|
|
2110
2137
|
|
|
@@ -4080,6 +4107,35 @@ class CanToolsDatabaseTest(unittest.TestCase):
|
|
|
4080
4107
|
with open(filename) as fin:
|
|
4081
4108
|
self.assertEqual(db.as_kcd_string(), fin.read())
|
|
4082
4109
|
|
|
4110
|
+
def test_as_kcd_string_undeclared_nodes(self):
|
|
4111
|
+
"""Senders and receivers that are not in the node list are
|
|
4112
|
+
declared as nodes in the KCD dump.
|
|
4113
|
+
|
|
4114
|
+
"""
|
|
4115
|
+
|
|
4116
|
+
db = cantools.database.load_string(
|
|
4117
|
+
'VERSION ""\n'
|
|
4118
|
+
'BU_: Declared\n'
|
|
4119
|
+
'BO_ 1 M: 8 Undeclared\n'
|
|
4120
|
+
' SG_ S : 0|8@1+ (1,0) [0|0] "" Declared,OtherRx\n',
|
|
4121
|
+
database_format='dbc')
|
|
4122
|
+
|
|
4123
|
+
db = cantools.database.load_string(db.as_kcd_string(),
|
|
4124
|
+
database_format='kcd')
|
|
4125
|
+
self.assertEqual([node.name for node in db.nodes],
|
|
4126
|
+
['Declared', 'Undeclared', 'OtherRx'])
|
|
4127
|
+
message = db.get_message_by_name('M')
|
|
4128
|
+
self.assertEqual(message.senders, ['Undeclared'])
|
|
4129
|
+
self.assertEqual(message.get_signal_by_name('S').receivers,
|
|
4130
|
+
['Declared', 'OtherRx'])
|
|
4131
|
+
|
|
4132
|
+
# SYM files have no node list.
|
|
4133
|
+
sym = cantools.database.load_file('tests/files/sym/big-endian.sym')
|
|
4134
|
+
kcd = cantools.database.load_string(sym.as_kcd_string(),
|
|
4135
|
+
database_format='kcd')
|
|
4136
|
+
self.assertEqual(kcd.get_message_by_name('Msg1').senders,
|
|
4137
|
+
['ECU', 'Peripherals'])
|
|
4138
|
+
|
|
4083
4139
|
def test_issue_62(self):
|
|
4084
4140
|
"""Test issue 62.
|
|
4085
4141
|
|
|
@@ -430,6 +430,80 @@ BREMSE_33(
|
|
|
430
430
|
self.assertListEqual(plt.mock_calls, expected_calls)
|
|
431
431
|
|
|
432
432
|
|
|
433
|
+
def test_plot_l_fd_remote_and_error_frames(self):
|
|
434
|
+
argv = ['cantools', 'plot', self.DBC_FILE]
|
|
435
|
+
input_data = """\
|
|
436
|
+
(1609395080.446193) vcan0 00000343#B504CB04AE04BC04
|
|
437
|
+
(1609395081.447989) vcan0 00000343##1650457045E047404
|
|
438
|
+
(1609395082.449807) vcan0 20000080#0000000000000000
|
|
439
|
+
(1609395083.451020) vcan0 00000343#R
|
|
440
|
+
(1609395084.452815) vcan0 00000343#6903850369037703
|
|
441
|
+
"""
|
|
442
|
+
plotted_lines = "\n".join(input_data.splitlines()[i] for i in (0, 1, 4))
|
|
443
|
+
|
|
444
|
+
xs = self.parse_time(plotted_lines, self.parse_absolute_seconds)
|
|
445
|
+
ys_whlspeed_fl = [18.828125, 17.578125, 13.640625]
|
|
446
|
+
ys_whlspeed_fr = [19.171875, 17.359375, 14.078125]
|
|
447
|
+
ys_whlspeed_rl = [18.71875, 17.46875, 13.640625]
|
|
448
|
+
ys_whlspeed_rr = [18.9375, 17.8125, 13.859375]
|
|
449
|
+
|
|
450
|
+
expected_calls = [
|
|
451
|
+
mock.call.subplot(1,1,1, sharex=None),
|
|
452
|
+
mock.call.subplot().plot(xs, ys_whlspeed_fl, '', label='BREMSE_33.whlspeed_FL [m/s]'),
|
|
453
|
+
mock.call.subplot().plot(xs, ys_whlspeed_fr, '', label='BREMSE_33.whlspeed_FR [m/s]'),
|
|
454
|
+
mock.call.subplot().plot(xs, ys_whlspeed_rl, '', label='BREMSE_33.whlspeed_RL [m/s]'),
|
|
455
|
+
mock.call.subplot().plot(xs, ys_whlspeed_rr, '', label='BREMSE_33.whlspeed_RR [m/s]'),
|
|
456
|
+
mock.call.subplot().set_xlabel(self.XLABEL_l % self.parse_start_time(xs[0])),
|
|
457
|
+
mock.call.show(),
|
|
458
|
+
]
|
|
459
|
+
# The remote frame has no payload and is reported like in 'cantools decode';
|
|
460
|
+
# the error frame is skipped.
|
|
461
|
+
expected_output = "Failed to parse data of frame id 835 (0x343): Wrong data size: 0 instead of 8 bytes\n"
|
|
462
|
+
|
|
463
|
+
stdout = StringIO()
|
|
464
|
+
with mock.patch('sys.stdin', StringIO(input_data)), mock.patch('sys.stdout', stdout), mock.patch('sys.argv', argv), PyplotMock() as plt:
|
|
465
|
+
cantools._main()
|
|
466
|
+
self.assertListEqual(plt.mock_calls, expected_calls)
|
|
467
|
+
self.assertEqual(stdout.getvalue(), expected_output)
|
|
468
|
+
|
|
469
|
+
def test_plot_candump_ascii_and_error_frames(self):
|
|
470
|
+
argv = ['cantools', 'plot', self.DBC_FILE]
|
|
471
|
+
input_data = """\
|
|
472
|
+
(000.000000) vcan0 00000343 [8] B5 04 CB 04 AE 04 BC 04 '........'
|
|
473
|
+
(000.500000) vcan0 20000080 [8] 00 00 00 00 00 00 00 00 ERRORFRAME
|
|
474
|
+
(001.001787) vcan0 00000343 [8] 65 04 57 04 5E 04 74 04 'e.W.^.t.'
|
|
475
|
+
"""
|
|
476
|
+
plotted_lines = "\n".join(input_data.splitlines()[i] for i in (0, 2))
|
|
477
|
+
|
|
478
|
+
xs = self.parse_time(plotted_lines, self.parse_seconds)
|
|
479
|
+
ys_whlspeed_fl = [18.828125, 17.578125]
|
|
480
|
+
ys_whlspeed_fr = [19.171875, 17.359375]
|
|
481
|
+
ys_whlspeed_rl = [18.71875, 17.46875]
|
|
482
|
+
ys_whlspeed_rr = [18.9375, 17.8125]
|
|
483
|
+
|
|
484
|
+
plt = PyplotMock()
|
|
485
|
+
subplots = [SubplotMock()]
|
|
486
|
+
plt.subplot.side_effect = subplots
|
|
487
|
+
expected_calls = [
|
|
488
|
+
mock.call.subplot(1,1,1, sharex=None),
|
|
489
|
+
mock.call.show(),
|
|
490
|
+
]
|
|
491
|
+
expected_subplot_calls = [
|
|
492
|
+
mock.call.plot(xs, ys_whlspeed_fl, '', label='BREMSE_33.whlspeed_FL [m/s]'),
|
|
493
|
+
mock.call.plot(xs, ys_whlspeed_fr, '', label='BREMSE_33.whlspeed_FR [m/s]'),
|
|
494
|
+
mock.call.plot(xs, ys_whlspeed_rl, '', label='BREMSE_33.whlspeed_RL [m/s]'),
|
|
495
|
+
mock.call.plot(xs, ys_whlspeed_rr, '', label='BREMSE_33.whlspeed_RR [m/s]'),
|
|
496
|
+
mock.call.set_xlabel(self.XLABEL_tz),
|
|
497
|
+
]
|
|
498
|
+
|
|
499
|
+
stdout = StringIO()
|
|
500
|
+
with mock.patch('sys.stdin', StringIO(input_data)), mock.patch('sys.stdout', stdout), mock.patch('sys.argv', argv), plt:
|
|
501
|
+
cantools._main()
|
|
502
|
+
self.assertListEqual(plt.mock_calls, expected_calls)
|
|
503
|
+
self.assertListEqual(subplots[0].mock_calls, expected_subplot_calls)
|
|
504
|
+
self.assertEqual(stdout.getvalue(), "")
|
|
505
|
+
|
|
506
|
+
|
|
433
507
|
# ------- test signal command line argument(s) -------
|
|
434
508
|
|
|
435
509
|
def test_wildcards_caseinsensitive(self):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/bus_specifics.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/database_specifics.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/ecu_extract_loader.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/end_to_end_properties.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/message_specifics.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/node_specifics.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/secoc_properties.py
RENAMED
|
File without changes
|
{cantools-44.2.1 → cantools-45.0.0}/src/cantools/database/can/formats/arxml/system_loader.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|