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
17 changes: 7 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v6
- name: Login
uses: docker/login-action@v3
uses: docker/login-action@v4 # https://github.com/docker/login-action
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -173,25 +173,22 @@ jobs:

##### Archive generated HTML as artefacts

# https://github.com/actions/upload-pages-artifact (This, not actions/upload-artifact, which doesn't work
# for pages deployment. Both actions make the artefact show up as a job artefact.
- name: Upload pages artefact
uses: actions/upload-pages-artifact@v4
uses: actions/upload-pages-artifact@v5 # https://github.com/actions/upload-pages-artifact (This, not actions/upload-artifact, which doesn't work)
with:
path: github-pages

##### Deploy to fixposition.github.io/fixposition-sdk (only on main branch)

# https://github.com/actions/configure-pages
- name: Configure pages
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/pull/153/merge' }}
uses: actions/configure-pages@v5
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/pull/193/merge' }}
uses: actions/configure-pages@v6 # https://github.com/actions/configure-pages

# https://github.com/actions/deploy-pages
- name: Deploy pages
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/pull/153/merge' }}
uses: actions/deploy-pages@v4
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/pull/193/merge' }}
uses: actions/deploy-pages@v5
with:
artifact_name: github-pages
artifact_name: github-pages # https://github.com/actions/deploy-pages

# eof
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ $(BUILD_DIR)/.make-doc: $(BUILD_DIR)/.make-build fpsdk_doc/Doxyfile
$(V)$(BUILD_DIR)/fpsdk_apps/timeconv -h > $(BUILD_DIR)/helpscreens/timeconv_helpscreen.txt
$(V)$(BUILD_DIR)/fpsdk_apps/timetool -h > $(BUILD_DIR)/helpscreens/timetool_helpscreen.txt
$(V)$(BUILD_DIR)/fpsdk_apps/yaml2shell -h > $(BUILD_DIR)/helpscreens/yaml2shell_helpscreen.txt
$(V)$(BUILD_DIR)/fpsdk_apps/findsensor -h > $(BUILD_DIR)/helpscreens/findsensor_helpscreen.txt
$(V)./fpsdk.sh -h > $(BUILD_DIR)/helpscreens/fpsdk_helpscreen.txt
$(V)( \
cat fpsdk_doc/Doxyfile; \
Expand Down
10 changes: 6 additions & 4 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ services:
# Workspace
- ../.:/home/fpsdk/fixposition-sdk
cap_add:
- SYS_PTRACE # Set kernel.yama.ptrace_scope = 0 in /etc/sysctl.d/10-ptrace.conf
- SYS_PTRACE # Set kernel.yama.ptrace_scope = 0 in /etc/sysctl.d/10-ptrace.conf
hostname: fpsdk-trixie-dev-${USER}
ports:
- "8952:8952/udp" # for findsensor
# Apparently required... (so that the container doesn't kill itself?)
command: tail -f

Expand Down Expand Up @@ -96,7 +98,7 @@ services:
- ../.devcontainer/.vscode-server:/home/fpsdk/.vscode-server
- ../.:/home/fpsdk/fixposition-sdk
cap_add:
- SYS_PTRACE
- SYS_PTRACE
hostname: fpsdk-noetic-dev-${USER}
command: tail -f

Expand Down Expand Up @@ -140,7 +142,7 @@ services:
- ../.devcontainer/.vscode-server:/home/fpsdk/.vscode-server
- ../.:/home/fpsdk/fixposition-sdk
cap_add:
- SYS_PTRACE
- SYS_PTRACE
hostname: fpsdk-humble-dev-${USER}
command: tail -f

Expand Down Expand Up @@ -182,7 +184,7 @@ services:
- ../.devcontainer/.vscode-server:/home/fpsdk/.vscode-server
- ../.:/home/fpsdk/fixposition-sdk
cap_add:
- SYS_PTRACE
- SYS_PTRACE
hostname: fpsdk-jazzy-dev-${USER}
command: tail -f

Expand Down
9 changes: 1 addition & 8 deletions fpsdk.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,7 @@
},
"workbench.remoteIndicator.showExtensionRecommendations": true,
"yaml.extension.recommendations": false,
"peacock.remoteColor": "#f9e64f",
"workbench.colorCustomizations": {
"commandCenter.border": "#15202b99",
"titleBar.activeBackground": "#f9e64f",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#f9e64f99",
"titleBar.inactiveForeground": "#15202b99"
}
"peacock.remoteColor": "#f9e64f"
},
"extensions": {
"recommendations": [
Expand Down
14 changes: 13 additions & 1 deletion fpsdk_apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ else()
message(STATUS "fpsdk_apps: No ROS available")
endif()

find_package(Threads REQUIRED)
find_package(nlohmann_json REQUIRED)


# SHARED LIBRARY =======================================================================================================

# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#recommendations
Expand Down Expand Up @@ -108,6 +112,14 @@ target_link_libraries(yaml2shell
fpsdk_common
)

file(GLOB FINDSENSOR_CPP_FILES findsensor/*.cpp)
add_executable(findsensor ${FINDSENSOR_CPP_FILES} ${COMMON_CPP_FILES})
target_link_libraries(findsensor
PRIVATE
fpsdk_common
Threads::Threads
nlohmann_json::nlohmann_json
)

# INSTALL ==============================================================================================================

Expand All @@ -117,7 +129,7 @@ set(PROJECT_LIBRARY_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
set(PROJECT_INCLUDE_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME})
set(PROJECT_DATA_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/${PROJECT_NAME})

install(TARGETS fpltool parsertool timeconv timetool yaml2shell
install(TARGETS fpltool parsertool timeconv timetool yaml2shell findsensor
EXPORT ${PROJECT_NAME}-targets
LIBRARY DESTINATION ${PROJECT_LIBRARY_DIR}
RUNTIME DESTINATION ${PROJECT_RUNTIME_DIR}
Expand Down
1 change: 1 addition & 0 deletions fpsdk_apps/doc/doc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ namespace apps {
- @subpage FPSDK_APPS_TIMECONV
- @subpage FPSDK_APPS_TIMETOOL
- @subpage FPSDK_APPS_YAML2SHELL
- @subpage FPSDK_APPS_FINDSENSOR

@section FPSDK_APPS_LICENSE License

Expand Down
Loading
Loading