Index: sources/model/MModel.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rd862dfcd402206e33b314c458e41c13b684a4565 --- sources/model/MModel.h (.../MModel.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/MModel.h (.../MModel.h) (revision d862dfcd402206e33b314c458e41c13b684a4565) @@ -39,7 +39,7 @@ #include "MUIPostFinalResultHDRequest.h" // States Messages -#include "MHDOperationModeData.h" +#include "MTDOpModeData.h" #include "MPreTreatmentStatesData.h" #include "MTreatmentStatesData.h" #include "MPostTreatmentStatesData.h" @@ -59,12 +59,20 @@ #include "MTreatmentStopData.h" #include "MHDAccelerometerData.h" #include "MHDSyringePumpData.h" -#include "MHDAirTrapData.h" #include "MHDBloodLeakData.h" #include "MHDAirBubbleData.h" #include "MHDRTCEpochData.h" #include "MHDUsageInfoResponse.h" +#include "MTDAirTrapData.h" +#include "MTDVoltageData.h" +#include "MTDBloodPumpData.h" +#include "MTDValvesData.h" +#include "MTDBatteryData.h" +#include "MTDSwitchesData.h" +#include "MTDEjectorData.h" +#include "MTDTemperatureData.h" + // Debugging Messages #include "MHDDebugText.h" #include "MDGDebugText.h" @@ -74,11 +82,11 @@ // Settings #include "MAdjustHDRequests.h" #include "MAdjustDGRequests.h" -#include "MAdjustHDVersionsRequest.h" -#include "MAdjustHDVersionsResponse.h" -#include "MAdjustDGVersionsResponse.h" -#include "MAdjustHDSerialNumberResponse.h" -#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustTDVersionsRequest.h" +#include "MAdjustTDVersionsResponse.h" +#include "MAdjustDDVersionsResponse.h" +#include "MAdjustTDSerialNumberResponse.h" +#include "MAdjustDDSerialNumberResponse.h" #include "MAdjustHDServiceModeResponse.h" #include "MAdjustHDServiceDatesResponse.h" #include "MAdjustDGServiceDatesResponse.h" @@ -195,22 +203,22 @@ * and assign a correct message value to it. * Note that it needs to be in little endian so if you have a message Id of 37 your enum should have a value of 0x2500 in hex. * \code{.cpp} - * ID_HDOperationModeData = 0x2500, // 37 // little endian + * ID_TDOpModeData = 0x1200, // 18 // little endian * \endcode * * 02 - MessageGlobals.h : add len * \code{.cpp} - * {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes + * {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes * \endcode * * 03 - Implement the model by copy/paste of the closest model, fit to your need. - * \sa MHDOperationMode - * \sa MHDOperationModeData.h - * \sa MHDOperationModeData.cpp + * \sa MTDOpMode + * \sa MTDOpModeData.h + * \sa MTDOpModeData.cpp * * 04 - Added #include in MModel.h for the implemented model * \code{.cpp} - * #include "MHDOperationModeData.h" + * #include "MTDOpModeData.h" * \endcode * * 05 - Register the model in MModel.h by adding it to the macro lists : @@ -227,30 +235,30 @@ * * View : * 07 - Implement the view by copy/paste of the closest view, fit to your need. - * \sa VHDOperationMode - * \sa VHDOperationModeData.h - * \sa VHDOperationModeData.cpp + * \sa VTDOpMode + * \sa VTDOpModeData.h + * \sa VTDOpModeData.cpp * * 08 - Register the view in VView.h in macro list * \sa REGISTER_VIEW_TYPES * \sa VView.h * * 09 - Include the view header in the GuiGlobals.cpp * \code{.cpp} - * #include "VHDOperationModeData.h" + * #include "VTDOpModeData.h" * \endcode * \sa GuiGlobals.cpp * * QML : * 10 - Import the registered view * \code{.js} - * import VHDOperationMode 0.1; + * import VTDOpMode 0.1; * \endcode * \sa main.qml * * 11 - Create an object * \code{.js} - * VHDOperationMode { id: vHDOperationMode } + * VTDOpMode { id: vTDOpMode } * \endcode * \sa main.qml * @@ -306,7 +314,7 @@ REGISTER_METATYPE( BluetoothData ) \ REGISTER_METATYPE( BluetoothDeviceData ) \ /* Data */ \ - REGISTER_METATYPE( HDOperationModeData ) \ + REGISTER_METATYPE( TDOpModeData ) \ REGISTER_METATYPE( PreTreatmentStatesData ) \ REGISTER_METATYPE( TreatmentStatesData ) \ REGISTER_METATYPE( PostTreatmentStatesData ) \ @@ -326,7 +334,14 @@ REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ REGISTER_METATYPE( HDBloodLeakData ) \ - REGISTER_METATYPE( HDAirTrapData ) \ + REGISTER_METATYPE( TDAirTrapData ) \ + REGISTER_METATYPE( TDVoltageData ) \ + REGISTER_METATYPE( TDBloodPumpData ) \ + REGISTER_METATYPE( TDValvesData ) \ + REGISTER_METATYPE( TDBatteryData ) \ + REGISTER_METATYPE( TDSwitchesData ) \ + REGISTER_METATYPE( TDEjectorData ) \ + REGISTER_METATYPE( TDTemperatureData ) \ REGISTER_METATYPE( HDAirBubbleData ) \ REGISTER_METATYPE( HDUsageInfoResponseData ) \ REGISTER_METATYPE( HDUsageInfoRequestData ) \ @@ -438,11 +453,11 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ - REGISTER_METATYPE( AdjustVersionsHDRequestData ) \ - REGISTER_METATYPE( AdjustVersionsHDResponseData ) \ - REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ - REGISTER_METATYPE( AdjustSerialNumberHDResponseData ) \ - REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ + REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ + REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ + REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberTDResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberDDResponseData ) \ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \ @@ -487,7 +502,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDRTCEpochData ) \ /* */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, SettingsData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDOpModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PostTreatmentStatesData ) \ @@ -508,7 +523,14 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirBubbleData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAirTrapData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDAirTrapData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDVoltageData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBloodPumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDTemperatureData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDEjectorData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSwitchesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBatteryData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDValvesData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ @@ -569,11 +591,11 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDRequestData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsHDResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberHDResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberTDResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \ @@ -680,7 +702,7 @@ ACTION_RECEIVE_SIGNAL ( UIPostFinalResultHDRequestData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( SettingsData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDOpModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PostTreatmentStatesData ) \ @@ -701,7 +723,14 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDBloodLeakData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirBubbleData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( HDAirTrapData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDAirTrapData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDVoltageData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDBloodPumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDValvesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDBatteryData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDSwitchesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDEjectorData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TDTemperatureData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ @@ -762,11 +791,11 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDRequestData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsHDResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberHDResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberTDResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \ @@ -977,7 +1006,7 @@ /* Received signals */ \ /* NO RESPONSE message model here */ \ ACTION_RECEIVE_SIGNAL( SettingsData ) \ - ACTION_RECEIVE_SIGNAL( HDOperationModeData ) \ + ACTION_RECEIVE_SIGNAL( TDOpModeData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStatesData ) \ ACTION_RECEIVE_SIGNAL( PostTreatmentStatesData ) \ @@ -997,7 +1026,14 @@ ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ ACTION_RECEIVE_SIGNAL( HDBloodLeakData ) \ - ACTION_RECEIVE_SIGNAL( HDAirTrapData ) \ + ACTION_RECEIVE_SIGNAL( TDAirTrapData ) \ + ACTION_RECEIVE_SIGNAL( TDVoltageData ) \ + ACTION_RECEIVE_SIGNAL( TDBloodPumpData ) \ + ACTION_RECEIVE_SIGNAL( TDValvesData ) \ + ACTION_RECEIVE_SIGNAL( TDBatteryData ) \ + ACTION_RECEIVE_SIGNAL( TDSwitchesData ) \ + ACTION_RECEIVE_SIGNAL( TDEjectorData ) \ + ACTION_RECEIVE_SIGNAL( TDTemperatureData ) \ ACTION_RECEIVE_SIGNAL( HDAirBubbleData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ @@ -1060,11 +1096,11 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustVersionsHDRequestData ) \ - ACTION_RECEIVE_SIGNAL( AdjustVersionsHDResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustSerialNumberHDResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberTDResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \