implement the event reporting and the on-board monitoring services

40a9a359 · Daniel Tonoiu · 425fc9bc · 40a9a359 · 40a9a359 · 40a9a359
Commit 40a9a359 authored Jun 11, 2018 by Daniel Tonoiu
--- a/DataView.aadl
+++ b/DataView.aadl
--- a/DataView.acn
+++ b/DataView.acn
@@ -24,7 +24,12 @@ Taps DEFINITIONS ::= BEGIN
 	tc3-6 	[present-when tc-type==3 tc-subtype==6],
 	tc3-9 	[present-when tc-type==3 tc-subtype==9],
 	tc3-27 	[present-when tc-type==3 tc-subtype==27],
-	tc3-31 [present-when tc-type==3 tc-subtype==31]
+	tc3-31  [present-when tc-type==3 tc-subtype==31],
+	tc12-1  [present-when tc-type==12 tc-subtype==1],
+	tc12-2  [present-when tc-type==12 tc-subtype==2],
+	tc12-13 [present-when tc-type==12 tc-subtype==13],
+	tc12-15 [present-when tc-type==12 tc-subtype==15],
+	tc12-16 [present-when tc-type==12 tc-subtype==16]
    }
    
    Telecommand[]{
@@ -70,7 +75,13 @@ Taps DEFINITIONS ::= BEGIN
 	tm1-8  	[present-when tm-type==1 tm-subtype==8],
        tm1-10 	[present-when tm-type==1 tm-subtype==10],
 	tm3-10 	[present-when tm-type==3 tm-subtype==10],
-	tm3-25 [present-when tm-type==3 tm-subtype==25] 
+	tm3-25 	[present-when tm-type==3 tm-subtype==25], 
+	tm5-1 	[present-when tm-type==5 tm-subtype==1],
+	tm5-2 	[present-when tm-type==5 tm-subtype==2],
+	tm5-3 	[present-when tm-type==5 tm-subtype==3],
+	tm5-4 	[present-when tm-type==5 tm-subtype==4],
+	tm12-12 [present-when tm-type==12 tm-subtype==12],
+	tm12-14 [present-when tm-type==12 tm-subtype==14]
    }
    TM[]{
        packet-version-no   NULL    [pattern '000'B],
@@ -105,16 +116,3 @@ Taps DEFINITIONS ::= BEGIN
    
 END

-TASTE-Dataview DEFINITIONS ::= BEGIN
-    Test-TC[]
-    Test-TM[]
-    Test-failureCodes[]
-    MyInteger[]
-    MyReal[]
-    MyBool[]
-    MyEnum[]
-    MySeq[]
-    MyChoice[]
-    MySeqOf[]
-    MyOctStr[]
-END
--- a/DataView.asn
+++ b/DataView.asn
--- a/DeploymentView.aadl
+++ b/DeploymentView.aadl
@@ -43,6 +43,12 @@ WITH interfaceview::IV::hk_report_AP::tm_hk;
 WITH interfaceview::IV::hk_report_AP::hk_definitions;
 WITH interfaceview::IV::sensor1;
 WITH interfaceview::IV::cpdu2;
+WITH interfaceview::IV::on_board_monitoring_AP::event_report;
+WITH interfaceview::IV::on_board_monitoring_AP::execution_obm;
+WITH interfaceview::IV::on_board_monitoring_AP::tm_obm;
+WITH interfaceview::IV::on_board_monitoring_AP::on_board_monitoring;
+WITH interfaceview::IV::on_board_monitoring_AP::acceptance_st12;
+WITH interfaceview::IV::execution_generic;
 WITH ocarina_processors_x86;
 WITH deploymentview::DV::Node1;
 WITH Taste;
@@ -117,6 +123,24 @@ SUBCOMPONENTS
  IV_cpdu2 : SYSTEM interfaceview::IV::cpdu2::cpdu2.others {
    Taste::FunctionName => "cpdu2";
  };
+  IV_event_report : SYSTEM interfaceview::IV::on_board_monitoring_AP::event_report::event_report.others {
+    Taste::FunctionName => "event_report";
+  };
+  IV_execution_obm : SYSTEM interfaceview::IV::on_board_monitoring_AP::execution_obm::execution_obm.others {
+    Taste::FunctionName => "execution_obm";
+  };
+  IV_tm_obm : SYSTEM interfaceview::IV::on_board_monitoring_AP::tm_obm::tm_obm.others {
+    Taste::FunctionName => "tm_obm";
+  };
+  IV_on_board_monitoring : SYSTEM interfaceview::IV::on_board_monitoring_AP::on_board_monitoring::on_board_monitoring.others {
+    Taste::FunctionName => "on_board_monitoring";
+  };
+  IV_acceptance_st12 : SYSTEM interfaceview::IV::on_board_monitoring_AP::acceptance_st12::acceptance_st12.others {
+    Taste::FunctionName => "acceptance_st12";
+  };
+  IV_execution_generic : SYSTEM interfaceview::IV::execution_generic::execution_generic.others {
+    Taste::FunctionName => "execution_generic";
+  };
  taps : PROCESS deploymentview::DV::Node1::taps.others {
    Taste::coordinates => "85474 64572 179410 99940";
    Deployment::Port_Number => 0;
@@ -146,6 +170,12 @@ PROPERTIES
  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_definitions;
  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sensor1;
  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu2;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_event_report;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_obm;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_obm;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_on_board_monitoring;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_st12;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_generic;
  Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps;
 END Node1.others;


--- a/InterfaceView.aadl
+++ b/InterfaceView.aadl
--- a/InterfaceView.md5
+++ b/InterfaceView.md5
-7262d73651d1a611baf85f31a4daa62b  InterfaceView.aadl
+5a0cd3e2d4aac151cb46266c3be02b76  InterfaceView.aadl
--- a/__dv_1_3.aadl
+++ b/__dv_1_3.aadl
@@ -27,6 +27,7 @@ WITH interfaceview::IV::ground_system;
 WITH interfaceview::IV;
 WITH interfaceview::IV::cpdu1_AP;
 WITH interfaceview::IV::hk_report_AP;
+WITH interfaceview::IV::on_board_monitoring_AP;
 WITH ocarina_processors_x86;
 WITH deploymentview::DV::Node1;
 WITH Taste;
@@ -101,6 +102,24 @@ SUBCOMPONENTS
  IV_cpdu2 : SYSTEM interfaceview::IV::cpdu2.others {
    Taste::FunctionName => "cpdu2";
  };
+  IV_event_report : SYSTEM interfaceview::IV::on_board_monitoring_AP::event_report.others {
+    Taste::FunctionName => "event_report";
+  };
+  IV_execution_obm : SYSTEM interfaceview::IV::on_board_monitoring_AP::execution_obm.others {
+    Taste::FunctionName => "execution_obm";
+  };
+  IV_tm_obm : SYSTEM interfaceview::IV::on_board_monitoring_AP::tm_obm.others {
+    Taste::FunctionName => "tm_obm";
+  };
+  IV_on_board_monitoring : SYSTEM interfaceview::IV::on_board_monitoring_AP::on_board_monitoring.others {
+    Taste::FunctionName => "on_board_monitoring";
+  };
+  IV_acceptance_st12 : SYSTEM interfaceview::IV::on_board_monitoring_AP::acceptance_st12.others {
+    Taste::FunctionName => "acceptance_st12";
+  };
+  IV_execution_generic : SYSTEM interfaceview::IV::execution_generic.others {
+    Taste::FunctionName => "execution_generic";
+  };
  taps : PROCESS deploymentview::DV::Node1::taps.others {
    Taste::coordinates => "85474 64572 179410 99940";
    Deployment::Port_Number => 0;
@@ -130,6 +149,12 @@ PROPERTIES
  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_definitions;
  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sensor1;
  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu2;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_event_report;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_obm;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_obm;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_on_board_monitoring;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_st12;
+  Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_generic;
  Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps;
 END Node1.others;


--- a/__iv_1_3.aadl
+++ b/__iv_1_3.aadl
--- a/acceptance_cpdu1/DataView.pr
+++ b/acceptance_cpdu1/DataView.pr
 Datamodel DEFINITIONS ::= BEGIN

+-- ./dataview-uniq.asn
+PMON_function_status ::= ENUMERATED {
+    enabled(0),
+    disabled(1)
+}
+
+-- ./dataview-uniq.asn
+PMON_status ::= ENUMERATED {
+    enabled(0),
+    disabled(1)
+}
+
+-- ./dataview-uniq.asn
+PMON_limit_check_status ::= ENUMERATED {
+    unchecked(0),
+    invalid(1),
+    within_limits(2),
+    below_low_limit(3),
+    above_high_limit(4)
+}
+
+-- ./dataview-uniq.asn
+PMON_exp_value_check_status ::= ENUMERATED {
+    unchecked(0),
+    invalid(1),
+    expected_value(2),
+    unexpected_value(3)
+}
+
+-- ./dataview-uniq.asn
+TC_12_15 ::= SEQUENCE {
+
+}
+
+-- ./dataview-uniq.asn
+TC_12_16 ::= SEQUENCE {
+
+}
+
+-- ./dataview-uniq.asn
+TC_12_13 ::= SEQUENCE {
+
+}
+
 -- ./dataview-uniq.asn
 TYPE8b_ID ::= INTEGER (0 .. 255)

@@ -16,7 +60,19 @@ APID ::= ENUMERATED {
    cpdu1_AP(5),
    cpdu2_AP(6),
    hk_report_AP(7),
-    params_statistics_AP(8)
+    params_statistics_AP(8),
+    event_rep_AP(9),
+    raw_mem_AP(10),
+    common_mem_AP(11),
+    config_mem_AP(12),
+    st13_send_AP(13),
+    st13_receive_AP(14),
+    schedule_AP(15),
+    storage_AP(16),
+    test_AP(17),
+    event_action_AP(18),
+    param_manage_AP(19),
+    file_manage_AP(20)
 }

 -- ./dataview-uniq.asn
@@ -28,6 +84,12 @@ APUserID ::= ENUMERATED {
    sc_cpdu_User(5)
 }

+-- ./dataview-uniq.asn
+On_board_params_IDs ::= ENUMERATED {
+    s1_vcc(5),
+    s1_stat(6)
+}
+
 -- ./dataview-uniq.asn
 On_off_dev_addr ::= ENUMERATED {
    onAddr(61136),
@@ -218,6 +280,196 @@ Sensor2_Output ::= ENUMERATED {
    s2v3(2)
 }

+-- ./dataview-uniq.asn
+Event_Definition_ID_inst ::= ENUMERATED {
+    bll_ID(0),
+    ahl_ID(1),
+    uv_ID(2)
+}
+
+-- ./dataview-uniq.asn
+Auxiliary_Data_inst ::= ENUMERATED {
+    below_low_limit(0),
+    above_high_limit(1),
+    unexpected_value(2)
+}
+
+-- ./dataview-uniq.asn
+Event_Report_inst ::= SEQUENCE {
+    event_def_id	Event_Definition_ID_inst,
+    aux_data	Auxiliary_Data_inst
+}
+
+-- ./dataview-uniq.asn
+TM_5_1 ::= SEQUENCE {
+    event_def_id	Event_Definition_ID_inst,
+    aux_data	Auxiliary_Data_inst
+}
+
+-- ./dataview-uniq.asn
+TM_5_2 ::= SEQUENCE {
+    event_def_id	Event_Definition_ID_inst,
+    aux_data	Auxiliary_Data_inst
+}
+
+-- ./dataview-uniq.asn
+TM_5_3 ::= SEQUENCE {
+    event_def_id	Event_Definition_ID_inst,
+    aux_data	Auxiliary_Data_inst
+}
+
+-- ./dataview-uniq.asn
+TM_5_4 ::= SEQUENCE {
+    event_def_id	Event_Definition_ID_inst,
+    aux_data	Auxiliary_Data_inst
+}
+
+-- ./dataview-uniq.asn
+Event_Definition_inst ::= SEQUENCE {
+    event_def_id	Event_Definition_ID_inst,
+    aux_data	Auxiliary_Data_inst,
+    severity	Event_Definition_inst_severity
+}
+
+-- ./dataview-uniq.asn
+EventDef_Index ::= INTEGER (1 .. 3)
+
+-- ./dataview-uniq.asn
+Event_Definitions_List_inst ::= SEQUENCE (SIZE (3 .. 3)) OF Event_Definition_inst
+
+-- ./dataview-uniq.asn
+Events_No_Inst ::= INTEGER (0 .. 100000)
+
+-- ./dataview-uniq.asn
+S1_status ::= ENUMERATED {
+    off(0),
+    on(1)
+}
+
+-- ./dataview-uniq.asn
+Param_Monitor_Def_ID_inst ::= ENUMERATED {
+    param_def_ID_01(0),
+    param_def_ID_02(1)
+}
+
+-- ./dataview-uniq.asn
+RepetitionNo_inst ::= INTEGER (1 .. 255)
+
+-- ./dataview-uniq.asn
+Param_Def_Index ::= INTEGER (1 .. 2)
+
+-- ./dataview-uniq.asn
+RepetitionNo_List_inst ::= SEQUENCE (SIZE (1 .. 2)) OF RepetitionNo_inst
+
+-- ./dataview-uniq.asn
+RepCounter ::= INTEGER (0 .. 2)
+
+-- ./dataview-uniq.asn
+Repetition_Counter_List_inst ::= SEQUENCE (SIZE (1 .. 2)) OF RepCounter
+
+-- ./dataview-uniq.asn
+Limit_Type_inst ::= INTEGER (0 .. 255)
+
+-- ./dataview-uniq.asn
+Mask_Type_inst ::= INTEGER (1 .. 255)
+
+-- ./dataview-uniq.asn
+Definition_Limit_Check ::= SEQUENCE {
+    lower_limit	Limit_Type_inst,
+    lower_event_id	Event_Definition_ID_inst,
+    upper_limit	Limit_Type_inst,
+    upper_event_id	Event_Definition_ID_inst,
+    pmon_limit_check_stat	PMON_limit_check_status
+}
+
+-- ./dataview-uniq.asn
+Definition_Expected_Value_Check ::= SEQUENCE {
+    expected_value	S1_status,
+    mask	Mask_Type_inst,
+    unexpected_event_id	Event_Definition_ID_inst,
+    pmon_exp_val_check_stat	PMON_exp_value_check_status
+}
+
+-- ./dataview-uniq.asn
+Definition_Check_Type ::= CHOICE {
+    limit_check	Definition_Limit_Check,
+    exp_value_check	Definition_Expected_Value_Check
+}
+
+-- ./dataview-uniq.asn
+Parameter_Monitoring_Definition_inst ::= SEQUENCE {
+    param_monitor_def_id	Param_Monitor_Def_ID_inst,
+    on_board_parameter_id	On_board_params_IDs,
+    repetition_No	RepetitionNo_inst,
+    check_type	Definition_Check_Type,
+    pmon_stat	PMON_status
+}
+
+-- ./dataview-uniq.asn
+Param_Monitor_Def_List_inst ::= SEQUENCE (SIZE (2 .. 2)) OF Parameter_Monitoring_Definition_inst
+
+-- ./dataview-uniq.asn
+Setting_Param_Monitoring_Def_inst ::= SEQUENCE (SIZE (1 .. 2)) OF Param_Monitor_Def_ID_inst
+
+-- ./dataview-uniq.asn
+TC_12_1 ::= Setting_Param_Monitoring_Def_inst
+
+-- ./dataview-uniq.asn
+TC_12_2 ::= Setting_Param_Monitoring_Def_inst
+
+-- ./dataview-uniq.asn
+Report_Def_Status_inst ::= SEQUENCE {
+    param_monitor_def_id	Param_Monitor_Def_ID_inst,
+    pmon_stat	PMON_status
+}
+
+-- ./dataview-uniq.asn
+TM_12_14 ::= SEQUENCE (SIZE (2 .. 2)) OF Report_Def_Status_inst
+
+-- ./dataview-uniq.asn
+Exp_Value_Transition_inst ::= SEQUENCE {
+    mask	Mask_Type_inst,
+    paramVal	S1_status,
+    limitCrossed	S1_status,
+    prevPMON_check_status	PMON_exp_value_check_status,
+    currentPMON_check_status	PMON_exp_value_check_status
+}
+
+-- ./dataview-uniq.asn
+Limit_Transition_inst ::= SEQUENCE {
+    paramVal	Limit_Type_inst,
+    limitCrossed	Limit_Type_inst,
+    prevPMON_check_status	PMON_limit_check_status,
+    currentPMON_check_status	PMON_limit_check_status
+}
+
+-- ./dataview-uniq.asn
+Transition_Type_inst ::= CHOICE {
+    limit_check_trans	Limit_Transition_inst,
+    exp_value_trans	Exp_Value_Transition_inst
+}
+
+-- ./dataview-uniq.asn
+Check_Transit_Notification_inst ::= SEQUENCE {
+    pmon_id	Param_Monitor_Def_ID_inst,
+    param_id	On_board_params_IDs,
+    check_type	Check_Transit_Notification_inst_check_type,
+    transition	Transition_Type_inst,
+    transition_time	T_UInt32
+}
+
+-- ./dataview-uniq.asn
+TM_12_12 ::= Check_Transit_Notification_inst
+
+-- ./dataview-uniq.asn
+IndexCTR ::= INTEGER (1 .. 2)
+
+-- ./dataview-uniq.asn
+New_checkStatus ::= SEQUENCE (SIZE (2 .. 2)) OF BOOLEAN
+
+-- ./dataview-uniq.asn
+First_check ::= SEQUENCE (SIZE (2 .. 2)) OF BOOLEAN
+
 -- ./dataview-uniq.asn
 TCs ::= CHOICE {
    tc2_1	TC_2_1,
@@ -228,7 +480,12 @@ TCs ::= CHOICE {
    tc3_6	TC_3_6,
    tc3_9	TC_3_9,
    tc3_27	TC_3_27,
-    tc3_31	TC_3_31
+    tc3_31	TC_3_31,
+    tc12_1	TC_12_1,
+    tc12_2	TC_12_2,
+    tc12_13	TC_12_13,
+    tc12_15	TC_12_15,
+    tc12_16	TC_12_16
 }

 -- ./dataview-uniq.asn
@@ -420,7 +677,13 @@ TMs ::= CHOICE {
    tm1_8	TM_1_8,
    tm1_10	TM_1_10,
    tm3_10	TM_3_10,
-    tm3_25	TM_3_25
+    tm3_25	TM_3_25,
+    tm5_1	TM_5_1,
+    tm5_2	TM_5_2,
+    tm5_3	TM_5_3,
+    tm5_4	TM_5_4,
+    tm12_12	TM_12_12,
+    tm12_14	TM_12_14
 }

 -- ./dataview-uniq.asn
@@ -491,6 +754,20 @@ Telecommand_secondary_header ::= SEQUENCE {
 -- ./dataview-uniq.asn
 Telecommand_packet_length ::= INTEGER (0 .. 65535)

+-- ./dataview-uniq.asn
+Check_Transit_Notification_inst_check_type ::= ENUMERATED {
+    limit_check(0),
+    expected_value_check(1)
+}
+
+-- ./dataview-uniq.asn
+Event_Definition_inst_severity ::= ENUMERATED {
+    informative(0),
+    low_severity(1),
+    medium_severity(2),
+    high_severity(3)
+}
+
 -- ./dataview-uniq.asn
 TM_3_10_super_hk_sets ::= SEQUENCE (SIZE (0 .. 2)) OF Super_HK_Parameter_Set_Inst

@@ -522,23 +799,28 @@ TM_secondary_header_message_type_counter ::= INTEGER (0 .. 65535)
 TM_secondary_header_time_reference_status ::= INTEGER (0 .. 15)

 -- ./dataview-uniq.asn
-Test_TC ::= SEQUENCE {
-    identifierRequest	T_UInt32,
-    cpduID	T_UInt8,
-    crc	BOOLEAN
+ST01RoutingTestParams ::= SEQUENCE {
+    crcTest	BOOLEAN
 }

 -- ./dataview-uniq.asn
-Test_TM ::= SEQUENCE {
-    failureCodes	Test_failureCodes,
-    sourceID	T_UInt32
+ST01AcceptanceTestParams ::= SEQUENCE {
+    crcTest	BOOLEAN,
+    serviceAvailableTest	BOOLEAN,
+    ready	BOOLEAN
 }

 -- ./dataview-uniq.asn
-Test_failureCodes ::= ENUMERATED {
-    crcFailure(0),
-    destinationNotFound(1),
-    destinationNotReady(2)
+ST01ExecutionTestParams ::= SEQUENCE {
+    execStart	BOOLEAN,
+    execProgress	BOOLEAN,
+    execCompletion	BOOLEAN
+}
+
+-- ./dataview-uniq.asn
+ST12OnBoardMonitoringTest ::= SEQUENCE {
+    v_cc	T_UInt8,
+    s1_stat	S1_status
 }

 -- ./dataview-uniq.asn
@@ -547,26 +829,29 @@ Test_Taps_Parameters ::= CHOICE {
    testST01Acceptance	ST01AcceptanceTestParams,
    testST01Execution	ST01ExecutionTestParams,
    testCPDU1status	CPDU_status,
-    testCPDU2status	CPDU_status
+    testCPDU2status	CPDU_status,
+    testEvents	Event_Definition_ID_inst,
+    testST12OnBoardMonitor	ST12OnBoardMonitoringTest
 }

 -- ./dataview-uniq.asn
-ST01AcceptanceTestParams ::= SEQUENCE {
-    crcTest	BOOLEAN,
-    serviceAvailableTest	BOOLEAN,
-    ready	BOOLEAN
+Test_failureCodes ::= ENUMERATED {
+    crcFailure(0),
+    destinationNotFound(1),
+    destinationNotReady(2)
 }

 -- ./dataview-uniq.asn
-ST01RoutingTestParams ::= SEQUENCE {
-    crcTest	BOOLEAN
+Test_TM ::= SEQUENCE {
+    failureCodes	Test_failureCodes,
+    sourceID	T_UInt32
 }

 -- ./dataview-uniq.asn
-ST01ExecutionTestParams ::= SEQUENCE {
-    execStart	BOOLEAN,
-    execProgress	BOOLEAN,
-    execCompletion	BOOLEAN
+Test_TC ::= SEQUENCE {
+    identifierRequest	T_UInt32,
+    cpduID	T_UInt8,
+    crc	BOOLEAN
 }

 -- ./dataview-uniq.asn

--- a/acceptance_cpdu1/DataView.py
+++ b/acceptance_cpdu1/DataView.py
--- a/acceptance_cpdu1/acceptance_cpdu1.adb
+++ b/acceptance_cpdu1/acceptance_cpdu1.adb
@@ -16,8 +16,14 @@ with Request_Verification_Reports;
 use Request_Verification_Reports;
 with HK_Service_Structures;
 use HK_Service_Structures;
+with Event_Reporting_Structures;
+use Event_Reporting_Structures;
+with Parameter_Monitoring_Structures;
+use Parameter_Monitoring_Structures;
 with Taps;
 use Taps;
+with Taps_Test_Structures;
+use Taps_Test_Structures;
 with TASTE_Dataview;
 use TASTE_Dataview;
 with TASTE_BasicTypes;

--- a/acceptance_cpdu1/acceptance_cpdu1.ads
+++ b/acceptance_cpdu1/acceptance_cpdu1.ads
@@ -10,8 +10,14 @@ with Request_Verification_Reports;
 use Request_Verification_Reports;
 with HK_Service_Structures;
 use HK_Service_Structures;
+with Event_Reporting_Structures;
+use Event_Reporting_Structures;
+with Parameter_Monitoring_Structures;
+use Parameter_Monitoring_Structures;
 with Taps;
 use Taps;
+with Taps_Test_Structures;
+use Taps_Test_Structures;
 with TASTE_Dataview;
 use TASTE_Dataview;
 with TASTE_BasicTypes;

--- a/acceptance_cpdu1/dataview-uniq.asn
+++ b/acceptance_cpdu1/dataview-uniq.asn
@@ -80,7 +80,7 @@ TM-1-type1 {Request-ID, Failure-Notice} ::= SEQUENCE {
 }
 END

-- Generic definition of HK service
+-- Generic definitions for HK service
 HK-Service-Structures DEFINITIONS ::=
 BEGIN
  Simply-HK-IDs{INTEGER: n1-max, Simply-HK-Parameter-ID} ::= SEQUENCE (SIZE (0..n1-max)) OF Simply-HK-Parameter-ID
@@ -128,6 +128,121 @@ HK-Parameter-Report{HK-Structure-ID, HK-Parameter-Value} ::= SEQUENCE {

 END

+--************************************************************************************************************************************************* ST[05] 
+-- Generic definitions for the Event reporting ST[05] service
+Event-Reporting-Structures DEFINITIONS ::=
+BEGIN
+   -- The source data for event reports; types TM[5,1-4]: informative, low/medium/high severity level	
+  Event-Report {Event-Definition-ID, Auxiliary-Data} ::= SEQUENCE {
+	event-def-id		Event-Definition-ID,
+	aux-data		Auxiliary-Data
+  }
+
+  -- the event definition type
+  Event-Definition {Event-Definition-ID, Auxiliary-Data} ::= SEQUENCE {
+	event-def-id		Event-Definition-ID,
+	aux-data		Auxiliary-Data,
+	severity		ENUMERATED { informative, low-severity, medium-severity, high-severity }
+  }
+
+  -- the list of project event definitions
+  Event-Definitions-List{INTEGER: event-List-Size, Event-Definition} ::= SEQUENCE ( SIZE(event-List-Size) ) OF Event-Definition
+
+  -- the st[05] event reporting observables
+  Events-No{INTEGER: maxEventsNo} ::= INTEGER(0..maxEventsNo)
+  
+END
+
+--************************************************************************************************************************************************* ST[12] 
+-- Generic definitions for the On-board monitoring service ST[12] service
+Parameter-Monitoring-Structures DEFINITIONS ::=
+BEGIN
+
+  -- define a status called the 'PMON function status' that indicates if the overall parameter monitoring function is enabled or disabled
+  PMON-function-status ::= ENUMERATED { enabled, disabled }
+  -- define for each parameter monitoring definition a status called the 'PMON status' 
+  PMON-status ::= ENUMERATED { enabled, disabled }
+  --define for each parameter monitoring definition a status called the 'PMON checking status' 
+  PMON-limit-check-status ::= ENUMERATED { unchecked, invalid, within-limits, below-low-limit, above-high-limit}
+  PMON-exp-value-check-status ::= ENUMERATED { unchecked, invalid, expected-value, unexpected-value}
+
+  -- the parameter monitoring definition
+  Parameter-Monitoring-Definition {Param-Monitor-Def-ID, On-Board-Param-ID, RepetitionNo, Definition-Check-Type} ::= SEQUENCE {
+	param-monitor-def-id			Param-Monitor-Def-ID,
+	on-board-parameter-id			On-Board-Param-ID,
+	repetition-No			RepetitionNo,
+	check-type			Definition-Check-Type,