Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI checkout issue #5

Merged
merged 7 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,30 @@ on:
branches: [ galactic ]
pull_request:
branches: [ galactic ]
schedule:
- cron: '0 21 * * *'
jobs:
build-and-test:
runs-on: ubuntu-latest
container:
image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-desktop-latest
image: osrf/ros:galactic-desktop-focal
steps:
- name: Setup git-lfs
run: apt-get update && apt-get install -y git-lfs && rm -rf /var/lib/apt/lists/*
- name: Check out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true
- name: Build rmoss_daheng_driver
uses: ros-tooling/action-ros-ci@v0.2
uses: ros-tooling/action-ros-ci@v0.3
with:
package-name: rmoss_daheng_driver
target-ros2-distro: galactic
vcs-repo-file-url: "${{ github.workspace }}/dependency.repos"
skip-tests: true
- name: Test rmoss_daheng_driver
run: |
source /opt/ros/galactic/setup.sh
. /opt/ros/galactic/setup.sh
cd ros_ws
colcon test --packages-select rmoss_daheng_driver --event-handlers console_cohesion+ --return-code-on-test-failure
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# rmoss_daheng_driver

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Build and Test (Galactic)](https://github.com/robomaster-oss/rmoss_daheng_driver/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/robomaster-oss/rmoss_daheng_driver/actions/workflows/ci.yml)
[![Build and Test (Galactic)](https://github.com/robomaster-oss/rmoss_daheng_driver/actions/workflows/ci.yml/badge.svg?branch=galactic)](https://github.com/robomaster-oss/rmoss_daheng_driver/actions/workflows/ci.yml)

![](rmoss_bg.png)

Expand Down
4 changes: 2 additions & 2 deletions dependency.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ repositories:
rmoss_interfaces:
type: git
url: https://github.com/robomaster-oss/rmoss_interfaces.git
version: main
version: galactic
rmoss_core:
type: git
url: https://github.com/robomaster-oss/rmoss_core.git
version: main
version: galactic
1 change: 0 additions & 1 deletion install/.colcon_install_layout

This file was deleted.

28 changes: 14 additions & 14 deletions launch/daheng_cam.launch.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Copyright 2022 RoboMaster-OSS
# Copyright 2022 RoboMaster-OSS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


import os
Expand All @@ -23,12 +23,12 @@
def generate_launch_description():

param_path = os.path.join(
get_package_share_directory("rmoss_daheng_driver"), "config/cam_param.yaml")
get_package_share_directory('rmoss_daheng_driver'), 'config/cam_param.yaml')

daheng_cam_node = Node(
package="rmoss_daheng_driver",
executable="daheng_cam",
name="daheng_camera",
package='rmoss_daheng_driver',
executable='daheng_cam',
name='daheng_camera',
parameters=[param_path]
)
ld = LaunchDescription()
Expand Down
Empty file removed log/COLCON_IGNORE
Empty file.
1 change: 0 additions & 1 deletion log/latest

This file was deleted.

1 change: 0 additions & 1 deletion log/latest_test

This file was deleted.

6 changes: 0 additions & 6 deletions log/test_2024-01-12_19-14-28/events.log

This file was deleted.

44 changes: 0 additions & 44 deletions log/test_2024-01-12_19-14-28/logger_all.log

This file was deleted.

Empty file.
10 changes: 0 additions & 10 deletions log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stderr.log

This file was deleted.

Empty file.
10 changes: 0 additions & 10 deletions log/test_2024-01-12_19-14-28/rmoss_daheng_driver/stdout_stderr.log

This file was deleted.

10 changes: 0 additions & 10 deletions log/test_2024-01-12_19-14-28/rmoss_daheng_driver/streams.log

This file was deleted.

4 changes: 3 additions & 1 deletion src/cam_driver/daheng_cam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#include <iostream>
#include <fstream>
#include <string>
#include <vector>

namespace rmoss_entity_cam
{
Expand Down Expand Up @@ -107,7 +109,7 @@ bool DaHengCam::open()
uint32_t nDeviceNum = 0;
stOpenParam.openMode = GX_OPEN_SN;
stOpenParam.accessMode = GX_ACCESS_EXCLUSIVE;
stOpenParam.pszContent = reinterpret_cast<char *>(this->_camera_sn.c_str());
stOpenParam.pszContent = const_cast<char *>(this->_camera_sn.c_str());

// 获取相机列表
GXstatus = GXUpdateDeviceList(&nDeviceNum, 1000);
Expand Down
4 changes: 4 additions & 0 deletions src/daheng_cam_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

#include "rmoss_daheng_driver/daheng_cam_node.hpp"

#include <memory>
#include <vector>
#include <string>

namespace rmoss_entity_cam
{
DaHengCamNode::DaHengCamNode(const rclcpp::NodeOptions & options)
Expand Down