ogma-core 1.3.0 → 1.4.0
raw patch · 10 files changed
+87/−64 lines, 10 filesdep ~ogma-extradep ~ogma-language-cdep ~ogma-language-cocospec
Dependency ranges changed: ogma-extra, ogma-language-c, ogma-language-cocospec, ogma-language-copilot, ogma-language-jsonspec, ogma-language-smv, ogma-spec
Files
- CHANGELOG.md +6/−0
- ogma-core.cabal +12/−11
- src/Command/ROSApp.hs +4/−4
- templates/ros/CMakeLists.txt +0/−29
- templates/ros/Dockerfile +16/−0
- templates/ros/copilot/CMakeLists.txt +29/−0
- templates/ros/copilot/package.xml +20/−0
- templates/ros/copilot/src/.keep +0/−0
- templates/ros/package.xml +0/−20
- templates/ros/src/.keep +0/−0
CHANGELOG.md view
@@ -1,5 +1,11 @@ # Revision history for ogma-core +## [1.4.0] - 2024-05-21++* Version bump 1.4.0 (#145).+* Make ros command generate dockerfile (#136).+* Map float and double to the same types in C++ (#138).+ ## [1.3.0] - 2024-03-21 * Version bump 1.3.0 (#133).
ogma-core.cabal view
@@ -32,7 +32,7 @@ build-type: Simple name: ogma-core-version: 1.3.0+version: 1.4.0 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf@@ -60,9 +60,10 @@ templates/copilot-cfs/fsw/src/copilot_cfs_version.h templates/copilot-cfs/fsw/src/copilot_cfs.h templates/copilot-cfs/fsw/src/copilot_cfs_events.h- templates/ros/CMakeLists.txt- templates/ros/src/.keep- templates/ros/package.xml+ templates/ros/Dockerfile+ templates/ros/copilot/CMakeLists.txt+ templates/ros/copilot/src/.keep+ templates/ros/copilot/package.xml templates/fprime/CMakeLists.txt templates/fprime/Dockerfile templates/fprime/instance-copilot@@ -109,13 +110,13 @@ , IfElse , mtl - , ogma-extra >= 1.3.0 && < 1.4- , ogma-language-c >= 1.3.0 && < 1.4- , ogma-language-cocospec >= 1.3.0 && < 1.4- , ogma-language-copilot >= 1.3.0 && < 1.4- , ogma-language-jsonspec >= 1.3.0 && < 1.4- , ogma-language-smv >= 1.3.0 && < 1.4- , ogma-spec >= 1.3.0 && < 1.4+ , ogma-extra >= 1.4.0 && < 1.5+ , ogma-language-c >= 1.4.0 && < 1.5+ , ogma-language-cocospec >= 1.4.0 && < 1.5+ , ogma-language-copilot >= 1.4.0 && < 1.5+ , ogma-language-jsonspec >= 1.4.0 && < 1.5+ , ogma-language-smv >= 1.4.0 && < 1.5+ , ogma-spec >= 1.4.0 && < 1.5 hs-source-dirs: src
src/Command/ROSApp.hs view
@@ -136,7 +136,7 @@ foldr f ([], [], [], []) varNames let rosFileName =- targetDir </> "src" </> "copilot_monitor.cpp"+ targetDir </> "copilot" </> "src" </> "copilot_monitor.cpp" rosFileContents = unlines $ rosMonitorContents varNames vars ids infos datas monitors@@ -144,7 +144,7 @@ writeFile rosFileName rosFileContents let rosFileName =- targetDir </> "src" </> "copilot_logger.cpp"+ targetDir </> "copilot" </> "src" </> "copilot_logger.cpp" rosFileContents = unlines $ rosLoggerContents varNames vars ids infos datas monitors@@ -403,8 +403,8 @@ "int16_t" -> "std::int16_t" "int32_t" -> "std::int32_t" "int64_t" -> "std::int64_t"- "float" -> "std::float32"- "double" -> "std::float64"+ "float" -> "float"+ "double" -> "double" def -> def msgSubscriptionS = unlines
− templates/ros/CMakeLists.txt
@@ -1,29 +0,0 @@-cmake_minimum_required(VERSION 3.8)-project(copilot)--if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")- add_compile_options(-Wall -Wextra -Wpedantic)-endif()--# find dependencies-find_package(ament_cmake REQUIRED)-find_package(rclcpp REQUIRED)-find_package(std_msgs REQUIRED)--add_executable(copilot src/copilot_monitor.cpp)-ament_target_dependencies(copilot rclcpp std_msgs)--# Uncomment to enable compiling the copilot logger-# add_executable(copilot_logger src/copilot_logger.cpp)-# ament_target_dependencies(copilot_logger rclcpp std_msgs)--install(TARGETS- copilot- DESTINATION lib/${PROJECT_NAME})--if(BUILD_TESTING)- find_package(ament_lint_auto REQUIRED)- ament_lint_auto_find_test_dependencies()-endif()--ament_package()
+ templates/ros/Dockerfile view
@@ -0,0 +1,16 @@+FROM osrf/space-ros:latest++ARG USER=spaceros-user+ARG PACKAGE_PATH=/home/${USER}/monitors+ARG ROS_PATH=/home/${USER}/spaceros/++RUN mkdir -p ${PACKAGE_PATH}/src/+ADD copilot ${PACKAGE_PATH}/src/copilot+USER root+RUN chown -R ${USER} ${PACKAGE_PATH}+USER ${USER}++SHELL ["/bin/bash", "-c"]+WORKDIR ${PACKAGE_PATH}+RUN source ${ROS_PATH}/install/setup.bash && \+ colcon build
+ templates/ros/copilot/CMakeLists.txt view
@@ -0,0 +1,29 @@+cmake_minimum_required(VERSION 3.8)+project(copilot)++if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")+ add_compile_options(-Wall -Wextra -Wpedantic)+endif()++# find dependencies+find_package(ament_cmake REQUIRED)+find_package(rclcpp REQUIRED)+find_package(std_msgs REQUIRED)++add_executable(copilot src/copilot_monitor.cpp)+ament_target_dependencies(copilot rclcpp std_msgs)++# Uncomment to enable compiling the copilot logger+# add_executable(copilot_logger src/copilot_logger.cpp)+# ament_target_dependencies(copilot_logger rclcpp std_msgs)++install(TARGETS+ copilot+ DESTINATION lib/${PROJECT_NAME})++if(BUILD_TESTING)+ find_package(ament_lint_auto REQUIRED)+ ament_lint_auto_find_test_dependencies()+endif()++ament_package()
+ templates/ros/copilot/package.xml view
@@ -0,0 +1,20 @@+<?xml version="1.0"?>+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>+<package format="3">+ <name>copilot</name>+ <version>0.0.0</version>+ <description>TODO: Package description</description>+ <maintainer email="root@todo.todo">root</maintainer>+ <license>TODO: License declaration</license>++ <buildtool_depend>ament_cmake</buildtool_depend>+ <depend>rclcpp</depend>+ <depend>std_msgs</depend>++ <test_depend>ament_lint_auto</test_depend>+ <test_depend>ament_lint_common</test_depend>++ <export>+ <build_type>ament_cmake</build_type>+ </export>+</package>
+ templates/ros/copilot/src/.keep view
− templates/ros/package.xml
@@ -1,20 +0,0 @@-<?xml version="1.0"?>-<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>-<package format="3">- <name>copilot</name>- <version>0.0.0</version>- <description>TODO: Package description</description>- <maintainer email="root@todo.todo">root</maintainer>- <license>TODO: License declaration</license>-- <buildtool_depend>ament_cmake</buildtool_depend>- <depend>rclcpp</depend>- <depend>std_msgs</depend>-- <test_depend>ament_lint_auto</test_depend>- <test_depend>ament_lint_common</test_depend>-- <export>- <build_type>ament_cmake</build_type>- </export>-</package>
− templates/ros/src/.keep