Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
regression-suites
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TASTE
regression-suites
Commits
1ee4a953
Commit
1ee4a953
authored
Sep 17, 2018
by
Thanassis Tsiodras
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitrepos.estec.esa.int/taste/regression-suites
parents
e7896902
14c24db6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
Demo_ABB/DataView.asn
Demo_ABB/DataView.asn
+5
-6
Demo_ExternalLib/contrib/Makefile
Demo_ExternalLib/contrib/Makefile
+1
-1
No files found.
Demo_ABB/DataView.asn
View file @
1ee4a953
...
@@ -18,9 +18,9 @@ Floors ::= ENUMERATED {
...
@@ -18,9 +18,9 @@ Floors ::= ENUMERATED {
-- Types used for the interfacing with the Simulink model
-- Types used for the interfacing with the Simulink model
Lift-control ::= SEQUENCE {
Lift-control ::= SEQUENCE {
direction UpDown,
direction UpDown
DEFAULT down
,
motor OnOff,
motor OnOff
DEFAULT on
,
brake OnOff,
brake OnOff
DEFAULT off
,
door OpenClose
door OpenClose
}
}
...
@@ -45,10 +45,9 @@ Cabin-button ::= CHOICE {
...
@@ -45,10 +45,9 @@ Cabin-button ::= CHOICE {
Start-condition ::= CHOICE {
Start-condition ::= CHOICE {
forever BOOLEAN,
forever BOOLEAN,
nb-of-cycle INTEGER (
1..
255)
nb-of-cycle INTEGER (
50 ..
255)
}
}
END
END
...
...
Demo_ExternalLib/contrib/Makefile
View file @
1ee4a953
...
@@ -4,7 +4,7 @@ lib/libsomelib.a: obj/somelib.o
...
@@ -4,7 +4,7 @@ lib/libsomelib.a: obj/somelib.o
obj/somelib.o
:
src/somelib.c
obj/somelib.o
:
src/somelib.c
mkdir
-p
obj
mkdir
-p
obj
$(CC)
-I
headers/
-c
-o
$@
$<
gcc
-I
headers/
-c
-o
$@
$<
clean
:
clean
:
rm
-rf
obj lib
rm
-rf
obj lib
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment