ogma-cli 1.0.8 → 1.0.9
raw patch · 5 files changed
+51/−9 lines, 5 filesdep ~ogma-core
Dependency ranges changed: ogma-core
Files
- CHANGELOG.md +9/−0
- ogma-cli.cabal +13/−7
- src/CLI/CommandFretComponentSpec2Copilot.hs +13/−0
- src/CLI/CommandFretReqsDB2Copilot.hs +15/−1
- src/CLI/CommandROSApp.hs +1/−1
CHANGELOG.md view
@@ -1,5 +1,14 @@ # Revision history for ogma-cli +## [1.0.9] - 2023-05-21++* Version bump 1.0.9 (#93).+* Rename ROS2 to ROS 2 (#83).+* Allow customizing the names of the C files generated by Copilot (#80).+* Re-order README's TOC to match order of contents (#88).+* Fix rendering of quotes in URLs in package description (#72).+* List FPrime backend as supported use case in package description (#91).+ ## [1.0.8] - 2023-03-21 * Version bump 1.0.8 (#81).
ogma-cli.cabal view
@@ -32,7 +32,7 @@ build-type: Simple name: ogma-cli-version: 1.0.8+version: 1.0.9 homepage: http://nasa.gov license: OtherLicense license-file: LICENSE.pdf@@ -67,10 +67,14 @@ to a Copilot monitor. . - Generating- <https://ros.org Robot Operating System (ROS2)>+ <https://ros.org Robot Operating System (ROS 2)> applications that use Copilot for monitoring data received from different topics. .+ - Generating+ <https://github.com/nasa/fprime F'>+ components that use Copilot for monitoring.+ . The main invocation with @--help@ lists sub-commands available. . >$ ogma --help@@ -91,7 +95,7 @@ > Specification > fret-reqs-db Generate a Copilot file from a FRET Requirements > Database- > ros Generate a ROS2 monitoring application+ > ros Generate a ROS 2 monitoring application . For further information, see: .@@ -103,11 +107,13 @@ . - <https://cfs.gsfc.nasa.gov/ The NASA Core Flight System web page>. .- - <https://ros.org/ The Robot Operating System (ROS2) web page>.+ - <https://ros.org/ The Robot Operating System (ROS 2) web page>. .- - <https://ntrs.nasa.gov/citations/20200003164 "Copilot 3">, Perez, Dedden and Goodloe. 2020.+ - <https://github.com/nasa/fprime The F' repository>. .- - <https://shemesh.larc.nasa.gov/people/cam/publications/FMAS2020_3.pdf "From Requirements to Autonomous Flight">, Dutle et al. 2020.+ - "<https://ntrs.nasa.gov/citations/20200003164 Copilot 3>", Perez, Dedden and Goodloe. 2020.+ .+ - "<https://shemesh.larc.nasa.gov/people/cam/publications/FMAS2020_3.pdf From Requirements to Autonomous Flight>", Dutle et al. 2020. -- Ogma packages should be uncurated so that only the official maintainers make -- changes.@@ -135,7 +141,7 @@ build-depends: base >= 4.11.0.0 && < 5 , optparse-applicative- , ogma-core >= 1.0.8 && < 1.1+ , ogma-core >= 1.0.9 && < 1.1 hs-source-dirs: src
src/CLI/CommandFretComponentSpec2Copilot.hs view
@@ -62,6 +62,7 @@ , fretComponentSpecCoCoSpec :: Bool , fretComponentSpecIntType :: String , fretComponentSpecRealType :: String+ , fretComponentSpecTarget :: String } -- | Transform a FRET component specification into a Copilot specification.@@ -80,6 +81,7 @@ { fretCS2CopilotUseCoCoSpec = fretComponentSpecCoCoSpec c , fretCS2CopilotIntType = fretComponentSpecIntType c , fretCS2CopilotRealType = fretComponentSpecRealType c+ , fretCS2CopilotFilename = fretComponentSpecTarget c } -- * CLI@@ -118,6 +120,13 @@ <> showDefault <> value "Float" )+ <*> strOption+ ( long "target-file-name"+ <> metavar "FILENAME"+ <> help strFretTargetDesc+ <> showDefault+ <> value "fret"+ ) -- | Argument FRET command description strFretArgDesc :: String@@ -134,3 +143,7 @@ -- | Real type mapping flag description. strFretRealTypeDesc :: String strFretRealTypeDesc = "Map real variables to the given type"++-- | Target file name flag description.+strFretTargetDesc :: String+strFretTargetDesc = "Filename prefix for monitoring files in target language"
src/CLI/CommandFretReqsDB2Copilot.hs view
@@ -43,7 +43,8 @@ where -- External imports-import Options.Applicative ( Parser, help, long, metavar, strOption, switch )+import Options.Applicative ( Parser, help, long, metavar, showDefault,+ strOption, switch, value ) -- External imports: command results import Command.Result ( Result )@@ -58,6 +59,7 @@ data CommandOpts = CommandOpts { fretReqsDBFileName :: FilePath , fretReqsDBCoCoSpec :: Bool+ , fretReqsDBTarget :: String } -- | Transform a FRET requirements database containing a temporal logic@@ -75,6 +77,7 @@ internalCommandOpts :: FRETReqsDB2CopilotOptions internalCommandOpts = FRETReqsDB2CopilotOptions { fretReqsDB2CopilotUseCoCoSpec = fretReqsDBCoCoSpec c+ , fretReqsDB2CopilotFilename = fretReqsDBTarget c } -- * CLI@@ -97,6 +100,13 @@ ( long "cocospec" <> help strFretCoCoDesc )+ <*> strOption+ ( long "target-file-name"+ <> metavar "FILENAME"+ <> help strFretTargetDesc+ <> showDefault+ <> value "fret"+ ) -- | Argument FRET command description strFretArgDesc :: String@@ -105,3 +115,7 @@ -- | CoCoSpec flag description strFretCoCoDesc :: String strFretCoCoDesc = "Use CoCoSpec variant of TL properties"++-- | Target file name flag description.+strFretTargetDesc :: String+strFretTargetDesc = "Filename prefix for monitoring files in target language"
src/CLI/CommandROSApp.hs view
@@ -81,7 +81,7 @@ -- | ROS command description commandDesc :: String-commandDesc = "Generate a ROS2 monitoring package"+commandDesc = "Generate a ROS 2 monitoring package" -- | Subparser for the @ros@ command, used to generate a Robot Operating System -- application connected to Copilot monitors.