Commit 4f4c358d authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files
parents 8f5397a0 08b81de1
......@@ -197,6 +197,9 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} ${CP_FILES}
@@-- Copy default UserWidgets.py file for user to customise the GUI widgets
# User can edit at will the customisable user widgets python module:
cp -u $(shell taste-config --prefix)/share/AutoGUI/UserWidgets.py binaries/@_LOWER:Function_Names_@_GUI
@@-- Copy InterfaceView.aadl, it is needed to replay MSC scenarios
# Interface view must be placed in the gui folder to allow replaying MSCs
cp -u ../InterfaceView.aadl binaries/@_LOWER:Function_Names_@_GUI
@@END_IF@@ @@-- End of GUI-specifics
@@END_TABLE@@
touch $@
......
......@@ -2,7 +2,7 @@
--! File generated by asn2aadl v2.2-r327f5c8: DO NOT EDIT !
--------------------------------------------------------
--! 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:
--------------------------------------------------------
......@@ -50,7 +50,7 @@ PROPERTIES
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
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?
TASTE::ASN1_Basic_Type =>aENUMERATED;
END Command;
......@@ -89,7 +89,7 @@ PROPERTIES
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
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?
TASTE::ASN1_Basic_Type =>aENUMERATED;
END P_Light;
......
......@@ -4,6 +4,7 @@ IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes;
TL-Color ::= ENUMERATED { red, orange, green}
P-Light ::= ENUMERATED { go, wait }
Command ::= ENUMERATED { request-passage }
......
......@@ -5,9 +5,16 @@ all: c
c: work/glue_built
$(MAKE) -C work
skeletons: InterfaceView.aadl DataView.aadl
edit:
taste
skeletons:
$(MAKE) work/skeletons_built
work/skeletons_built: InterfaceView.aadl DataView.aadl
$(KAZOO) --gw -o work
$(MAKE) -C work dataview
touch work/skeletons_built
work/glue_built: InterfaceView.aadl DeploymentView.aadl DataView.aadl
$(KAZOO) -p --glue --gw -o work
......
......@@ -7,17 +7,6 @@ process Controller;
START;
/* CIF NEXTSTATE (15, 119), (147, 35) */
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) */
state Walking_Is_Over;
/* CIF input (373, 171), (70, 35) */
......@@ -31,6 +20,17 @@ process Controller;
/* CIF NEXTSTATE (504, 281), (70, 35) */
NEXTSTATE -;
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) */
state Everybody_Stopped;
/* CIF input (53, 174), (70, 35) */
......@@ -51,13 +51,13 @@ process Controller;
out (Go_Orange);
/* CIF START (604, 136), (70, 35) */
START short ;
/* CIF NEXTSTATE (583, 191), (110, 35) */
/* CIF NEXTSTATE (584, 191), (110, 35) */
NEXTSTATE Second_Delay;
/* CIF START (343, 131), (70, 35) */
START;
/* CIF NEXTSTATE (331, 186), (93, 35) */
NEXTSTATE First_Delay;
/* CIF state (583, 191), (110, 35) */
/* CIF state (584, 191), (110, 35) */
state Second_Delay;
/* CIF input (604, 246), (70, 35) */
input Clock;
......@@ -74,7 +74,7 @@ process Controller;
NEXTSTATE Second_Delay;
/* CIF input (361, 241), (123, 35) */
input Button (cmd);
/* CIF PROCEDURECALL (336, 296), (171, 35) */
/* CIF PROCEDURECALL (337, 296), (171, 35) */
call Set_Timer (5000, Clock);
/* CIF NEXTSTATE (364, 346), (117, 35) */
NEXTSTATE Second_Delay;
......@@ -91,39 +91,17 @@ process Controller;
/* CIF ENDTEXT */
/* CIF START (155, 40), (70, 33) */
START;
/* CIF NEXTSTATE (152, 90), (75, 35) */
/* CIF NEXTSTATE (152, 93), (75, 35) */
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) */
state Red;
/* CIF connect (478, 104), (0, 35) */
connect Go_Green;
/* CIF PROCEDURECALL (389, 159), (178, 35) */
call Set_Timer (5000, Clock);
/* CIF output (424, 214), (106, 35) */
/* CIF output (425, 214), (106, 35) */
output Color (Green);
/* CIF decision (415, 264), (124, 50) */
/* CIF decision (416, 264), (124, 50) */
decision Walk_requested;
/* CIF ANSWER (364, 334), (70, 24) */
(True):
......@@ -135,17 +113,39 @@ process Controller;
NEXTSTATE Green;
enddecision;
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;
/* CIF input (122, 145), (134, 35) */
/* CIF input (122, 148), (134, 35) */
input Initialize (dummy);
/* CIF PROCEDURECALL (101, 200), (178, 35) */
/* CIF PROCEDURECALL (100, 203), (178, 35) */
call Set_Timer (1000, Clock);
/* CIF output (143, 255), (92, 35) */
/* CIF output (143, 258), (92, 35) */
output Color (Red);
/* CIF output (127, 310), (124, 35) */
/* CIF output (127, 313), (124, 35) */
output Info_User (Wait);
/* CIF NEXTSTATE (159, 360), (61, 35) */
/* CIF NEXTSTATE (158, 363), (61, 35) */
NEXTSTATE Red;
endstate;
endprocess Controller;
\ No newline at end of file
PACKAGE Process_Package_proxy
PUBLIC
WITH Process_Package;
WITH AI;
SYSTEM DeploymentView
EXTENDS Process_Package::DeploymentView
END DeploymentView;
SYSTEM IMPLEMENTATION DeploymentView.final
EXTENDS Process_Package::DeploymentView.final
PROPERTIES
AI::root_system => "SELECTED";
Stack_Size => 8 kbyte APPLIES TO Stm32_Controller.controller_Button;
Stack_Size => 8 kbyte APPLIES TO Stm32_Controller.controller_Initialize;
Stack_Size => 8 kbyte APPLIES TO Stm32_Controller.controller_clock;
Stack_Size => 8 kbyte APPLIES TO Stm32_Controller.stm32_controller_timer_manager_Tick;
Stack_Size => 8 kbyte APPLIES TO Stm32_Controller.watchdog_Kick_WD;
Stack_Size => 8 kbyte APPLIES TO Stm32_Controller.watchdog_pulse;
Stack_Size => 8kbyte APPLIES TO Stm32_Controller.stm32_debug_Poll_Button;
END DeploymentView.final;
END Process_Package_proxy;
--------------------------------------------------------
--! File generated by asn2aadl v2.2-r327f5c8: DO NOT EDIT !
--------------------------------------------------------
--! MadeInFastMode:True:
--! InputASN1FileChecksum:ab9d290c8d36e7745075bc55a61d8ddc:/home/taste/tool-src/kazoo/test/TrafficLight_stm32f407_NonDistrib/DataView.asn:
--! InputASN1FileChecksum:ee46426c862c2136923e35b32818b60c:/home/taste/tool-src/kazoo/test/TrafficLight_stm32f407_NonDistrib/dataview-stm32.asn:
--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn:
--------------------------------------------------------
package DataView
public
with Data_Model;
with Taste;
with Base_Types;
with Deployment;
DATA Simulink_Tunable_Parameter
PROPERTIES
TASTE::Ada_Package_Name => "TASTE_Directives";
Type_Source_Name => "Simulink-Tunable-Parameter";
Deployment::ASN1_Module_Name => "TASTE-Directives";
TASTE::Forbid_in_PI => true;
END Simulink_Tunable_Parameter;
DATA Timer
PROPERTIES
TASTE::Ada_Package_Name => "TASTE_Directives";
Type_Source_Name => "Timer";
Deployment::ASN1_Module_Name => "TASTE-Directives";
TASTE::Forbid_in_PI => true;
END Timer;
DATA Taste_directive
PROPERTIES
TASTE::Ada_Package_Name => "TASTE_Directives";
Type_Source_Name => "Taste-directive";
Deployment::ASN1_Module_Name => "TASTE-Directives";
TASTE::Forbid_in_PI => true;
END Taste_directive;
data Stream_Element_Buffer
-- Root type for buffer elements
properties
Data_Model::Data_Representation => Character;
end Stream_Element_Buffer;
DATA Command
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-src/kazoo/test/TrafficLight_stm32f407_NonDistrib/DataView.asn");
TASTE::Ada_Package_Name => "TRAFFICLIGHT_BASIC_DATAVIEW";
Deployment::ASN1_Module_Name => "TRAFFICLIGHT-BASIC-DATAVIEW";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "Command";
TASTE::Position_In_File => [ line => 9 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aENUMERATED;
END Command;
DATA IMPLEMENTATION Command.impl
END Command.impl;
DATA Command_Buffer_Max
END Command_Buffer_Max;
DATA IMPLEMENTATION Command_Buffer_Max.impl
-- Buffer to hold a marshalled data of type Command
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END Command_Buffer_Max.impl;
DATA Command_Buffer
END Command_Buffer;
DATA IMPLEMENTATION Command_Buffer.impl
-- Buffer to hold a marshalled data of type Command
SUBCOMPONENTS
Buffer : data Command_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END Command_Buffer.impl;
DATA Debug_PrintableString
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-src/kazoo/test/TrafficLight_stm32f407_NonDistrib/dataview-stm32.asn");
TASTE::Ada_Package_Name => "STM32_Dataview";
Deployment::ASN1_Module_Name => "STM32-Dataview";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "Debug-PrintableString";
TASTE::Position_In_File => [ line => 4 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aSTRING;
END Debug_PrintableString;
DATA IMPLEMENTATION Debug_PrintableString.impl
END Debug_PrintableString.impl;
DATA Debug_PrintableString_Buffer_Max
END Debug_PrintableString_Buffer_Max;
DATA IMPLEMENTATION Debug_PrintableString_Buffer_Max.impl
-- Buffer to hold a marshalled data of type Debug_PrintableString
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END Debug_PrintableString_Buffer_Max.impl;
DATA Debug_PrintableString_Buffer
END Debug_PrintableString_Buffer;
DATA IMPLEMENTATION Debug_PrintableString_Buffer.impl
-- Buffer to hold a marshalled data of type Debug_PrintableString
SUBCOMPONENTS
Buffer : data Debug_PrintableString_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END Debug_PrintableString_Buffer.impl;
DATA P_Light
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-src/kazoo/test/TrafficLight_stm32f407_NonDistrib/DataView.asn");
TASTE::Ada_Package_Name => "TRAFFICLIGHT_BASIC_DATAVIEW";
Deployment::ASN1_Module_Name => "TRAFFICLIGHT-BASIC-DATAVIEW";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "P-Light";
TASTE::Position_In_File => [ line => 7 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aENUMERATED;
END P_Light;
DATA IMPLEMENTATION P_Light.impl
END P_Light.impl;
DATA P_Light_Buffer_Max
END P_Light_Buffer_Max;
DATA IMPLEMENTATION P_Light_Buffer_Max.impl
-- Buffer to hold a marshalled data of type P_Light
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END P_Light_Buffer_Max.impl;
DATA P_Light_Buffer
END P_Light_Buffer;
DATA IMPLEMENTATION P_Light_Buffer.impl
-- Buffer to hold a marshalled data of type P_Light
SUBCOMPONENTS
Buffer : data P_Light_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END P_Light_Buffer.impl;
DATA T_Boolean
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-Boolean";
TASTE::Position_In_File => [ line => 14 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aBOOLEAN;
END T_Boolean;
DATA IMPLEMENTATION T_Boolean.impl
END T_Boolean.impl;
DATA T_Boolean_Buffer_Max
END T_Boolean_Buffer_Max;
DATA IMPLEMENTATION T_Boolean_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_Boolean
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_Boolean_Buffer_Max.impl;
DATA T_Boolean_Buffer
END T_Boolean_Buffer;
DATA IMPLEMENTATION T_Boolean_Buffer.impl
-- Buffer to hold a marshalled data of type T_Boolean
SUBCOMPONENTS
Buffer : data T_Boolean_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_Boolean_Buffer.impl;
DATA T_Int32
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-Int32";
TASTE::Position_In_File => [ line => 6 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aINTEGER;
END T_Int32;
DATA IMPLEMENTATION T_Int32.impl
END T_Int32.impl;
DATA T_Int32_Buffer_Max
END T_Int32_Buffer_Max;
DATA IMPLEMENTATION T_Int32_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_Int32
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_Int32_Buffer_Max.impl;
DATA T_Int32_Buffer
END T_Int32_Buffer;
DATA IMPLEMENTATION T_Int32_Buffer.impl
-- Buffer to hold a marshalled data of type T_Int32
SUBCOMPONENTS
Buffer : data T_Int32_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_Int32_Buffer.impl;
DATA T_Int8
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-Int8";
TASTE::Position_In_File => [ line => 10 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aINTEGER;
END T_Int8;
DATA IMPLEMENTATION T_Int8.impl
END T_Int8.impl;
DATA T_Int8_Buffer_Max
END T_Int8_Buffer_Max;
DATA IMPLEMENTATION T_Int8_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_Int8
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_Int8_Buffer_Max.impl;
DATA T_Int8_Buffer
END T_Int8_Buffer;
DATA IMPLEMENTATION T_Int8_Buffer.impl
-- Buffer to hold a marshalled data of type T_Int8
SUBCOMPONENTS
Buffer : data T_Int8_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_Int8_Buffer.impl;
DATA T_UInt32
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-UInt32";
TASTE::Position_In_File => [ line => 8 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aINTEGER;
END T_UInt32;
DATA IMPLEMENTATION T_UInt32.impl
END T_UInt32.impl;
DATA T_UInt32_Buffer_Max
END T_UInt32_Buffer_Max;
DATA IMPLEMENTATION T_UInt32_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_UInt32
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_UInt32_Buffer_Max.impl;
DATA T_UInt32_Buffer
END T_UInt32_Buffer;
DATA IMPLEMENTATION T_UInt32_Buffer.impl
-- Buffer to hold a marshalled data of type T_UInt32
SUBCOMPONENTS
Buffer : data T_UInt32_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_UInt32_Buffer.impl;
DATA T_UInt8
PROPERTIES
-- name of the ASN.1 source file:
Source_Text => ("/home/taste/tool-inst/share/taste-types/taste-types.asn");
TASTE::Ada_Package_Name => "TASTE_BasicTypes";
Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
Source_Language => (ASN1);
-- name of the corresponding data type in the source file:
Type_Source_Name => "T-UInt8";
TASTE::Position_In_File => [ line => 12 ; column => 1 ; ];
-- what kind of type is this?
TASTE::ASN1_Basic_Type =>aINTEGER;
END T_UInt8;
DATA IMPLEMENTATION T_UInt8.impl
END T_UInt8.impl;
DATA T_UInt8_Buffer_Max
END T_UInt8_Buffer_Max;
DATA IMPLEMENTATION T_UInt8_Buffer_Max.impl
-- Buffer to hold a marshalled data of type T_UInt8
PROPERTIES
Data_Model::Data_Representation => array;
Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
END T_UInt8_Buffer_Max.impl;
DATA T_UInt8_Buffer
END T_UInt8_Buffer;
DATA IMPLEMENTATION T_UInt8_Buffer.impl
-- Buffer to hold a marshalled data of type T_UInt8
SUBCOMPONENTS
Buffer : data T_UInt8_Buffer_Max.impl;
Length : data Base_Types::Unsigned_32;
PROPERTIES
Data_Model::Data_Representation => Struct;
END T_UInt8_Buffer.impl;
DATA TL_Color
PROPERTIES