Skip to content
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
2 changes: 1 addition & 1 deletion .devcontainer/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ if [ -n "${ROS_DISTRO}" ]; then
# export RCUTILS_LOGGING_USE_STDOUT=1
export RCUTILS_COLORIZED_OUTPUT=1
case "${ROS_DISTRO}" in
jazzy|rolling)
jazzy|lyrical|rolling)
export RCUTILS_CONSOLE_OUTPUT_FORMAT="{severity} {date_time_with_ms} {name} - {message}"
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ case ${command} in
${containerWorkspaceFolder}/create_ros_ws.sh -d ros1_ws
fi
;;
humble|jazzy)
humble|jazzy|lyrical|rolling)
if [ ! -d ${containerWorkspaceFolder}/ros2_ws ]; then
${containerWorkspaceFolder}/create_ros_ws.sh -d ros2_ws
fi
Expand Down
12 changes: 12 additions & 0 deletions .devcontainer/lyrical/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ghcr.io/fixposition/fixposition-sdk:lyrical-dev

# RUN <<EOF
# # Install additional packages
# set -e
# export DEBIAN_FRONTEND=noninteractive
# apt-get -y update
# apt-get -y --with-new-pkgs upgrade
# apt-get -y --no-install-recommends install some-package another-package ...
# apt-get -y autoremove
# apt-get clean
# EOF
52 changes: 52 additions & 0 deletions .devcontainer/lyrical/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// https://aka.ms/devcontainer.json
{
"name": "Fixposition ROS2 driver (Lyrical)",
"build": { "dockerfile": "Dockerfile", "context": "../.." },
"remoteUser": "fpsdk",
"updateRemoteUserUID": true,
"capAdd": ["SYS_PTRACE"],
"mounts": [
// Persistent bash history
"source=${localWorkspaceFolder}/.devcontainer/.bashrc,target=/home/fpsdk/.bashrc,type=bind",
"source=${localWorkspaceFolder}/.devcontainer/.bash_logout,target=/home/fpsdk/.bash_logout,type=bind",
"source=${localWorkspaceFolder}/.devcontainer/.bash_history.d,target=/home/fpsdk/.bash_history.d,type=bind",
// Persistent .vscode-server
"source=${localWorkspaceFolder}/.devcontainer/.vscode-server,target=/home/fpsdk/.vscode-server,type=bind",
// The code we're working on
"source=${localWorkspaceFolder},target=/home/fpsdk/fixposition_driver,type=bind",
],
"workspaceFolder": "/home/fpsdk/fixposition_driver",
"runArgs": [ "--name=fixposition_driver-lyrical-${localEnv:USER}", "--hostname=lyrical" ],
"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/helper.sh onCreateCommand ${containerWorkspaceFolder}",
"customizations": {
"vscode": {
"settings": {
"files.exclude": {
"**/.git": true,
".vscode-cache": true,
"**/*~": true,
".vstags": true,
"**/build/**": true,
"core": true,
"**/.devcontainer/.vscode-server/**": true,
"**/.vscode-server/**": true
},
"search.exclude": {
"tmp": true,
"**/ros1_ws/**": true,
"**/ros2_ws/**": true
},
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/refs/**": true,
"**/.git/logs/**": true,
"**/.git/subtree-cache/**": true,
"**/.git/worktrees/**": true,
"**/.vscode-*/**": true,
"**/ros1_ws/**": true,
"**/ros2_ws/**": true
}
}
}
}
}
17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,21 @@ jobs:
git config --global --add safe.directory ${GITHUB_WORKSPACE}
./.github/ci.sh

ci-lyrical:
runs-on: ubuntu-latest
container:
image: ghcr.io/fixposition/fixposition-sdk:lyrical-ci
defaults:
run:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Build
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
./.github/ci.sh

# eof
68 changes: 0 additions & 68 deletions CHANGELOG.md

This file was deleted.

3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

[ROS](https://www.ros.org/) (both ROS1 and ROS2) driver for [Fixposition Vision-RTK 2](https://www.fixposition.com/product) for **Linux**.

> [!IMPORTANT]
> Tags 8.0.0 onward break compatibility with previous versions. For more details on how to migrate to the new version, please refer to [Migration Guide](https://docs.fixposition.com/fd/migration-guide).

[![CI](https://github.com/fixposition/fixposition_driver/actions/workflows/ci.yml/badge.svg)](https://github.com/fixposition/fixposition_driver/actions/workflows/ci.yml)

## Driver documentation
Expand Down
2 changes: 1 addition & 1 deletion create_ros_ws.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function main
noetic)
rosver=1
;;
humble|jazzy)
humble|jazzy|lyrical|rolling)
rosver=2
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion fixposition-sdk
Submodule fixposition-sdk updated 93 files
+17 −0 .devcontainer/lyrical/devcontainer.json
+25 −3 .github/workflows/ci.yml
+35 −0 .github/workflows/docker.yml
+1 −0 .gitignore
+29 −26 Makefile
+4 −0 docker/Dockerfile.humble-base
+4 −0 docker/Dockerfile.jazzy-base
+38 −0 docker/Dockerfile.lyrical-base
+31 −0 docker/Dockerfile.lyrical-ci
+60 −0 docker/Dockerfile.lyrical-dev
+37 −0 docker/Dockerfile.lyrical-run
+8 −0 docker/Dockerfile.noetic-base
+4 −0 docker/Dockerfile.trixie-base
+10 −4 docker/ci.sh
+80 −25 docker/docker-compose.yaml
+67 −60 docker/scripts/install_apt_base.sh
+1 −1 docker/scripts/install_apt_ci.sh
+61 −58 docker/scripts/install_apt_dev.sh
+3 −1 docker/scripts/install_apt_run.sh
+2 −2 docker/scripts/install_doxygen.sh
+77 −0 docker/scripts/install_ffmpeg.sh
+32 −0 docker/scripts/install_nasm.sh
+12 −2 examples/Makefile
+1 −0 examples/camera_streaming/.gitignore
+41 −0 examples/camera_streaming/CMakeLists.txt
+21 −0 examples/camera_streaming/LICENSE
+23 −0 examples/camera_streaming/Makefile
+3 −0 examples/camera_streaming/README.md
+250 −0 examples/camera_streaming/camera_streaming.cpp
+4 −5 examples/fpb_measurements/Makefile
+1 −1 examples/fpb_measurements/fpb_measurements.cpp
+4 −5 examples/fusion_epoch/Makefile
+1 −1 examples/fusion_epoch/fusion_epoch.cpp
+4 −5 examples/parser_intro/Makefile
+1 −1 examples/parser_intro/parser_intro.cpp
+5 −5 examples/ros2_fpsdk_demo/CMakeLists.txt
+18 −1 fpsdk.code-workspace
+10 −3 fpsdk.sh
+11 −2 fpsdk_apps/CMakeLists.txt
+3 −1 fpsdk_apps/findsensor/findsensor.cpp
+3 −2 fpsdk_apps/fpltool/fpltool.cpp
+5 −0 fpsdk_apps/fpltool/fpltool_dump.cpp
+554 −178 fpsdk_apps/fpltool/fpltool_extract.cpp
+93 −0 fpsdk_apps/fpltool/fpltool_extract.hpp
+1 −0 fpsdk_apps/fpltool/fpltool_meta.cpp
+61 −14 fpsdk_apps/fpltool/fpltool_opts.hpp
+1 −0 fpsdk_apps/fpltool/fpltool_trim.cpp
+0 −281 fpsdk_apps/fpltool/fpltool_utils.cpp
+0 −127 fpsdk_apps/fpltool/fpltool_utils.hpp
+66 −30 fpsdk_apps/parsertool/parsertool.cpp
+26 −20 fpsdk_common/CMakeLists.txt
+511 −0 fpsdk_common/LICENSE
+0 −21 fpsdk_common/cmake/ros.cmake
+15 −26 fpsdk_common/cmake/testing.cmake
+146 −0 fpsdk_common/cmake/utils.cmake
+4 −2 fpsdk_common/doc/doc.hpp
+1 −1 fpsdk_common/include/fpsdk_common/app.hpp
+319 −0 fpsdk_common/include/fpsdk_common/cam.hpp
+1 −1 fpsdk_common/include/fpsdk_common/can.hpp
+19 −0 fpsdk_common/include/fpsdk_common/fpl.hpp
+3 −1 fpsdk_common/include/fpsdk_common/parser/rtcm3.hpp
+465 −14 fpsdk_common/include/fpsdk_common/parser/ubx.hpp
+7 −0 fpsdk_common/include/fpsdk_common/time.hpp
+22 −2 fpsdk_common/include/fpsdk_common/to_json/fpl.hpp
+25 −0 fpsdk_common/include/fpsdk_common/to_json/parser.hpp
+0 −0 fpsdk_common/include/fpsdk_common/to_json/parser_nmea.hpp
+1,582 −0 fpsdk_common/include/fpsdk_common/to_json/parser_ubx.hpp
+17 −0 fpsdk_common/include/fpsdk_common/types.hpp
+277 −0 fpsdk_common/include/fpsdk_common/video.hpp
+2 −2 fpsdk_common/rosnoros/geometry_msgs/PoseWithCovariance.h
+2 −2 fpsdk_common/rosnoros/geometry_msgs/TwistWithCovariance.h
+6 −6 fpsdk_common/rosnoros/sensor_msgs/Imu.h
+21 −9 fpsdk_common/src/app.cpp
+630 −0 fpsdk_common/src/cam.cpp
+3 −0 fpsdk_common/src/codegen.pl
+70 −1 fpsdk_common/src/fpl.cpp
+21 −4 fpsdk_common/src/parser/rtcm3.cpp
+53 −2 fpsdk_common/src/parser/ubx.cpp
+6 −0 fpsdk_common/src/time.cpp
+908 −0 fpsdk_common/src/video.cpp
+47 −0 fpsdk_common/test/cam_test.cpp
+ fpsdk_common/test/data/hevc_i_frame.bin
+782 −0 fpsdk_common/test/data/hevc_i_frame.cpp
+5 −0 fpsdk_common/test/time_test.cpp
+19 −0 fpsdk_common/test/types_test.cpp
+109 −0 fpsdk_common/test/video_test.cpp
+4 −3 fpsdk_doc/Doxyfile
+307 −163 fpsdk_doc/fpsdk-overview.drawio.svg
+17 −7 fpsdk_doc/fpsdk_build.hpp
+6 −0 fpsdk_doc/fpsdk_examples.hpp
+10 −1 fpsdk_ros1/CMakeLists.txt
+0 −1 fpsdk_ros1/doc/doc.hpp
+10 −1 fpsdk_ros2/CMakeLists.txt
2 changes: 1 addition & 1 deletion fixposition_driver.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"${workspaceFolder}/fixposition_driver_lib/**",
"${workspaceFolder}/fixposition_driver_ros1/**",
"${workspaceFolder}/fixposition_driver_ros2/**",
"/opt/ros/noetic/include/**", "/opt/ros/humble/include/**", "/opt/ros/jazzy/include/**" ],
"/opt/ros/noetic/include/**", "/opt/ros/humble/include/**", "/opt/ros/jazzy/include/**", "/opt/ros/lyrical/include/**" ],
"C_Cpp.default.defines": [ "FP_USE_ROS1" ],
//"C_Cpp.default.compileCommands": "",
//"C_Cpp.default.forcedIncludes": [ ],
Expand Down
2 changes: 1 addition & 1 deletion setup_ros_ws.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function main
noetic)
rosver=1
;;
humble|jazzy)
humble|jazzy|lyrical|rolling)
rosver=2
;;
esac
Expand Down
Loading