Commit 7c6517b8 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Update makefile

parent 6c2d5567
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
--! File generated by asn2aadl v2.2-r327f5c8: DO NOT EDIT ! --! File generated by asn2aadl v2.2-r327f5c8: DO NOT EDIT !
-------------------------------------------------------- --------------------------------------------------------
--! MadeInFastMode:True: --! MadeInFastMode:True:
--! InputASN1FileChecksum:ab9d290c8d36e7745075bc55a61d8ddc:/home/taste/tool-src/kazoo/test/TrafficLight_Basic/DataView.asn: --! InputASN1FileChecksum:aa0fb4e83c64582b870bb04ffb92f712:/home/taste/tool-src/kazoo/test/TrafficLight_Basic/DataView.asn:
--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn: --! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn:
-------------------------------------------------------- --------------------------------------------------------
...@@ -50,7 +50,7 @@ PROPERTIES ...@@ -50,7 +50,7 @@ PROPERTIES
Source_Language => (ASN1); Source_Language => (ASN1);
-- name of the corresponding data type in the source file: -- name of the corresponding data type in the source file:
Type_Source_Name => "Command"; Type_Source_Name => "Command";
TASTE::Position_In_File => [ line => 9 ; column => 1 ; ]; TASTE::Position_In_File => [ line => 10 ; column => 1 ; ];
-- what kind of type is this? -- what kind of type is this?
TASTE::ASN1_Basic_Type =>aENUMERATED; TASTE::ASN1_Basic_Type =>aENUMERATED;
END Command; END Command;
...@@ -89,7 +89,7 @@ PROPERTIES ...@@ -89,7 +89,7 @@ PROPERTIES
Source_Language => (ASN1); Source_Language => (ASN1);
-- name of the corresponding data type in the source file: -- name of the corresponding data type in the source file:
Type_Source_Name => "P-Light"; Type_Source_Name => "P-Light";
TASTE::Position_In_File => [ line => 7 ; column => 1 ; ]; TASTE::Position_In_File => [ line => 8 ; column => 1 ; ];
-- what kind of type is this? -- what kind of type is this?
TASTE::ASN1_Basic_Type =>aENUMERATED; TASTE::ASN1_Basic_Type =>aENUMERATED;
END P_Light; END P_Light;
......
...@@ -4,6 +4,7 @@ IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes; ...@@ -4,6 +4,7 @@ IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes;
TL-Color ::= ENUMERATED { red, orange, green} TL-Color ::= ENUMERATED { red, orange, green}
P-Light ::= ENUMERATED { go, wait } P-Light ::= ENUMERATED { go, wait }
Command ::= ENUMERATED { request-passage } Command ::= ENUMERATED { request-passage }
......
...@@ -5,9 +5,13 @@ all: c ...@@ -5,9 +5,13 @@ all: c
c: work/glue_built c: work/glue_built
$(MAKE) -C work $(MAKE) -C work
skeletons: InterfaceView.aadl DataView.aadl skeletons:
$(MAKE) work/skeletons_built
work/skeletons_built: InterfaceView.aadl DataView.aadl
$(KAZOO) --gw -o work $(KAZOO) --gw -o work
$(MAKE) -C work dataview $(MAKE) -C work dataview
touch skeletons_built
work/glue_built: InterfaceView.aadl DeploymentView.aadl DataView.aadl work/glue_built: InterfaceView.aadl DeploymentView.aadl DataView.aadl
$(KAZOO) -p --glue --gw -o work $(KAZOO) -p --glue --gw -o work
......
...@@ -7,17 +7,6 @@ process Controller; ...@@ -7,17 +7,6 @@ process Controller;
START; START;
/* CIF NEXTSTATE (15, 119), (147, 35) */ /* CIF NEXTSTATE (15, 119), (147, 35) */
NEXTSTATE Everybody_Stopped; NEXTSTATE Everybody_Stopped;
/* CIF state (237, 112), (73, 35) */
state Walking;
/* CIF input (238, 167), (70, 35) */
input Clock;
/* CIF output (211, 222), (124, 35) */
output Info_User (Wait);
/* CIF PROCEDURECALL (184, 277), (178, 35) */
call Set_Timer (2000, Clock);
/* CIF NEXTSTATE (210, 332), (127, 35) */
NEXTSTATE Walking_Is_Over;
endstate;
/* CIF state (430, 116), (127, 35) */ /* CIF state (430, 116), (127, 35) */
state Walking_Is_Over; state Walking_Is_Over;
/* CIF input (373, 171), (70, 35) */ /* CIF input (373, 171), (70, 35) */
...@@ -31,6 +20,17 @@ process Controller; ...@@ -31,6 +20,17 @@ process Controller;
/* CIF NEXTSTATE (504, 281), (70, 35) */ /* CIF NEXTSTATE (504, 281), (70, 35) */
NEXTSTATE -; NEXTSTATE -;
endstate; endstate;
/* CIF state (237, 112), (73, 35) */
state Walking;
/* CIF input (238, 167), (70, 35) */
input Clock;
/* CIF output (211, 222), (124, 35) */
output Info_User (Wait);
/* CIF PROCEDURECALL (184, 277), (178, 35) */
call Set_Timer (2000, Clock);
/* CIF NEXTSTATE (210, 332), (127, 35) */
NEXTSTATE Walking_Is_Over;
endstate;
/* CIF state (15, 119), (147, 35) */ /* CIF state (15, 119), (147, 35) */
state Everybody_Stopped; state Everybody_Stopped;
/* CIF input (53, 174), (70, 35) */ /* CIF input (53, 174), (70, 35) */
...@@ -51,13 +51,13 @@ process Controller; ...@@ -51,13 +51,13 @@ process Controller;
out (Go_Orange); out (Go_Orange);
/* CIF START (604, 136), (70, 35) */ /* CIF START (604, 136), (70, 35) */
START short ; START short ;
/* CIF NEXTSTATE (583, 191), (110, 35) */ /* CIF NEXTSTATE (584, 191), (110, 35) */
NEXTSTATE Second_Delay; NEXTSTATE Second_Delay;
/* CIF START (343, 131), (70, 35) */ /* CIF START (343, 131), (70, 35) */
START; START;
/* CIF NEXTSTATE (331, 186), (93, 35) */ /* CIF NEXTSTATE (331, 186), (93, 35) */
NEXTSTATE First_Delay; NEXTSTATE First_Delay;
/* CIF state (583, 191), (110, 35) */ /* CIF state (584, 191), (110, 35) */
state Second_Delay; state Second_Delay;
/* CIF input (604, 246), (70, 35) */ /* CIF input (604, 246), (70, 35) */
input Clock; input Clock;
...@@ -74,7 +74,7 @@ process Controller; ...@@ -74,7 +74,7 @@ process Controller;
NEXTSTATE Second_Delay; NEXTSTATE Second_Delay;
/* CIF input (361, 241), (123, 35) */ /* CIF input (361, 241), (123, 35) */
input Button (cmd); input Button (cmd);
/* CIF PROCEDURECALL (336, 296), (171, 35) */ /* CIF PROCEDURECALL (337, 296), (171, 35) */
call Set_Timer (5000, Clock); call Set_Timer (5000, Clock);
/* CIF NEXTSTATE (364, 346), (117, 35) */ /* CIF NEXTSTATE (364, 346), (117, 35) */
NEXTSTATE Second_Delay; NEXTSTATE Second_Delay;
...@@ -91,39 +91,17 @@ process Controller; ...@@ -91,39 +91,17 @@ process Controller;
/* CIF ENDTEXT */ /* CIF ENDTEXT */
/* CIF START (155, 40), (70, 33) */ /* CIF START (155, 40), (70, 33) */
START; START;
/* CIF NEXTSTATE (152, 90), (75, 35) */ /* CIF NEXTSTATE (152, 93), (75, 35) */
NEXTSTATE Off; NEXTSTATE Off;
/* CIF state (828, 314), (70, 35) */
state Green;
/* CIF connect (863, 369), (0, 35) */
connect Go_Orange;
/* CIF PROCEDURECALL (762, 419), (201, 35) */
call Set_Timer (2000, Clock);
/* CIF output (805, 474), (114, 35) */
output Color (Orange);
/* CIF NEXTSTATE (828, 524), (70, 35) */
NEXTSTATE Orange;
endstate;
/* CIF state (686, 61), (70, 35) */
state Orange;
/* CIF input (686, 116), (70, 35) */
input Clock;
/* CIF PROCEDURECALL (632, 171), (178, 35) */
call Set_Timer (1000, Clock);
/* CIF output (674, 226), (92, 35) */
output Color (Red);
/* CIF NEXTSTATE (686, 276), (70, 35) */
NEXTSTATE Red;
endstate;
/* CIF state (443, 49), (70, 35) */ /* CIF state (443, 49), (70, 35) */
state Red; state Red;
/* CIF connect (478, 104), (0, 35) */ /* CIF connect (478, 104), (0, 35) */
connect Go_Green; connect Go_Green;
/* CIF PROCEDURECALL (389, 159), (178, 35) */ /* CIF PROCEDURECALL (389, 159), (178, 35) */
call Set_Timer (5000, Clock); call Set_Timer (5000, Clock);
/* CIF output (424, 214), (106, 35) */ /* CIF output (425, 214), (106, 35) */
output Color (Green); output Color (Green);
/* CIF decision (415, 264), (124, 50) */ /* CIF decision (416, 264), (124, 50) */
decision Walk_requested; decision Walk_requested;
/* CIF ANSWER (364, 334), (70, 24) */ /* CIF ANSWER (364, 334), (70, 24) */
(True): (True):
...@@ -135,17 +113,39 @@ process Controller; ...@@ -135,17 +113,39 @@ process Controller;
NEXTSTATE Green; NEXTSTATE Green;
enddecision; enddecision;
endstate; endstate;
/* CIF state (152, 90), (75, 35) */ /* CIF state (686, 61), (70, 35) */
state Orange;
/* CIF input (686, 116), (70, 35) */
input Clock;
/* CIF PROCEDURECALL (632, 171), (178, 35) */
call Set_Timer (1000, Clock);
/* CIF output (675, 226), (92, 35) */
output Color (Red);
/* CIF NEXTSTATE (686, 276), (70, 35) */
NEXTSTATE Red;
endstate;
/* CIF state (828, 314), (70, 35) */
state Green;
/* CIF connect (863, 369), (0, 35) */
connect Go_Orange;
/* CIF PROCEDURECALL (762, 419), (201, 35) */
call Set_Timer (2000, Clock);
/* CIF output (806, 474), (114, 35) */
output Color (Orange);
/* CIF NEXTSTATE (828, 524), (70, 35) */
NEXTSTATE Orange;
endstate;
/* CIF state (152, 93), (75, 35) */
state Off; state Off;
/* CIF input (122, 145), (134, 35) */ /* CIF input (122, 148), (134, 35) */
input Initialize (dummy); input Initialize (dummy);
/* CIF PROCEDURECALL (101, 200), (178, 35) */ /* CIF PROCEDURECALL (100, 203), (178, 35) */
call Set_Timer (1000, Clock); call Set_Timer (1000, Clock);
/* CIF output (143, 255), (92, 35) */ /* CIF output (143, 258), (92, 35) */
output Color (Red); output Color (Red);
/* CIF output (127, 310), (124, 35) */ /* CIF output (127, 313), (124, 35) */
output Info_User (Wait); output Info_User (Wait);
/* CIF NEXTSTATE (159, 360), (61, 35) */ /* CIF NEXTSTATE (158, 363), (61, 35) */
NEXTSTATE Red; NEXTSTATE Red;
endstate; endstate;
endprocess Controller; endprocess Controller;
\ No newline at end of file
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