Skip to content

Commit c9fb502

Browse files
committed
[to be continued...] Working on up-to-date documentation
1 parent f32db99 commit c9fb502

17 files changed

+75
-81
lines changed

README.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Ros Model
1+
# RosTooling
22

33
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![ros-model CI](https://github.com/ipa320/ros-model/actions/workflows/build.yml/badge.svg)](https://github.com/ipa320/ros-model/actions/workflows/build.yml)
44

@@ -11,25 +11,18 @@ The models have associated tools, the following are some examples:
1111
- Code geneators to automatically generate code, documentation, helper scripts...
1212
- (ToBeDone) Graphical editor
1313

14-
1514
Technical Maintainer: [**ipa-nhg**](https://github.com/ipa-nhg/) (**Nadia Hammoudeh Garcia**, **Fraunhofer IPA**) - **[email protected]**
1615

1716
## Projects/Links related to this repository:
1817

19-
- Eclipse Tooling update site: Tbd
20-
2118
Related repositories:
2219
- ROS2 embedded code generator: [rossdl](https://github.com/CoreSenseEU/rossdl)
2320
- Python parsers (packed as a ROS package) for the ROS and ROSsystem models: [ros_model_parser](https://github.com/ipa320/ros_model_parser)
2421
- Python implementation for the static code analyzers and docker containers setups for different ROS distros: [ros-model-extractors](https://github.com/ipa320/ros-model-extractors)
2522
- Runtime monitoring pipelines:
2623
- ROS1: [rosgraph_monitor](https://github.com/ipa320/rosgraph_monitor)
2724
- ROS2: [ros2mode](https://github.com/ipa-cmh/ros2model/)
28-
29-
OLD:
30-
- Language server for the RosModels (web-based models editor): [theia-ros-model](https://github.com/ipa-nhg/theia-ros-model)
31-
- Web interface to automatically extract models from public source code: [model extractor](http://ros-model.seronet-project.de/)
32-
- Source code for the web interface (extract models for non-public available ROS packages): [ros-model-cloud](https://github.com/ipa320/ros-model-cloud)
25+
- Eclipse update site: [RosTooling-update-site](https://github.com/ipa320/RosTooling-update-site)
3326

3427
Publications:
3528
- Paper: Bootstrapping MDE Development from ROS Manual Code - Part 1: Metamodeling [IRC19 paper](https://ieeexplore.ieee.org/document/8675668)
@@ -39,32 +32,40 @@ Publications:
3932

4033
---------------------------------------------------------
4134

42-
# ROS TOOLING MANUAL
35+
# RosTooling Manual
4336

4437
## Installation
4538

46-
Tbd
47-
- [As VS Code plugin](tbd)
39+
- [Eclipse feature](docu/Installation.md#option-1-using-the-release-version-recommended)
4840
- [(Only for tooling developers) From Source code in eclipse](docu/Installation.md#option-2-using-the-eclipse-installer---source-installation-ros-tooling-developers)
41+
- VS Code plugin(tbd) - WIP [vscode-RosTooling](https://github.com/ipa320/vscode-RosTooling)
4942

5043
## Tutorials
5144

5245
- Create component models:
53-
5446
- (Prerequisite) [Add communication objects](docu/NewCommunicationObjects.md)
5547
- [Create a ROS model from your source code(static code analyzer)](docu/NewRosModel.md)
5648
- [Create a ROS model from a deployed robot using our introspection at runtime tool](docu/IntrospectionNode.md)
5749
- [Create new ROS component description](docu/RosModelDescription.md)
5850
- [Generation of code from models](docu/CodeGeneration.md)
5951

6052
- Combine components to form a ROS System
61-
6253
- [Create manually a new RosSystem description](docu/RosSystemModelDescription.md)
63-
- [Create a ROS system model from your source code (static code analyzer)](docu/NewRosSystemModel.md)
64-
- [System Model extraction using introspection at runtime](docu/IntrospectionSystem.md)
54+
55+
- Examples:
56+
- [Simple publisher-subscriber](docu/Example_PubSub.md)
57+
- [Turtlesim](docu/Example_Turtlesim.md)
6558

6659
- [Update Release versions (only for administrators)](docu/Release.md)
6760

6861
## Model examples
6962

7063
The repository [ros-model-examples](https://github.com/ipa-nhg/ros-model-examples) contains a set components and system examples.
64+
65+
---------------------------------------------------------
66+
# OLD (out-of-date)
67+
68+
Links to related repositories:
69+
- Language server for the RosModels (web-based models editor): [theia-ros-model](https://github.com/ipa-nhg/theia-ros-model)
70+
- Web interface to automatically extract models from public source code: [model extractor](http://ros-model.seronet-project.de/)
71+
- Source code for the web interface (extract models for non-public available ROS packages): [ros-model-cloud](https://github.com/ipa320/ros-model-cloud)

docu/Installation.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,42 @@
22

33
### Option 1: Using the Release version (Recommended)
44

5-
In Eclipse, go to *Help* > *Install New Software...*. To install the latest version of the ROS tooling, add the update site URL [http://ros-model.seronet-project.de/updatesite/latest/](http://ros-model.seronet-project.de/updatesite/latest/)(*) in the *Work with* section. If you wish to install an earlier version instead, go to the [the update site](http://ros-model.seronet-project.de/updatesite/), choose the desired version and copy its URL.
5+
The first step is to install eclipse. Please download the installer from the official eclipse [website](https://www.eclipse.org/downloads/packages/installer). Once you start the installer, select the package "Eclipse Modeling Tools".
66

7-
![alt text](images/install_updatesite.png)
8-
9-
If none package is listed, please uncheck the option *Group items by category*. The category *ROS Model* appears in the *Name* area. Check the box in front of *ROS model* and click *Next* to review the list of items to be installed. Click *Next* again to read and accept the terms of the license agreements and afterwards click *Finish*. Eclipse will then start to install the ROS tooling and its dependencies. If you get a security warning about the authenticity, click OK. Finally, when asked, restart Eclipse to complete the installation process.
7+
![alt text](images/install_eclipse_modeling.png)
108

9+
Press next, and then pick the java version 19 and the folder where you would like to install eclipse.
1110

12-
(*) Apart of the latest stable release of the tooling, some pre-releases for new feautures are available. See the following list of current pre-releases:
11+
![alt text](images/install_eclipse_jdk_version.png)
1312

14-
| Name | Code version | Update Site Link | Description |
15-
|---|---|---|---|
16-
|TestComponentStack|https://github.com/ipa320/ros-model/tree/1.4.0_TestComponentStacks|http://ros-model.seronet-project.de/updatesite/TestComponentStacks/latest/| Added to the RosSystem metamodel the option to group components forming components stacks. This pre-release is backward compatible for the models, but the validators and generators are **not** updated. If Xtext report errors, please ignore them. |
17-
| v1.5 | https://github.com/ipa320/ros-model/tree/1.5.0_pre-release |http://ros-model.seronet-project.de/updatesite/pre-release/latest/| Long term version of the grammar (simplified for the 1.4 release). **This version is not backwards compatible with 1.3 and earlier releases**|
13+
Continue the installation, acepting the license, as usual.
1814

15+
Once the installation is completed, go to *Help* > *Install New Software...*. To install the latest version of the ROS tooling, add the update site URL [https://raw.githubusercontent.com/ipa320/RosTooling-update-site/main](https://raw.githubusercontent.com/ipa320/RosTooling-update-site/main)(*) in the *Work with* section.
16+
![alt text](images/install_updatesite.png)
1917

18+
If none package is listed, please uncheck the option *Group items by category*. The category *ROS Model* appears in the *Name* area. Check the box in front of *ROS model* and click *Next* to review the list of items to be installed. Click *Next* again to read and accept the terms of the license agreements and afterwards click *Finish*. Eclipse will then start to install the ROS tooling and its dependencies. If you get a security warning about the authenticity, click OK. Finally, when asked, restart Eclipse to complete the installation process.
2019

2120
To start using the ROS tooling continue with the [step 1](#1-switch-to-the-ros-developer-perspective)
2221

2322
### Option 2: Using the Eclipse Installer - Source installation (ROS tooling developers)
2423

25-
First the java environment have to be setup, for eclipse it is recomended the installation of the version 8 (i.e. X=8) for Ubuntu 16.04 and 11 (i.e. X=11) for the 18.04 and 20.04:
24+
First the java environment have to be setup:
2625
```
27-
sudo apt-get install openjdk-11-jre
26+
sudo apt-get install openjdk-19-jre
2827
```
29-
Download the official [Eclipse Installer](https://www.eclipse.org/downloads/packages/installer) for your preferred operating system. Execute the installer and choose the advanced mode (menu on the right-up corner). Select the Product *Eclipse Modeling tools* package, for the version it is recommended *2021-12*.
28+
Download the official [Eclipse Installer](https://www.eclipse.org/downloads/packages/installer) for your preferred operating system. Execute the installer and choose the advanced mode (menu on the right-up corner). Select the Product *Eclipse Modeling tools* package. And then pick the java version 19.
3029

3130
![alt text](images/eclipse_installer1.png)
3231

3332
Press *Next* and add a new *User project* pressing the green button *+*:
3433
```
3534
Catalog: Github Projects
36-
Resource URIs: https://raw.githubusercontent.com/ipa320/ros-model/master/EclipseInstaller/ROSModel.setup
35+
Resource URIs: https://raw.githubusercontent.com/ipa320/RosTooling/main/EclipseInstaller/ROSModel.setup
3736
```
3837
Sometimes eclipse is not able to find the file, for those cases we recommend to download the file to the local memory of the machine and import it:
3938

4039
```
41-
wget https://raw.githubusercontent.com/ipa320/ros-model/master/EclipseInstaller/ROSModel.setup
40+
wget https://raw.githubusercontent.com/ipa320/RosTooling/main/EclipseInstaller/ROSModel.setup
4241
```
4342

4443
![alt text](images/eclipse_installer2.png)
File renamed without changes.

docu/RosModelDescription.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## TBD

docu/RosSystemModelDescription.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## TBD
46.9 KB
Loading
32.2 KB
Loading

docu/introspection.rosinstall

Lines changed: 0 additions & 8 deletions
This file was deleted.

docu/CompareSpec.md renamed to docu/old/CompareSpec.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ If you want to check that the model of your node is following a concrete specifi
44

55
Press the button of ROS model checker:
66

7-
![alt text](images/compare_icon.png)
7+
![alt text](../images/compare_icon.png)
88

99
Select as input your model file and as specification the model that defines the standard you want to follow (some specifications are available under **de.fraunhofer.ipa.ros.communication.objects/BasicSpecs**).
1010

11-
![alt text](images/compare_select.png)
11+
![alt text](../images/compare_select.png)
1212

1313
To use this feature you have to locate your model file in your eclipse workspace by importing the project that contains it.
1414

1515
By pressing *Finish* a dialog will give you a summary of your analysis:
1616

17-
![alt text](images/compare_result.png)
17+
![alt text](../images/compare_result.png)

docu/ModelCombine.md renamed to docu/old/ModelCombine.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ This feature allows the merge of two different ROS system models. To combine t
66

77

88

9-
![CombineModels](images/CombineModels_1.png)
9+
![CombineModels](../images/CombineModels_1.png)
1010

1111
A pop-up menu will ask you for the two models to combine (have to be on imported project of your workspace) and the path where to save the resulted file (that will be called *result.rossystem*. Finally the user can check the box "Combine to the minimal model (restrictive strategy)" to switch the strategy.
1212

13-
![CombineModels](images/CombineModels_2.png)
13+
![CombineModels](../images/CombineModels_2.png)
1414

1515

1616

0 commit comments

Comments
 (0)