Commit 4e5bb3a6 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Update pngs

parent b0fc1415
...@@ -26,7 +26,7 @@ DEVICE STM32F4_serial_pohiada ...@@ -26,7 +26,7 @@ DEVICE STM32F4_serial_pohiada
EXTENDS ocarina_drivers::STM32F4_serial EXTENDS ocarina_drivers::STM32F4_serial
FEATURES FEATURES
link : REFINED TO REQUIRES BUS ACCESS ocarina_buses::serial.generic { link : REFINED TO REQUIRES BUS ACCESS ocarina_buses::serial.generic {
Taste::coordinates => "111178 98108"; Taste::coordinates => "110233 98108";
}; };
PROPERTIES PROPERTIES
Taste::Interface_Coordinates => "123886 116060" APPLIES TO link; Taste::Interface_Coordinates => "123886 116060" APPLIES TO link;
...@@ -63,7 +63,7 @@ DEVICE generic_serial_pohiada ...@@ -63,7 +63,7 @@ DEVICE generic_serial_pohiada
EXTENDS ocarina_drivers::generic_serial EXTENDS ocarina_drivers::generic_serial
FEATURES FEATURES
link : REFINED TO REQUIRES BUS ACCESS ocarina_buses::serial.generic { link : REFINED TO REQUIRES BUS ACCESS ocarina_buses::serial.generic {
Taste::coordinates => "169286 98265"; Taste::coordinates => "169129 98265";
}; };
PROPERTIES PROPERTIES
Taste::Interface_Coordinates => "167507 116060" APPLIES TO link; Taste::Interface_Coordinates => "167507 116060" APPLIES TO link;
...@@ -112,14 +112,14 @@ SUBCOMPONENTS ...@@ -112,14 +112,14 @@ SUBCOMPONENTS
Taste::FunctionName => "watchdog"; Taste::FunctionName => "watchdog";
}; };
stm32_controller : PROCESS deploymentview::DV::Node1::stm32_controller.others { stm32_controller : PROCESS deploymentview::DV::Node1::stm32_controller.others {
Taste::coordinates => "93490 69482 131385 82832"; Taste::coordinates => "92545 69482 130440 82832";
Deployment::Port_Number => 0; Deployment::Port_Number => 0;
}; };
stm32f407_discovery_gnat2017 : PROCESSOR ocarina_processors_arm::stm32f407_discovery.gnat2017 { stm32f407_discovery_gnat2017 : PROCESSOR ocarina_processors_arm::stm32f407_discovery.gnat2017 {
Taste::coordinates => "88753 62141 136122 85510"; Taste::coordinates => "87808 62141 135177 85510";
}; };
STM32F4_serial_pohiada : DEVICE deploymentview::DV::Node1::STM32F4_serial_pohiada.others { STM32F4_serial_pohiada : DEVICE deploymentview::DV::Node1::STM32F4_serial_pohiada.others {
Taste::coordinates => "100785 89289 123619 98108"; Taste::coordinates => "99840 89289 122674 98108";
}; };
CONNECTIONS CONNECTIONS
STM32F4_serial_pohiada_serial_generic_link : BUS ACCESS STM32F4_serial_pohiada_serial_generic -> STM32F4_serial_pohiada.link; STM32F4_serial_pohiada_serial_generic_link : BUS ACCESS STM32F4_serial_pohiada_serial_generic -> STM32F4_serial_pohiada.link;
...@@ -149,7 +149,7 @@ SUBCOMPONENTS ...@@ -149,7 +149,7 @@ SUBCOMPONENTS
Taste::coordinates => "156342 61636 195144 87084"; Taste::coordinates => "156342 61636 195144 87084";
}; };
generic_serial_pohiada : DEVICE deploymentview::DV::Node2::generic_serial_pohiada.others { generic_serial_pohiada : DEVICE deploymentview::DV::Node2::generic_serial_pohiada.others {
Taste::coordinates => "162987 88816 188341 98265"; Taste::coordinates => "162830 88816 188184 98265";
}; };
CONNECTIONS CONNECTIONS
generic_serial_pohiada_serial_generic_link : BUS ACCESS generic_serial_pohiada_serial_generic -> generic_serial_pohiada.link; generic_serial_pohiada_serial_generic_link : BUS ACCESS generic_serial_pohiada_serial_generic -> generic_serial_pohiada.link;
...@@ -165,7 +165,7 @@ END deploymentview; ...@@ -165,7 +165,7 @@ END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS SUBCOMPONENTS
Node1 : SYSTEM Node1.others { Node1 : SYSTEM Node1.others {
Taste::coordinates => "82832 51653 142043 104092"; Taste::coordinates => "81887 51653 141098 104092";
}; };
Node2 : SYSTEM Node2.others { Node2 : SYSTEM Node2.others {
Taste::coordinates => "151492 51810 199994 100942"; Taste::coordinates => "151492 51810 199994 100942";
...@@ -176,10 +176,10 @@ SUBCOMPONENTS ...@@ -176,10 +176,10 @@ SUBCOMPONENTS
interfaceview : SYSTEM interfaceview::IV::interfaceview.others; interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
CONNECTIONS CONNECTIONS
Connection2 : BUS ACCESS serial_generic -> Node1.STM32F4_serial_pohiada_serial_generic { Connection2 : BUS ACCESS serial_generic -> Node1.STM32F4_serial_pohiada_serial_generic {
Taste::coordinates => "111178 98108 111178 107084 123886 107084 123886 116060"; Taste::coordinates => "110233 98108 110233 107084 123886 107084 123886 116060";
}; };
Connection1 : BUS ACCESS serial_generic -> Node2.generic_serial_pohiada_serial_generic { Connection1 : BUS ACCESS serial_generic -> Node2.generic_serial_pohiada_serial_generic {
Taste::coordinates => "169286 98265 169286 107320 167507 107320 167507 116060"; Taste::coordinates => "169129 98265 169129 107320 167507 107320 167507 116060";
}; };
PROPERTIES PROPERTIES
Actual_Connection_Binding => (reference (serial_generic)) APPLIES TO interfaceview.Controller_PI_Button_User_RI_Button; Actual_Connection_Binding => (reference (serial_generic)) APPLIES TO interfaceview.Controller_PI_Button_User_RI_Button;
...@@ -192,6 +192,6 @@ PROPERTIES ...@@ -192,6 +192,6 @@ PROPERTIES
Taste::coordinates => "0 0 297000 210000"; Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.3"; Taste::version => "2.3";
Taste::interfaceView => "InterfaceView.aadl"; Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl"); Taste::HWLibraries => ("../../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV; END deploymentview::DV;
...@@ -101,63 +101,63 @@ END RI_Kick_WD.others; ...@@ -101,63 +101,63 @@ END RI_Kick_WD.others;
SYSTEM Controller SYSTEM Controller
FEATURES FEATURES
PI_Button : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Controller::PI_Button.others { PI_Button : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Controller::PI_Button.others {
Taste::coordinates => "111492 62361"; Taste::coordinates => "111649 62204";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 10 ms; Taste::RCMperiod => 10 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "Button"; Taste::InterfaceName => "Button";
}; };
PI_Initialize : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Controller::PI_Initialize.others { PI_Initialize : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Controller::PI_Initialize.others {
Taste::coordinates => "111492 76065"; Taste::coordinates => "111649 75908";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms; Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "Initialize"; Taste::InterfaceName => "Initialize";
}; };
RI_Color : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::User::PI_Color.others { RI_Color : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::User::PI_Color.others {
Taste::coordinates => "111492 67086"; Taste::coordinates => "111649 66929";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Color"; Taste::InterfaceName => "Color";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Info_User : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::User::PI_Info_User.others { RI_Info_User : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::User::PI_Info_User.others {
Taste::coordinates => "111492 70237"; Taste::coordinates => "111649 70080";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Info_User"; Taste::InterfaceName => "Info_User";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Green_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Green_On.others { RI_Green_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Green_On.others {
Taste::coordinates => "105192 89289"; Taste::coordinates => "105349 89132";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Green_On"; Taste::InterfaceName => "Green_On";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Orange_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Orange_On.others { RI_Orange_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Orange_On.others {
Taste::coordinates => "93224 89289"; Taste::coordinates => "93381 89132";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Orange_On"; Taste::InterfaceName => "Orange_On";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Red_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Red_On.others { RI_Red_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Red_On.others {
Taste::coordinates => "83146 89289"; Taste::coordinates => "83303 89132";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Red_On"; Taste::InterfaceName => "Red_On";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Blue_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Blue_On.others { RI_Blue_On : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Blue_On.others {
Taste::coordinates => "111492 85355"; Taste::coordinates => "111649 85198";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Blue_On"; Taste::InterfaceName => "Blue_On";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Blue_Off : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Blue_Off.others { RI_Blue_Off : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::stm32_debug::PI_Blue_Off.others {
Taste::coordinates => "111492 82836"; Taste::coordinates => "111649 82679";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Blue_Off"; Taste::InterfaceName => "Blue_Off";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_Kick_WD : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::watchdog::PI_Kick_WD.others { RI_Kick_WD : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::watchdog::PI_Kick_WD.others {
Taste::coordinates => "74486 85986"; Taste::coordinates => "74643 85829";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "Kick_WD"; Taste::InterfaceName => "Kick_WD";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
...@@ -466,6 +466,8 @@ PROPERTIES ...@@ -466,6 +466,8 @@ PROPERTIES
END PI_pulse.others; END PI_pulse.others;
SUBPROGRAM PI_Kick_WD SUBPROGRAM PI_Kick_WD
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_Kick_WD; END PI_Kick_WD;
SUBPROGRAM IMPLEMENTATION PI_Kick_WD.others SUBPROGRAM IMPLEMENTATION PI_Kick_WD.others
...@@ -517,6 +519,7 @@ FEATURES ...@@ -517,6 +519,7 @@ FEATURES
PI_Kick_WD : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::watchdog::PI_Kick_WD.others { PI_Kick_WD : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::watchdog::PI_Kick_WD.others {
Taste::coordinates => "83462 125509"; Taste::coordinates => "83462 125509";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "Kick_WD"; Taste::InterfaceName => "Kick_WD";
}; };
...@@ -573,7 +576,7 @@ END interfaceview; ...@@ -573,7 +576,7 @@ END interfaceview;
SYSTEM IMPLEMENTATION interfaceview.others SYSTEM IMPLEMENTATION interfaceview.others
SUBCOMPONENTS SUBCOMPONENTS
Controller : SYSTEM interfaceview::IV::Controller::Controller.others { Controller : SYSTEM interfaceview::IV::Controller::Controller.others {
Taste::coordinates => "74486 57636 111492 89289"; Taste::coordinates => "74643 57479 111649 89132";
}; };
User : SYSTEM interfaceview::IV::User::User.others { User : SYSTEM interfaceview::IV::User::User.others {
Taste::coordinates => "140941 58424 168342 91966"; Taste::coordinates => "140941 58424 168342 91966";
...@@ -586,34 +589,34 @@ SUBCOMPONENTS ...@@ -586,34 +589,34 @@ SUBCOMPONENTS
}; };
CONNECTIONS CONNECTIONS
Controller_PI_Button_User_RI_Button : SUBPROGRAM ACCESS Controller.PI_Button -> User.RI_Button { Controller_PI_Button_User_RI_Button : SUBPROGRAM ACCESS Controller.PI_Button -> User.RI_Button {
Taste::coordinates => "140941 63464 126216 63464 126216 62361 111492 62361"; Taste::coordinates => "140941 63464 126216 63464 126216 62204 111649 62204";
}; };
Controller_PI_Initialize_User_RI_Initialize : SUBPROGRAM ACCESS Controller.PI_Initialize -> User.RI_Initialize { Controller_PI_Initialize_User_RI_Initialize : SUBPROGRAM ACCESS Controller.PI_Initialize -> User.RI_Initialize {
Taste::coordinates => "140941 76696 126216 76696 126216 76065 111492 76065"; Taste::coordinates => "140941 76696 126216 76696 126216 75908 111649 75908";
}; };
User_PI_Color_Controller_RI_Color : SUBPROGRAM ACCESS User.PI_Color -> Controller.RI_Color { User_PI_Color_Controller_RI_Color : SUBPROGRAM ACCESS User.PI_Color -> Controller.RI_Color {
Taste::coordinates => "111492 67086 126216 67086 126216 68189 140941 68189"; Taste::coordinates => "111649 66929 126216 66929 126216 68189 140941 68189";
}; };
User_PI_Info_User_Controller_RI_Info_User : SUBPROGRAM ACCESS User.PI_Info_User -> Controller.RI_Info_User { User_PI_Info_User_Controller_RI_Info_User : SUBPROGRAM ACCESS User.PI_Info_User -> Controller.RI_Info_User {
Taste::coordinates => "111492 70237 126216 70237 126216 71340 140941 71340"; Taste::coordinates => "111649 70080 126216 70080 126216 71340 140941 71340";
}; };
stm32_debug_PI_Green_On_Controller_RI_Green_On : SUBPROGRAM ACCESS stm32_debug.PI_Green_On -> Controller.RI_Green_On { stm32_debug_PI_Green_On_Controller_RI_Green_On : SUBPROGRAM ACCESS stm32_debug.PI_Green_On -> Controller.RI_Green_On {
Taste::coordinates => "105192 89289 105192 108978 145192 108978"; Taste::coordinates => "105349 89132 105349 108978 145192 108978";
}; };
stm32_debug_PI_Orange_On_Controller_RI_Orange_On : SUBPROGRAM ACCESS stm32_debug.PI_Orange_On -> Controller.RI_Orange_On { stm32_debug_PI_Orange_On_Controller_RI_Orange_On : SUBPROGRAM ACCESS stm32_debug.PI_Orange_On -> Controller.RI_Orange_On {
Taste::coordinates => "93224 89289 93224 111183 145192 111183"; Taste::coordinates => "93381 89132 93381 111183 145192 111183";
}; };
stm32_debug_PI_Red_On_Controller_RI_Red_On : SUBPROGRAM ACCESS stm32_debug.PI_Red_On -> Controller.RI_Red_On { stm32_debug_PI_Red_On_Controller_RI_Red_On : SUBPROGRAM ACCESS stm32_debug.PI_Red_On -> Controller.RI_Red_On {
Taste::coordinates => "83146 89289 83146 114018 145192 114018"; Taste::coordinates => "83303 89132 83303 114018 145192 114018";
}; };
stm32_debug_PI_Blue_On_Controller_RI_Blue_On : SUBPROGRAM ACCESS stm32_debug.PI_Blue_On -> Controller.RI_Blue_On { stm32_debug_PI_Blue_On_Controller_RI_Blue_On : SUBPROGRAM ACCESS stm32_debug.PI_Blue_On -> Controller.RI_Blue_On {
Taste::coordinates => "111492 85355 128184 85355 128184 126616 145192 126616"; Taste::coordinates => "111649 85198 128184 85198 128184 126616 145192 126616";
}; };
stm32_debug_PI_Blue_Off_Controller_RI_Blue_Off : SUBPROGRAM ACCESS stm32_debug.PI_Blue_Off -> Controller.RI_Blue_Off { stm32_debug_PI_Blue_Off_Controller_RI_Blue_Off : SUBPROGRAM ACCESS stm32_debug.PI_Blue_Off -> Controller.RI_Blue_Off {
Taste::coordinates => "111492 82836 128184 82836 128184 129136 145192 129136"; Taste::coordinates => "111649 82679 128184 82679 128184 129136 145192 129136";
}; };
watchdog_PI_Kick_WD_Controller_RI_Kick_WD : SUBPROGRAM ACCESS watchdog.PI_Kick_WD -> Controller.RI_Kick_WD { watchdog_PI_Kick_WD_Controller_RI_Kick_WD : SUBPROGRAM ACCESS watchdog.PI_Kick_WD -> Controller.RI_Kick_WD {
Taste::coordinates => "74486 85986 70785 85986 70785 125509 83462 125509"; Taste::coordinates => "74643 85829 70785 85829 70785 125509 83462 125509";
}; };
stm32_debug_PI_Send_to_UART_watchdog_RI_Send_to_UART : SUBPROGRAM ACCESS stm32_debug.PI_Send_to_UART -> watchdog.RI_Send_to_UART { stm32_debug_PI_Send_to_UART_watchdog_RI_Send_to_UART : SUBPROGRAM ACCESS stm32_debug.PI_Send_to_UART -> watchdog.RI_Send_to_UART {
Taste::coordinates => "111493 127084 119367 127084 119367 104564 145192 104564"; Taste::coordinates => "111493 127084 119367 127084 119367 104564 145192 104564";
......
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