Commit 039f9fd2 authored by Markus Georg Bendel's avatar Markus Georg Bendel
Browse files

Merge branch 'integrate-someip' into 'master'

# Conflicts:
#   pom.xml
#   src/main/java/de/monticore/lang/monticar/generator/middleware/cli/DistributedTargetGeneratorCli.java
parents 59868f08 231f6e4c
Pipeline #188880 failed with stages
in 3 minutes and 11 seconds
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.basicComp;
......@@ -8,4 +9,4 @@ view PID {
out ? Engine,
out ? Brakes;
}
}
\ No newline at end of file
}
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.basicComp;
stream PID1 for PID {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component BehaviorGeneration {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component CalculateMotionCommands {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
import de.rwth.armin.modeling.autopilot.common.*;
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component DriveToFirstPosition {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component FollowTrajectory {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component IsDriveToFirstPosition {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component Selector {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
component Tests {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior;
import de.rwth.armin.modeling.autopilot.common.*;
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component BehaviorGeneration {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component CalculateMotionCommands {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component Distance2Velocity {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component DriveToFirstPosition {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component FollowTrajectory {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component IsDriveToFirstPosition {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component Selector {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.behavior2;
component TrimPath {
......
/* (c) https://github.com/MontiCore/monticore */
package de.rwth.armin.modeling.autopilot.common;
component Abs {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment