From 60d8093231e1832ffd96ab2dae7cf51b8da39459 Mon Sep 17 00:00:00 2001 From: YLFeng Date: Fri, 12 Jan 2024 19:58:29 +0800 Subject: [PATCH] chore: Fix dependencies and README --- install/.colcon_install_layout | 1 - log/COLCON_IGNORE | 0 log/latest | 1 - log/latest_test | 1 - log/test_2024-01-12_19-14-28/events.log | 6 --- log/test_2024-01-12_19-14-28/logger_all.log | 44 ------------------- .../rmoss_daheng_driver/command.log | 0 .../rmoss_daheng_driver/stderr.log | 10 ----- .../rmoss_daheng_driver/stdout.log | 0 .../rmoss_daheng_driver/stdout_stderr.log | 10 ----- .../rmoss_daheng_driver/streams.log | 10 ----- src/cam_driver/daheng_cam.cpp | 2 +- 12 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 install/.colcon_install_layout delete mode 100644 log/COLCON_IGNORE delete mode 120000 log/latest delete mode 120000 log/latest_test delete mode 100644 log/test_2024-01-12_19-14-28/events.log delete mode 100644 log/test_2024-01-12_19-14-28/logger_all.log delete mode 100644 log/test_2024-01-12_19-14-28/rmoss_daheng_driver/command.log delete mode 100644 log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stderr.log delete mode 100644 log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout.log delete mode 100644 log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout_stderr.log delete mode 100644 log/test_2024-01-12_19-14-28/rmoss_daheng_driver/streams.log diff --git a/install/.colcon_install_layout b/install/.colcon_install_layout deleted file mode 100644 index 3aad533..0000000 --- a/install/.colcon_install_layout +++ /dev/null @@ -1 +0,0 @@ -isolated diff --git a/log/COLCON_IGNORE b/log/COLCON_IGNORE deleted file mode 100644 index e69de29..0000000 diff --git a/log/latest b/log/latest deleted file mode 120000 index 1626647..0000000 --- a/log/latest +++ /dev/null @@ -1 +0,0 @@ -latest_test \ No newline at end of file diff --git a/log/latest_test b/log/latest_test deleted file mode 120000 index 2d93938..0000000 --- a/log/latest_test +++ /dev/null @@ -1 +0,0 @@ -test_2024-01-12_19-14-28 \ No newline at end of file diff --git a/log/test_2024-01-12_19-14-28/events.log b/log/test_2024-01-12_19-14-28/events.log deleted file mode 100644 index ad408ac..0000000 --- a/log/test_2024-01-12_19-14-28/events.log +++ /dev/null @@ -1,6 +0,0 @@ -[0.000000] (-) TimerEvent: {} -[0.000203] (rmoss_daheng_driver) JobQueued: {'identifier': 'rmoss_daheng_driver', 'dependencies': OrderedDict([('rmoss_daheng_driver', '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver/install/rmoss_daheng_driver')])} -[0.000252] (rmoss_daheng_driver) JobStarted: {'identifier': 'rmoss_daheng_driver'} -[0.002560] (rmoss_daheng_driver) StderrLine: {'line': b'Traceback (most recent call last):\n File "/usr/lib/python3/dist-packages/colcon_core/executor/__init__.py", line 91, in __call__\n rc = await self.task(*args, **kwargs)\n File "/usr/lib/python3/dist-packages/colcon_core/task/__init__.py", line 93, in __call__\n return await task_method(*args, **kwargs)\n File "/usr/lib/python3/dist-packages/colcon_ros/task/ament_cmake/test.py", line 29, in test\n return await extension.test()\n File "/usr/lib/python3/dist-packages/colcon_cmake/task/cmake/test.py", line 45, in test\n assert os.path.exists(args.build_base), \\\nAssertionError: Has this package been built before?\n'} -[0.003116] (rmoss_daheng_driver) JobEnded: {'identifier': 'rmoss_daheng_driver', 'rc': 1} -[0.013167] (-) EventReactorShutdown: {} diff --git a/log/test_2024-01-12_19-14-28/logger_all.log b/log/test_2024-01-12_19-14-28/logger_all.log deleted file mode 100644 index 268613c..0000000 --- a/log/test_2024-01-12_19-14-28/logger_all.log +++ /dev/null @@ -1,44 +0,0 @@ -[0.763s] DEBUG:colcon:Command line arguments: ['/usr/bin/colcon', 'test', '--return-code-on-test-failure', '--event-handlers', 'console_direct+', '--packages-up-to', 'rmoss_daheng_driver'] -[0.763s] DEBUG:colcon:Parsed command line arguments: Namespace(log_base=None, log_level=None, verb_name='test', build_base='build', install_base='install', merge_install=False, test_result_base=None, retest_until_fail=0, retest_until_pass=0, abort_on_error=False, return_code_on_test_failure=True, executor='parallel', parallel_workers=16, event_handlers=['console_direct+'], ignore_user_meta=False, metas=['./colcon.meta'], base_paths=['.'], packages_ignore=None, packages_ignore_regex=None, paths=None, packages_up_to=['rmoss_daheng_driver'], packages_up_to_regex=None, packages_above=None, packages_above_and_dependencies=None, packages_above_depth=None, packages_select_by_dep=None, packages_skip_by_dep=None, packages_skip_up_to=None, packages_select_build_failed=False, packages_skip_build_finished=False, packages_select_test_failures=False, packages_skip_test_passed=False, packages_select=None, packages_skip=None, packages_select_regex=None, packages_skip_regex=None, packages_start=None, packages_end=None, allow_overriding=[], ctest_args=None, python_testing=None, pytest_args=None, pytest_with_coverage=False, unittest_args=None, verb_parser=, verb_extension=, main=>) -[0.796s] Level 1:colcon.colcon_core.package_discovery:discover_packages(colcon_meta) check parameters -[0.796s] Level 1:colcon.colcon_core.package_discovery:discover_packages(recursive) check parameters -[0.796s] Level 1:colcon.colcon_core.package_discovery:discover_packages(ignore) check parameters -[0.796s] Level 1:colcon.colcon_core.package_discovery:discover_packages(path) check parameters -[0.796s] Level 1:colcon.colcon_core.package_discovery:discover_packages(colcon_meta) discover -[0.796s] Level 1:colcon.colcon_core.package_discovery:discover_packages(recursive) discover -[0.796s] INFO:colcon.colcon_core.package_discovery:Crawling recursively for packages in '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver' -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extensions ['ignore', 'ignore_ament_install'] -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extension 'ignore' -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extension 'ignore_ament_install' -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extensions ['colcon_pkg'] -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extension 'colcon_pkg' -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extensions ['colcon_meta'] -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extension 'colcon_meta' -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extensions ['ros'] -[0.797s] Level 1:colcon.colcon_core.package_identification:_identify(.) by extension 'ros' -[0.818s] DEBUG:colcon.colcon_core.package_identification:Package '.' with type 'ros.ament_cmake' and name 'rmoss_daheng_driver' -[0.819s] Level 1:colcon.colcon_core.package_discovery:discover_packages(recursive) using defaults -[0.819s] Level 1:colcon.colcon_core.package_discovery:discover_packages(ignore) discover -[0.819s] Level 1:colcon.colcon_core.package_discovery:discover_packages(ignore) using defaults -[0.819s] Level 1:colcon.colcon_core.package_discovery:discover_packages(path) discover -[0.819s] Level 1:colcon.colcon_core.package_discovery:discover_packages(path) using defaults -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'ctest_args' from command line to 'None' -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'python_testing' from command line to 'None' -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'pytest_args' from command line to 'None' -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'pytest_with_coverage' from command line to 'False' -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'unittest_args' from command line to 'None' -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'retest_until_pass' from command line to '0' -[0.862s] Level 5:colcon.colcon_core.verb:set package 'rmoss_daheng_driver' test argument 'retest_until_fail' from command line to '0' -[0.862s] DEBUG:colcon.colcon_core.verb.test:Testing package 'rmoss_daheng_driver' with the following arguments: {'build_base': '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver/build/rmoss_daheng_driver', 'ctest_args': None, 'install_base': '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver/install/rmoss_daheng_driver', 'path': '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver', 'pytest_args': None, 'pytest_with_coverage': False, 'python_testing': None, 'retest_until_fail': 0, 'retest_until_pass': 0, 'test_result_base': None, 'unittest_args': None} -[0.872s] INFO:colcon.colcon_core.executor:Executing jobs using 'parallel' executor -[0.883s] DEBUG:colcon.colcon_parallel_executor.executor.parallel:run_until_complete -[0.883s] INFO:colcon.colcon_ros.task.ament_cmake.test:Testing ROS package in '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver' with build type 'ament_cmake' -[0.883s] INFO:colcon.colcon_cmake.task.cmake.test:Testing CMake package in '/home/mpl/code/rmoss_ws/src/rmoss_daheng_driver' -[0.896s] DEBUG:colcon.colcon_parallel_executor.executor.parallel:closing loop -[0.896s] DEBUG:colcon.colcon_parallel_executor.executor.parallel:loop closed -[0.896s] DEBUG:colcon.colcon_parallel_executor.executor.parallel:run_until_complete finished with 'Has this package been built before?' -[0.896s] DEBUG:colcon.colcon_core.event_reactor:joining thread -[0.911s] INFO:colcon.colcon_core.plugin_system:Skipping extension 'colcon_notification.desktop_notification.terminal_notifier': Not used on non-Darwin systems -[0.911s] INFO:colcon.colcon_core.plugin_system:Skipping extension 'colcon_notification.desktop_notification.win32': Not used on non-Windows systems -[0.911s] INFO:colcon.colcon_notification.desktop_notification:Sending desktop notification using 'notify2' -[0.920s] DEBUG:colcon.colcon_core.event_reactor:joined thread diff --git a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/command.log b/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/command.log deleted file mode 100644 index e69de29..0000000 diff --git a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stderr.log b/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stderr.log deleted file mode 100644 index 7d33d6d..0000000 --- a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stderr.log +++ /dev/null @@ -1,10 +0,0 @@ -Traceback (most recent call last): - File "/usr/lib/python3/dist-packages/colcon_core/executor/__init__.py", line 91, in __call__ - rc = await self.task(*args, **kwargs) - File "/usr/lib/python3/dist-packages/colcon_core/task/__init__.py", line 93, in __call__ - return await task_method(*args, **kwargs) - File "/usr/lib/python3/dist-packages/colcon_ros/task/ament_cmake/test.py", line 29, in test - return await extension.test() - File "/usr/lib/python3/dist-packages/colcon_cmake/task/cmake/test.py", line 45, in test - assert os.path.exists(args.build_base), \ -AssertionError: Has this package been built before? diff --git a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout.log b/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout.log deleted file mode 100644 index e69de29..0000000 diff --git a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout_stderr.log b/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout_stderr.log deleted file mode 100644 index 7d33d6d..0000000 --- a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout_stderr.log +++ /dev/null @@ -1,10 +0,0 @@ -Traceback (most recent call last): - File "/usr/lib/python3/dist-packages/colcon_core/executor/__init__.py", line 91, in __call__ - rc = await self.task(*args, **kwargs) - File "/usr/lib/python3/dist-packages/colcon_core/task/__init__.py", line 93, in __call__ - return await task_method(*args, **kwargs) - File "/usr/lib/python3/dist-packages/colcon_ros/task/ament_cmake/test.py", line 29, in test - return await extension.test() - File "/usr/lib/python3/dist-packages/colcon_cmake/task/cmake/test.py", line 45, in test - assert os.path.exists(args.build_base), \ -AssertionError: Has this package been built before? diff --git a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/streams.log b/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/streams.log deleted file mode 100644 index 5b97317..0000000 --- a/log/test_2024-01-12_19-14-28/rmoss_daheng_driver/streams.log +++ /dev/null @@ -1,10 +0,0 @@ -[0.003s] Traceback (most recent call last): - File "/usr/lib/python3/dist-packages/colcon_core/executor/__init__.py", line 91, in __call__ - rc = await self.task(*args, **kwargs) - File "/usr/lib/python3/dist-packages/colcon_core/task/__init__.py", line 93, in __call__ - return await task_method(*args, **kwargs) - File "/usr/lib/python3/dist-packages/colcon_ros/task/ament_cmake/test.py", line 29, in test - return await extension.test() - File "/usr/lib/python3/dist-packages/colcon_cmake/task/cmake/test.py", line 45, in test - assert os.path.exists(args.build_base), \ -AssertionError: Has this package been built before? diff --git a/src/cam_driver/daheng_cam.cpp b/src/cam_driver/daheng_cam.cpp index bfb3682..c6d063e 100644 --- a/src/cam_driver/daheng_cam.cpp +++ b/src/cam_driver/daheng_cam.cpp @@ -107,7 +107,7 @@ bool DaHengCam::open() uint32_t nDeviceNum = 0; stOpenParam.openMode = GX_OPEN_SN; stOpenParam.accessMode = GX_ACCESS_EXCLUSIVE; - stOpenParam.pszContent = reinterpret_cast(this->_camera_sn.c_str()); + stOpenParam.pszContent = const_cast(this->_camera_sn.c_str()); // 获取相机列表 GXstatus = GXUpdateDeviceList(&nDeviceNum, 1000);