Commit ca355b3d authored by Daniel Tonoiu's avatar Daniel Tonoiu
Browse files

add sensor2 ada function and call its 4 protected ADA interfaces; remove SDL delay call

parent ba7d0d37
...@@ -26,6 +26,7 @@ WITH interfaceview::IV::sensor2_AP::st01_Acceptance; ...@@ -26,6 +26,7 @@ WITH interfaceview::IV::sensor2_AP::st01_Acceptance;
WITH interfaceview::IV::sensor2_AP::st02_On_Off_cmds; WITH interfaceview::IV::sensor2_AP::st02_On_Off_cmds;
WITH interfaceview::IV::sensor2_AP::st01_Execution; WITH interfaceview::IV::sensor2_AP::st01_Execution;
WITH interfaceview::IV::sensor2_AP::tm_st01; WITH interfaceview::IV::sensor2_AP::tm_st01;
WITH interfaceview::IV::sensor2_AP::sensor2;
WITH interfaceview::IV::ground_system::ground_GUI; WITH interfaceview::IV::ground_system::ground_GUI;
WITH interfaceview::IV::ground_system::processTC; WITH interfaceview::IV::ground_system::processTC;
WITH interfaceview::IV::sendTM; WITH interfaceview::IV::sendTM;
...@@ -61,6 +62,9 @@ SUBCOMPONENTS ...@@ -61,6 +62,9 @@ SUBCOMPONENTS
IV_tm_st01 : SYSTEM interfaceview::IV::sensor2_AP::tm_st01::tm_st01.others { IV_tm_st01 : SYSTEM interfaceview::IV::sensor2_AP::tm_st01::tm_st01.others {
Taste::FunctionName => "tm_st01"; Taste::FunctionName => "tm_st01";
}; };
IV_sensor2 : SYSTEM interfaceview::IV::sensor2_AP::sensor2::sensor2.others {
Taste::FunctionName => "sensor2";
};
IV_ground_GUI : SYSTEM interfaceview::IV::ground_system::ground_GUI::ground_GUI.others { IV_ground_GUI : SYSTEM interfaceview::IV::ground_system::ground_GUI::ground_GUI.others {
Taste::FunctionName => "ground_GUI"; Taste::FunctionName => "ground_GUI";
}; };
...@@ -109,6 +113,7 @@ PROPERTIES ...@@ -109,6 +113,7 @@ PROPERTIES
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st02_On_Off_cmds; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st02_On_Off_cmds;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st01_Execution; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st01_Execution;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_st01; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_st01;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sensor2;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_ground_GUI; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_ground_GUI;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_processTC; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_processTC;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sendTM; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sendTM;
......
...@@ -137,6 +137,7 @@ PACKAGE interfaceview::IV::sensor2_AP::st02_On_Off_cmds ...@@ -137,6 +137,7 @@ PACKAGE interfaceview::IV::sensor2_AP::st02_On_Off_cmds
PUBLIC PUBLIC
WITH interfaceview::IV::sensor2_AP::st01_Execution; WITH interfaceview::IV::sensor2_AP::st01_Execution;
WITH interfaceview::IV::sensor2_AP::sensor2;
WITH Taste; WITH Taste;
WITH DataView; WITH DataView;
WITH TASTE_IV_Properties; WITH TASTE_IV_Properties;
...@@ -168,16 +169,6 @@ PROPERTIES ...@@ -168,16 +169,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms; Compute_Execution_Time => 0 ms .. 0 ms;
END PI_testExec.others; END PI_testExec.others;
SUBPROGRAM PI_nextStep
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_nextStep;
SUBPROGRAM IMPLEMENTATION PI_nextStep.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_nextStep.others;
SUBPROGRAM RI_startEx SUBPROGRAM RI_startEx
FEATURES FEATURES
startExecNot : IN PARAMETER DataView::Start_Execution_Notification { startExecNot : IN PARAMETER DataView::Start_Execution_Notification {
...@@ -208,6 +199,30 @@ END RI_compEx; ...@@ -208,6 +199,30 @@ END RI_compEx;
SUBPROGRAM IMPLEMENTATION RI_compEx.others SUBPROGRAM IMPLEMENTATION RI_compEx.others
END RI_compEx.others; END RI_compEx.others;
SUBPROGRAM RI_on
END RI_on;
SUBPROGRAM IMPLEMENTATION RI_on.others
END RI_on.others;
SUBPROGRAM RI_off
END RI_off;
SUBPROGRAM IMPLEMENTATION RI_off.others
END RI_off.others;
SUBPROGRAM RI_cold_RST
END RI_cold_RST;
SUBPROGRAM IMPLEMENTATION RI_cold_RST.others
END RI_cold_RST.others;
SUBPROGRAM RI_warm_RST
END RI_warm_RST;
SUBPROGRAM IMPLEMENTATION RI_warm_RST.others
END RI_warm_RST.others;
SYSTEM st02_On_Off_cmds SYSTEM st02_On_Off_cmds
FEATURES FEATURES
PI_tc21_s2 : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st02_On_Off_cmds::PI_tc21_s2.others { PI_tc21_s2 : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st02_On_Off_cmds::PI_tc21_s2.others {
...@@ -224,31 +239,48 @@ FEATURES ...@@ -224,31 +239,48 @@ FEATURES
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "testExec"; Taste::InterfaceName => "testExec";
}; };
PI_nextStep : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st02_On_Off_cmds::PI_nextStep.others {
Taste::coordinates => "76118 58685";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "nextStep";
};
RI_startEx : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_startEx.others { RI_startEx : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_startEx.others {
Taste::coordinates => "76118 53725"; Taste::coordinates => "76118 58008";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "startEx"; Taste::InterfaceName => "startEx";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_progEx : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_progEx.others { RI_progEx : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_progEx.others {
Taste::coordinates => "76118 54970"; Taste::coordinates => "76118 59472";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "progEx"; Taste::InterfaceName => "progEx";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_compEx : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_compEx.others { RI_compEx : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_compEx.others {
Taste::coordinates => "76118 56008"; Taste::coordinates => "76118 60894";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "compEx"; Taste::InterfaceName => "compEx";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_on : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_on.others {
Taste::coordinates => "79412 57116";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "on";
Taste::labelInheritance => "true";
};
RI_off : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_off.others {
Taste::coordinates => "82157 57116";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "off";
Taste::labelInheritance => "true";
};
RI_cold_RST : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_cold_RST.others {
Taste::coordinates => "84902 57116";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "cold_RST";
Taste::labelInheritance => "true";
};
RI_warm_RST : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_warm_RST.others {
Taste::coordinates => "88196 57116";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "warm_RST";
Taste::labelInheritance => "true";
};
PROPERTIES PROPERTIES
Source_Language => (SDL); Source_Language => (SDL);
Taste::Active_Interfaces => any; Taste::Active_Interfaces => any;
...@@ -263,7 +295,6 @@ PACKAGE interfaceview::IV::sensor2_AP::st01_Execution ...@@ -263,7 +295,6 @@ PACKAGE interfaceview::IV::sensor2_AP::st01_Execution
PUBLIC PUBLIC
WITH interfaceview::IV::sensor2_AP::tm_st01; WITH interfaceview::IV::sensor2_AP::tm_st01;
WITH interfaceview::IV::sensor2_AP::st02_On_Off_cmds;
WITH Taste; WITH Taste;
WITH DataView; WITH DataView;
WITH TASTE_IV_Properties; WITH TASTE_IV_Properties;
...@@ -333,54 +364,42 @@ END RI_tm; ...@@ -333,54 +364,42 @@ END RI_tm;
SUBPROGRAM IMPLEMENTATION RI_tm.others SUBPROGRAM IMPLEMENTATION RI_tm.others
END RI_tm.others; END RI_tm.others;
SUBPROGRAM RI_nextStep
END RI_nextStep;
SUBPROGRAM IMPLEMENTATION RI_nextStep.others
END RI_nextStep.others;
SYSTEM st01_Execution SYSTEM st01_Execution
FEATURES FEATURES
PI_reqID : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_reqID.others { PI_reqID : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_reqID.others {
Taste::coordinates => "70643 60057"; Taste::coordinates => "67923 61036";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms; Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "reqID"; Taste::InterfaceName => "reqID";
}; };
PI_startEx : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_startEx.others { PI_startEx : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_startEx.others {
Taste::coordinates => "70643 52875"; Taste::coordinates => "70643 57707";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms; Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "startEx"; Taste::InterfaceName => "startEx";
}; };
PI_progEx : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_progEx.others { PI_progEx : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_progEx.others {
Taste::coordinates => "70643 54120"; Taste::coordinates => "70643 58732";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms; Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "progEx"; Taste::InterfaceName => "progEx";
}; };
PI_compEx : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_compEx.others { PI_compEx : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st01_Execution::PI_compEx.others {
Taste::coordinates => "70643 55448"; Taste::coordinates => "70643 59731";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms; Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "compEx"; Taste::InterfaceName => "compEx";
}; };
RI_tm : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::tm_st01::PI_tm.others { RI_tm : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::tm_st01::PI_tm.others {
Taste::coordinates => "68730 61036"; Taste::coordinates => "66698 61036";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "tm"; Taste::InterfaceName => "tm";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
}; };
RI_nextStep : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::st02_On_Off_cmds::PI_nextStep.others {
Taste::coordinates => "70643 57536";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "nextStep";
Taste::labelInheritance => "true";
};
PROPERTIES PROPERTIES
Source_Language => (SDL); Source_Language => (SDL);
Taste::Active_Interfaces => any; Taste::Active_Interfaces => any;
...@@ -425,14 +444,14 @@ END RI_tm_link.others; ...@@ -425,14 +444,14 @@ END RI_tm_link.others;
SYSTEM tm_st01 SYSTEM tm_st01
FEATURES FEATURES
PI_tm : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::tm_st01::PI_tm.others { PI_tm : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::tm_st01::PI_tm.others {
Taste::coordinates => "68002 68037"; Taste::coordinates => "65956 68437";
Taste::RCMoperationKind => sporadic; Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms; Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms; Taste::Deadline => 0 ms;
Taste::InterfaceName => "tm"; Taste::InterfaceName => "tm";
}; };
RI_tm_link : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sendTM::PI_tm_link.others { RI_tm_link : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sendTM::PI_tm_link.others {
Taste::coordinates => "59333 64302"; Taste::coordinates => "57287 64702";
Taste::RCMoperationKind => any; Taste::RCMoperationKind => any;
Taste::InterfaceName => "tm_link"; Taste::InterfaceName => "tm_link";
Taste::labelInheritance => "true"; Taste::labelInheritance => "true";
...@@ -447,6 +466,76 @@ END tm_st01.others; ...@@ -447,6 +466,76 @@ END tm_st01.others;
END interfaceview::IV::sensor2_AP::tm_st01; END interfaceview::IV::sensor2_AP::tm_st01;
PACKAGE interfaceview::IV::sensor2_AP::sensor2
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_on
END PI_on;
SUBPROGRAM IMPLEMENTATION PI_on.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_on.others;
SUBPROGRAM PI_off
END PI_off;
SUBPROGRAM IMPLEMENTATION PI_off.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_off.others;
SUBPROGRAM PI_cold_RST
END PI_cold_RST;
SUBPROGRAM IMPLEMENTATION PI_cold_RST.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_cold_RST.others;
SUBPROGRAM PI_warm_RST
END PI_warm_RST;
SUBPROGRAM IMPLEMENTATION PI_warm_RST.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_warm_RST.others;
SYSTEM sensor2
FEATURES
PI_on : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_on.others {
Taste::coordinates => "81826 53876";
Taste::RCMoperationKind => protected;
Taste::InterfaceName => "on";
};
PI_off : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_off.others {
Taste::coordinates => "83967 53876";
Taste::RCMoperationKind => protected;
Taste::InterfaceName => "off";
};
PI_cold_RST : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_cold_RST.others {
Taste::coordinates => "86383 53876";
Taste::RCMoperationKind => protected;
Taste::InterfaceName => "cold_RST";
};
PI_warm_RST : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::sensor2_AP::sensor2::PI_warm_RST.others {
Taste::coordinates => "90007 53876";
Taste::RCMoperationKind => protected;
Taste::InterfaceName => "warm_RST";
};
PROPERTIES
Source_Language => (Ada);
Taste::Active_Interfaces => any;
END sensor2;
SYSTEM IMPLEMENTATION sensor2.others
END sensor2.others;
END interfaceview::IV::sensor2_AP::sensor2;
PACKAGE interfaceview::IV::sensor2_AP PACKAGE interfaceview::IV::sensor2_AP
PUBLIC PUBLIC
...@@ -454,6 +543,7 @@ WITH interfaceview::IV::sensor2_AP::st01_Acceptance; ...@@ -454,6 +543,7 @@ WITH interfaceview::IV::sensor2_AP::st01_Acceptance;
WITH interfaceview::IV::sensor2_AP::st02_On_Off_cmds; WITH interfaceview::IV::sensor2_AP::st02_On_Off_cmds;
WITH interfaceview::IV::sensor2_AP::st01_Execution; WITH interfaceview::IV::sensor2_AP::st01_Execution;
WITH interfaceview::IV::sensor2_AP::tm_st01; WITH interfaceview::IV::sensor2_AP::tm_st01;
WITH interfaceview::IV::sensor2_AP::sensor2;
WITH interfaceview::IV::st01_routing; WITH interfaceview::IV::st01_routing;
WITH interfaceview::IV::sendTM; WITH interfaceview::IV::sendTM;
WITH Taste; WITH Taste;
...@@ -567,13 +657,16 @@ SUBCOMPONENTS ...@@ -567,13 +657,16 @@ SUBCOMPONENTS
Taste::coordinates => "71658 64859 89610 72276"; Taste::coordinates => "71658 64859 89610 72276";
}; };
st02_On_Off_cmds : SYSTEM interfaceview::IV::sensor2_AP::st02_On_Off_cmds::st02_On_Off_cmds.others { st02_On_Off_cmds : SYSTEM interfaceview::IV::sensor2_AP::st02_On_Off_cmds::st02_On_Off_cmds.others {
Taste::coordinates => "76118 52895 95458 62464"; Taste::coordinates => "76118 57116 94509 62464";
}; };
st01_Execution : SYSTEM interfaceview::IV::sensor2_AP::st01_Execution::st01_Execution.others { st01_Execution : SYSTEM interfaceview::IV::sensor2_AP::st01_Execution::st01_Execution.others {
Taste::coordinates => "56597 50800 70643 61036"; Taste::coordinates => "56597 50800 70643 61036";
}; };
tm_st01 : SYSTEM interfaceview::IV::sensor2_AP::tm_st01::tm_st01.others { tm_st01 : SYSTEM interfaceview::IV::sensor2_AP::tm_st01::tm_st01.others {
Taste::coordinates => "59333 63472 68002 69563"; Taste::coordinates => "57287 63872 65956 69963";
};
sensor2 : SYSTEM interfaceview::IV::sensor2_AP::sensor2::sensor2.others {
Taste::coordinates => "79684 49208 92423 53876";
}; };
CONNECTIONS CONNECTIONS
st01_Acceptance_PI_tc_s2_sensor2_AP_PI_tc_s2 : SUBPROGRAM ACCESS st01_Acceptance.PI_tc_s2 -> PI_tc_s2 { st01_Acceptance_PI_tc_s2_sensor2_AP_PI_tc_s2 : SUBPROGRAM ACCESS st01_Acceptance.PI_tc_s2 -> PI_tc_s2 {
...@@ -589,31 +682,40 @@ CONNECTIONS ...@@ -589,31 +682,40 @@ CONNECTIONS
Taste::coordinates => "86185 72276 86185 72708 86033 72708 86033 75845"; Taste::coordinates => "86185 72276 86185 72708 86033 72708 86033 75845";
}; };
tm_st01_PI_tm_st01_Acceptance_RI_tm : SUBPROGRAM ACCESS tm_st01.PI_tm -> st01_Acceptance.RI_tm { tm_st01_PI_tm_st01_Acceptance_RI_tm : SUBPROGRAM ACCESS tm_st01.PI_tm -> st01_Acceptance.RI_tm {
Taste::coordinates => "71658 66262 69830 66262 69830 68037 68002 68037"; Taste::coordinates => "71658 66262 69830 66262 69830 68437 65956 68437";
}; };
st01_Execution_PI_reqID_st01_Acceptance_RI_reqID : SUBPROGRAM ACCESS st01_Execution.PI_reqID -> st01_Acceptance.RI_reqID { st01_Execution_PI_reqID_st01_Acceptance_RI_reqID : SUBPROGRAM ACCESS st01_Execution.PI_reqID -> st01_Acceptance.RI_reqID {
Taste::coordinates => "74538 64859 74538 60057 70643 60057"; Taste::coordinates => "74538 64859 74538 62698 67923 62698 67923 61036";
}; };
st02_On_Off_cmds_PI_testExec_sensor2_AP_PI_testExec : SUBPROGRAM ACCESS st02_On_Off_cmds.PI_testExec -> PI_testExec { st02_On_Off_cmds_PI_testExec_sensor2_AP_PI_testExec : SUBPROGRAM ACCESS st02_On_Off_cmds.PI_testExec -> PI_testExec {
Taste::coordinates => "93602 75845 93602 69148 93591 69148 93591 62464"; Taste::coordinates => "93602 75845 93602 69148 93591 69148 93591 62464";
}; };
st02_On_Off_cmds_PI_nextStep_st01_Execution_RI_nextStep : SUBPROGRAM ACCESS st02_On_Off_cmds.PI_nextStep -> st01_Execution.RI_nextStep {
Taste::coordinates => "70643 57536 73380 57536 73380 58685 76118 58685";
};
st01_Execution_PI_startEx_st02_On_Off_cmds_RI_startEx : SUBPROGRAM ACCESS st01_Execution.PI_startEx -> st02_On_Off_cmds.RI_startEx { st01_Execution_PI_startEx_st02_On_Off_cmds_RI_startEx : SUBPROGRAM ACCESS st01_Execution.PI_startEx -> st02_On_Off_cmds.RI_startEx {
Taste::coordinates => "76118 53725 73380 53725 73380 52875 70643 52875"; Taste::coordinates => "76118 58008 73380 58008 73380 57707 70643 57707";
}; };
st01_Execution_PI_progEx_st02_On_Off_cmds_RI_progEx : SUBPROGRAM ACCESS st01_Execution.PI_progEx -> st02_On_Off_cmds.RI_progEx { st01_Execution_PI_progEx_st02_On_Off_cmds_RI_progEx : SUBPROGRAM ACCESS st01_Execution.PI_progEx -> st02_On_Off_cmds.RI_progEx {
Taste::coordinates => "76118 54970 73380 54970 73380 54120 70643 54120"; Taste::coordinates => "76118 59472 73380 59472 73380 58732 70643 58732";
}; };
st01_Execution_PI_compEx_st02_On_Off_cmds_RI_compEx : SUBPROGRAM ACCESS st01_Execution.PI_compEx -> st02_On_Off_cmds.RI_compEx { st01_Execution_PI_compEx_st02_On_Off_cmds_RI_compEx : SUBPROGRAM ACCESS st01_Execution.PI_compEx -> st02_On_Off_cmds.RI_compEx {
Taste::coordinates => "76118 56008 73380 56008 73380 55448 70643 55448"; Taste::coordinates => "76118 60894 73380 60894 73380 59731 70643 59731";
};
sensor2_PI_on_st02_On_Off_cmds_RI_on : SUBPROGRAM ACCESS sensor2.PI_on -> st02_On_Off_cmds.RI_on {
Taste::coordinates => "79412 57116 79412 55496 81826 55496 81826 53876";
};
sensor2_PI_off_st02_On_Off_cmds_RI_off : SUBPROGRAM ACCESS sensor2.PI_off -> st02_On_Off_cmds.RI_off {
Taste::coordinates => "82157 57116 82157 55496 83967 55496 83967 53876";
};
sensor2_PI_cold_RST_st02_On_Off_cmds_RI_cold_RST : SUBPROGRAM ACCESS sensor2.PI_cold_RST -> st02_On_Off_cmds.RI_cold_RST {
Taste::coordinates => "84902 57116 84902 55496 86383 55496 86383 53876";
};
sensor2_PI_warm_RST_st02_On_Off_cmds_RI_warm_RST : SUBPROGRAM ACCESS sensor2.PI_warm_RST -> st02_On_Off_cmds.RI_warm_RST {
Taste::coordinates => "88196 57116 88196 55496 90007 55496 90007 53876";
}; };
tm_st01_PI_tm_st01_Execution_RI_tm : SUBPROGRAM ACCESS tm_st01.PI_tm -> st01_Execution.RI_tm { tm_st01_PI_tm_st01_Execution_RI_tm : SUBPROGRAM ACCESS tm_st01.PI_tm -> st01_Execution.RI_tm {
Taste::coordinates => "68730 61036 68730 68037 68002 68037"; Taste::coordinates => "66698 61036 66698 68437 65956 68437";
}; };
sensor2_AP_RI_tm_link_tm_st01_RI_tm_link : SUBPROGRAM ACCESS RI_tm_link -> tm_st01.RI_tm_link { sensor2_AP_RI_tm_link_tm_st01_RI_tm_link : SUBPROGRAM ACCESS RI_tm_link -> tm_st01.RI_tm_link {
Taste::coordinates => "59333 64302 56598 64302 56598 66287 53864 66287"; Taste::coordinates => "57287 64702 56598 64702 56598 66287 53864 66287";
}; };
END sensor2_AP.others; END sensor2_AP.others;
......
0054632f9f4b4bc51e46337a58219459 InterfaceView.aadl 78e8d3e79c3859081f2b8dad24c8c517 InterfaceView.aadl
...@@ -50,6 +50,9 @@ SUBCOMPONENTS ...@@ -50,6 +50,9 @@ SUBCOMPONENTS
IV_tm_st01 : SYSTEM interfaceview::IV::sensor2_AP::tm_st01.others { IV_tm_st01 : SYSTEM interfaceview::IV::sensor2_AP::tm_st01.others {
Taste::FunctionName => "tm_st01"; Taste::FunctionName => "tm_st01";
}; };
IV_sensor2 : SYSTEM interfaceview::IV::sensor2_AP::sensor2.others {
Taste::FunctionName => "sensor2";
};
IV_ground_GUI : SYSTEM interfaceview::IV::ground_system::ground_GUI.others { IV_ground_GUI : SYSTEM interfaceview::IV::ground_system::ground_GUI.others {
Taste::FunctionName => "ground_GUI"; Taste::FunctionName => "ground_GUI";
}; };
...@@ -98,6 +101,7 @@ PROPERTIES ...@@ -98,6 +101,7 @@ PROPERTIES
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st02_On_Off_cmds; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st02_On_Off_cmds;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st01_Execution; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_st01_Execution;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_st01; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_st01;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sensor2;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_ground_GUI; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_ground_GUI;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_processTC; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_processTC;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sendTM; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sendTM;
......
...@@ -115,16 +115,6 @@ PROPERTIES ...@@ -115,16 +115,6 @@ PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms; Compute_Execution_Time => 0 ms .. 0 ms;
END PI_testExec.others; END PI_testExec.others;
SUBPROGRAM PI_nextStep
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_nextStep;
SUBPROGRAM IMPLEMENTATION PI_nextStep.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_nextStep.others;
SUBPROGRAM RI_startEx SUBPROGRAM RI_startEx
FEATURES FEATURES
startExecNot : IN PARAMETER DataView::Start_Execution_Notification { startExecNot : IN PARAMETER DataView::Start_Execution_Notification {
...@@ -155,6 +145,30 @@ END RI_compEx; ...@@ -155,6 +145,30 @@ END RI_compEx;
SUBPROGRAM IMPLEMENTATION RI_compEx.others SUBPROGRAM IMPLEMENTATION RI_compEx.others
END RI_compEx.others; END RI_compEx.others;
SUBPROGRAM RI_on
END RI_on;
SUBPROGRAM IMPLEMENTATION RI_on.others
END RI_on.others;
SUBPROGRAM RI_off
END RI_off;
SUBPROGRAM IMPLEMENTATION RI_off.others
END RI_off.others;
SUBPROGRAM RI_cold_RST
END RI_cold_RST;
SUBPROGRAM IMPLEMENTATION RI_cold_RST.others
END RI_cold_RST.others;
SUBPROGRAM RI_warm_RST
END RI_warm_RST;
SUBPROGRAM IMPLEMENTATION RI_warm_RST.others
END RI_warm_RST.others;
END interfaceview::FV::st02_On_Off_cmds; END interfaceview::FV::st02_On_Off_cmds;
PACKAGE interfaceview::FV::st01_Execution PACKAGE interfaceview::FV::st01_Execution
...@@ -229,12 +243,6 @@ END RI_tm; ...@@ -229,12 +243,6 @@ END RI_tm;
SUBPROGRAM IMPLEMENTATION RI_tm.others SUBPROGRAM IMPLEMENTATION RI_tm.others
END RI_tm.others; END RI_tm.others;
SUBPROGRAM RI_nextStep
END RI_nextStep;
SUBPROGRAM IMPLEMENTATION RI_nextStep.others
END RI_nextStep.others;
END interfaceview::FV::st01_Execution; END interfaceview::FV::st01_Execution;
PACKAGE interfaceview::FV::tm_st01 PACKAGE interfaceview::FV::tm_st01
...@@ -269,6 +277,54 @@ END RI_tm_link.others; ...@@ -269,6 +277,54 @@ END RI_tm_link.others;
END interfaceview::FV::tm_st01; END interfaceview::FV::tm_st01;
PACKAGE interfaceview::FV::sensor2
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_on
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_on;
SUBPROGRAM IMPLEMENTATION PI_on.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_on.others;
SUBPROGRAM PI_off
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_off;
SUBPROGRAM IMPLEMENTATION PI_off.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_off.others;
SUBPROGRAM PI_cold_RST
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_cold_RST;
SUBPROGRAM IMPLEMENTATION PI_cold_RST.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_cold_RST.others;
SUBPROGRAM PI_warm_RST
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_warm_RST;
SUBPROGRAM IMPLEMENTATION PI_warm_RST.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_warm_RST.others;
END interfaceview::FV::sensor2;
PACKAGE interfaceview::IV::sensor2_AP PACKAGE interfaceview::IV::sensor2_AP
PUBLIC PUBLIC