Index: sources/model/MModel.h =================================================================== diff -u -r8350b02fa06da7cb6d7f085f88f55bf505ae78df -r57fdcc6fcd4d91311544c2085cee41108293b6f6 --- sources/model/MModel.h (.../MModel.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) +++ sources/model/MModel.h (.../MModel.h) (revision 57fdcc6fcd4d91311544c2085cee41108293b6f6) @@ -564,6 +564,24 @@ REGISTER_METATYPE( AdvancedInstitutionalRecordResponseData ) \ REGISTER_METATYPE( DDCalibrationPressureRequestData ) \ REGISTER_METATYPE( AdjustDDCalibrationPressureRequestData ) \ + REGISTER_METATYPE( DDCalibrationTemperatureRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationTemperatureRequestData ) \ + REGISTER_METATYPE( DDCalibrationConcentratePumpRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConcentratePumpRequestData ) \ + REGISTER_METATYPE( DDCalibrationD12DialysatePumpRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + REGISTER_METATYPE( DDCalibrationD48DialysatePumpRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + REGISTER_METATYPE( DDCalibrationAcidConcentratesRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAcidConcentratesRequestData ) \ + REGISTER_METATYPE( DDCalibrationBicarbConcentratesRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + REGISTER_METATYPE( DDCalibrationAccelerometerSensorRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationAccelerometerSensorRequestData ) \ + REGISTER_METATYPE( DDCalibrationBloodLeakSensorRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + REGISTER_METATYPE( DDCalibrationConductivityRequestData ) \ + REGISTER_METATYPE( AdjustDDCalibrationConductivityRequestData ) \ REGISTER_METATYPE( DDCalibrationPressureResponseData ) \ REGISTER_METATYPE( AdjustDDCalibrationPressureResponseData ) \ /* HD reset in service mode */ \ @@ -816,6 +834,24 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationPressureRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ @@ -1070,6 +1106,24 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationPressureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ @@ -1146,6 +1200,24 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationPressureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ @@ -1222,6 +1294,24 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdvancedInstitutionalRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationPressureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationPressureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationTemperatureRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationConcentratePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationD12DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationD48DialysatePumpRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationAcidConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationBicarbConcentratesRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(AdjustDDCalibrationAccelerometerSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationBloodLeakSensorRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( DDCalibrationConductivityRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDDCalibrationConductivityRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \