Index: sources/model/MModel.h =================================================================== diff -u -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 -rc54863854ab063797737c6b3753e00115c0bbd11 --- sources/model/MModel.h (.../MModel.h) (revision a524ef99542bfa8d371835bc7c7d24c68ecf1865) +++ sources/model/MModel.h (.../MModel.h) (revision c54863854ab063797737c6b3753e00115c0bbd11) @@ -94,10 +94,13 @@ #include "MAdjustHDServiceModeResponse.h" #include "MAdjustHDServiceDatesResponse.h" #include "MAdjustDGServiceDatesResponse.h" -#include "MAdjustHDDateTimeResponse.h" -#include "MAdjustDGDateTimeResponse.h" +#include "MAdjustTDDateTimeResponse.h" +#include "MAdjustDDDateTimeResponse.h" #include "MDuetRoWaterDG.h" -#include "MAdjustHDInstitutionalRecordResponse.h" +#include "MAdjustTDInstitutionalRecordResponse.h" +#include "MTDInstitutionalRecordResponse.h" +#include "MAdjustTDAdvancedInstitutionalRecordResponse.h" +#include "MTDAdvancedInstitutionalRecordResponse.h" // DG Data Messages #include "MDGDrainPumpData.h" @@ -333,6 +336,8 @@ REGISTER_METATYPE( DeviceWifiInfoResponseData ) \ REGISTER_METATYPE( DeviceWifiConnectRequestData ) \ REGISTER_METATYPE( DeviceWifiConnectResponseData ) \ + REGISTER_METATYPE( DeviceDateTimeRequestData ) \ + REGISTER_METATYPE( DeviceDateTimeResponseData ) \ /* Settings */ \ REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( BluetoothData ) \ @@ -459,8 +464,8 @@ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceModeRequestData ) \ REGISTER_METATYPE( AdjustServiceDatesRequestData ) \ - REGISTER_METATYPE( AdjustHDDateTimeRequestData ) \ - REGISTER_METATYPE( AdjustDGDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustTDDateTimeRequestData ) \ + REGISTER_METATYPE( AdjustDDDateTimeRequestData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeRequestData ) \ \ /* Response */ \ @@ -504,13 +509,19 @@ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \ - REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ - REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustTDDateTimeResponseData ) \ + REGISTER_METATYPE( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ REGISTER_METATYPE( AlarmActiveListResponseData ) \ REGISTER_METATYPE( AdjustHDAlarmVolumeResponseData ) \ REGISTER_METATYPE( AdjustInstitutionalRequestData ) \ REGISTER_METATYPE( AdjustInstitutionalRecordResponseData ) \ + REGISTER_METATYPE( InstitutionalRequestData ) \ + REGISTER_METATYPE( InstitutionalRecordResponseData ) \ + REGISTER_METATYPE( AdjustAdvancedInstitutionalRequestData ) \ + REGISTER_METATYPE( AdjustAdvancedInstitutionalRecordResponseData ) \ + REGISTER_METATYPE( AdvancedInstitutionalRequestData ) \ + REGISTER_METATYPE( AdvancedInstitutionalRecordResponseData ) \ /* HD reset in service mode */ \ REGISTER_METATYPE( AdjustHDResetInSrvcRequestData ) \ @@ -660,15 +671,17 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRecordResponseData ) \ - + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, InstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRecordResponseData ) \ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ /* CONFIRM */ \ @@ -695,8 +708,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDAlarmVolumeRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientDisconnectionNotifyRequestData ) \ @@ -727,6 +740,9 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, InstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustAdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ @@ -879,16 +895,18 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDDDateTimeResponseData ) \ /* Alarms - Active List Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDAlarmVolumeResponseData ) \ /* Settings - HD Data Response */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDUsageInfoResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( InstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdvancedInstitutionalRecordResponseData ) \ - #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ /* CONFIRM */ \ @@ -937,8 +955,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ @@ -947,6 +965,9 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( InstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustAdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdvancedInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ @@ -998,8 +1019,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ @@ -1008,6 +1029,9 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( InstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustAdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdvancedInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ @@ -1059,8 +1083,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustServiceDatesRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTDDateTimeRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDAlarmVolumeRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ @@ -1069,6 +1093,9 @@ /* Settings - HD Info */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( HDUsageInfoRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( InstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustAdvancedInstitutionalRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdvancedInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \ @@ -1205,16 +1232,18 @@ ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustTDDateTimeResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDDDateTimeResponseData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDAlarmVolumeResponseData ) \ /* Settings - HD data response */ \ ACTION_RECEIVE_SIGNAL( HDUsageInfoResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_SIGNAL( InstitutionalRecordResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustAdvancedInstitutionalRecordResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdvancedInstitutionalRecordResponseData ) \ - //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//