Commit d2475b4b authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix deployment view

path to ocarina_components.aadl wasn't right, and deployment platform
was based on old version of the list of supported boards
parent 40b31e77
--------------------------------------------------- ---------------------------------------------------
-- AADL2.0 -- AADL2.1
-- TASTE -- TASTE type deploymentview
--
-- --
-- generated code: do not edit
--------------------------------------------------- ---------------------------------------------------
PACKAGE deploymentview::DV::Node1 PACKAGE deploymentview::DV::Node1
...@@ -11,17 +11,19 @@ PUBLIC ...@@ -11,17 +11,19 @@ PUBLIC
WITH Taste; WITH Taste;
WITH Deployment; WITH Deployment;
WITH TASTE_DV_Properties; WITH TASTE_DV_Properties;
PROCESS cortex_m_partition PROCESS crazyflie_v2_partition
END cortex_m_partition; END crazyflie_v2_partition;
PROCESS IMPLEMENTATION cortex_m_partition.others PROCESS IMPLEMENTATION crazyflie_v2_partition.others
END cortex_m_partition.others; END crazyflie_v2_partition.others;
END deploymentview::DV::Node1; END deploymentview::DV::Node1;
PACKAGE deploymentview::DV PACKAGE deploymentview::DV
PUBLIC PUBLIC
WITH interfaceview::IV::Function1;
WITH interfaceview::IV::Function2;
WITH ocarina_processors_arm; WITH ocarina_processors_arm;
WITH deploymentview::DV::Node1; WITH deploymentview::DV::Node1;
WITH Taste; WITH Taste;
...@@ -33,25 +35,23 @@ END Node1; ...@@ -33,25 +35,23 @@ END Node1;
SYSTEM IMPLEMENTATION Node1.others SYSTEM IMPLEMENTATION Node1.others
SUBCOMPONENTS SUBCOMPONENTS
IV_Function1 : SYSTEM interfaceview::IV::Function1.others { IV_Function1 : SYSTEM interfaceview::IV::Function1::Function1.others {
Taste::coordinates => "708 975 1103 1303";
Taste::FunctionName => "Function1"; Taste::FunctionName => "Function1";
}; };
IV_Function2 : SYSTEM interfaceview::IV::Function2.others { IV_Function2 : SYSTEM interfaceview::IV::Function2::Function2.others {
Taste::coordinates => "1195 928 1565 1334";
Taste::FunctionName => "Function2"; Taste::FunctionName => "Function2";
}; };
cortex_m_partition : PROCESS deploymentview::DV::Node1::cortex_m_partition.others { crazyflie_v2_partition : PROCESS deploymentview::DV::Node1::crazyflie_v2_partition.others {
Taste::coordinates => "653 746 1769 1453"; Taste::coordinates => "104907 68615 158936 96673";
Deployment::Port_Number => 0; Deployment::Port_Number => 0;
}; };
cortex_m_i : PROCESSOR ocarina_processors_arm::cortex_m.i { crazyflie_v2_gnat : PROCESSOR ocarina_processors_arm::crazyflie_v2.gnat {
Taste::coordinates => "513 544 1909 1554"; Taste::coordinates => "98153 60599 165690 100681";
}; };
PROPERTIES PROPERTIES
Taste::APLC_Binding => (reference (cortex_m_partition)) APPLIES TO IV_Function1; Taste::APLC_Binding => (reference (crazyflie_v2_partition)) APPLIES TO IV_Function1;
Taste::APLC_Binding => (reference (cortex_m_partition)) APPLIES TO IV_Function2; Taste::APLC_Binding => (reference (crazyflie_v2_partition)) APPLIES TO IV_Function2;
Actual_Processor_Binding => (reference (cortex_m_i)) APPLIES TO cortex_m_partition; Actual_Processor_Binding => (reference (crazyflie_v2_gnat)) APPLIES TO crazyflie_v2_partition;
END Node1.others; END Node1.others;
SYSTEM deploymentview SYSTEM deploymentview
...@@ -60,15 +60,15 @@ END deploymentview; ...@@ -60,15 +60,15 @@ END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS SUBCOMPONENTS
Node1 : SYSTEM Node1.others { Node1 : SYSTEM Node1.others {
Taste::coordinates => "339 256 2083 1698"; Taste::coordinates => "89711 49147 174132 106407";
}; };
interfaceview : SYSTEM interfaceview::IV::interfaceview.others; interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others; END deploymentview.others;
PROPERTIES PROPERTIES
Taste::coordinates => "0 0 2970 2100"; Taste::coordinates => "0 0 297000 210000";
Taste::version => "1.3.19"; Taste::version => "2.0";
Taste::interfaceView => "InterfaceView.aadl"; Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl"); Taste::HWLibraries => ("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV; END deploymentview::DV;
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