Index: leahi.pro =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- leahi.pro (.../leahi.pro) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ leahi.pro (.../leahi.pro) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -125,6 +125,8 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ + sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h \ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h \ @@ -151,7 +153,6 @@ sources/model/settings/MBluetooth.h \ sources/model/ui/data/MUIBloodPressureData.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ - sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \ @@ -249,7 +250,6 @@ sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress sources/model/dg/data/pretreatment/MDGFilterFlushData.h \ @@ -415,6 +415,8 @@ \ # Controllers sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ + sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ + sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \ @@ -446,7 +448,6 @@ sources/model/settings/MSettings.cpp \ sources/model/settings/MBluetooth.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \ @@ -536,7 +537,6 @@ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings - sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -83,7 +83,7 @@ {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_TDAirTrapData , 5 * 4 + 1 }, // 5 parameters each 4bytes & 1 parameter 1 bytes + {Gui::GuiActionType::ID_TDAirTrapData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes @@ -113,8 +113,8 @@ {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 2*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// LEAHIZED - {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// LEAHIZED + {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) + {Gui::GuiActionType::ID_TDTemperatureData , 1 * 4 }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items) // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes @@ -233,10 +233,10 @@ // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsTDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsDDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsTDRsp ,3*1+2+4*1+4 }, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,3*1+2+4*1+4 }, // variable length parameters {Gui::GuiActionType::ID_AdjustSerialTDRsp , 1 * 1 }, // minimum 1 parameter 1 byte - {Gui::GuiActionType::ID_AdjustSerialDGRsp , 1 * 1 }, // minimum 1 parameter 1 byte + {Gui::GuiActionType::ID_AdjustSerialDDRsp , 1 * 1 }, // minimum 1 parameter 1 byte // ---- {Gui::GuiActionType::ID_AdjustVersionsTDReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustVersionsUIRsp ,1+1+1+2+4 }, // variable length parameters Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -601,8 +601,8 @@ // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages - case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp ); break; + case Gui::GuiActionType::ID_AdjustVersionsDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -783,7 +783,7 @@ break; case GuiActionType::ID_AdjustSerialTDRsp : - case GuiActionType::ID_AdjustSerialDGRsp : + case GuiActionType::ID_AdjustSerialDDRsp : // this message is not complete in one step and saves only the received info and waits for the other if complete will send. saveDeviceInfo(vAction, vData); break; @@ -1244,7 +1244,7 @@ _deviceInfoHD = ""; } } - if ( vAction == GuiActionType::ID_AdjustSerialDGRsp ) { + if ( vAction == GuiActionType::ID_AdjustSerialDDRsp ) { if ( vData.count() ) { _deviceInfoDG = vData[eDeviceInfo_Ix].toString(); } else { Index: sources/gui/GuiGlobals.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -95,13 +95,13 @@ ID_AdjustServiceModeRsp = 0xB100, // 177 // Version - ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED - ID_AdjustVersionsUIRsp = 0x1600, // 22 // ID_UIVersionsTxr - UI Version response transmit //// ----- @LEAHIZED - ID_AdjustVersionsTDReq = 0x1500, // 21 // ID_HDVersionsRxq - HD Version request received //// ----- @LEAHIZED - ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED - ID_AdjustVersionsDDRsp = 0x0F00, // 15 - ID_AdjustSerialTDRsp = 0x9900, // 153 - ID_AdjustSerialDGRsp = 0x8800, // 136 + ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED + ID_AdjustVersionsUIRsp = 0x1600, // 22 // ID_UIVersionsTxr - UI Version response transmit //// ----- @LEAHIZED + ID_AdjustVersionsTDReq = 0x1500, // 21 // ID_HDVersionsRxq - HD Version request received //// ----- @LEAHIZED + ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED + ID_AdjustVersionsDGRsp = 0x0F00, // 15 + ID_AdjustSerialTDRsp = 0x9900, // 153 //// ----- TODO: Update message ID and payload once defined in FW + ID_AdjustSerialDDRsp = 0x8800, // 136 //// ----- TODO: Update message ID and payload once defined in FW // Service Information ID_AdjustServiceDatesReq = 0x8900, // 137 @@ -122,13 +122,13 @@ // State Messages ID_HDOperationModeData = 0x1200, // 18 //// ----- @LEAHIZED ID_PreTreatmentStates = 0x5C00, // 92 - ID_TreatmentStates = 0x0F0F, // 15 //// ----- @LEAHIZED + ID_TreatmentStates = 0x0F0F, // 15 //// ----- @CRAPIZED: had to change to avoid duplication ID_PostTreatmentStates = 0x7700, // 119 // ----- ID_PowerOff = 0x0100, - ID_ShuttingDown = 0x2300, // 35 //// ----- @LEAHIZED - ID_TreatmentTime = 0x0D0F, // //// ----- @CRAPIZED: had to change to avoid duplication + ID_ShuttingDown = 0x0E0F, // 35 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentTime = 0x0D0F, // //// ----- @CRAPIZED: had to change to avoid duplication ID_BloodFlow = 0x0500, ID_DialysateInletFlow = 0x0800, ID_DialysateOutletFlow = 0x0B00, @@ -213,10 +213,10 @@ ID_TDVoltageData = 0x1D00, // 29 //// ----- @LEAHIZED ID_TDBloodPumpData = 0x1100, // 17 //// ----- @LEAHIZED ID_TDValvesData = 0x2B00, // 43 //// ----- @LEAHIZED - ID_TDBatteryData = 0x9400, //149 //// ----- TODO: @LEAHIZED + ID_TDBatteryData = 0x9400, //149 //// ----- TODO: MsgID subject to change given FW implementation ID_TDSwitchesData = 0x2100, // 33 //// ----- @LEAHIZED ID_TDEjectorData = 0x4E00, // 78 //// ----- @LEAHIZED - ID_TDTemperatureData = 0x9100, //146 //// ----- TODO: @LEAHIZED + ID_TDTemperatureData = 0x9100, //146 //// ----- TODO: MsgID subject to change given FW implementation // In-Treatment Adjustables ID_AdjustDurationReq = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -228,10 +228,10 @@ // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(7.0) - y : row(8.4) + x : col(6.0) + y : row(6.4) width : 425 - height : 80 + height : 160 onClicked : vAdjustmentVersions.doAdjustment() radius : 10 Column { @@ -246,7 +246,7 @@ title : "" horizontalAlignmentText: Text.AlignLeft fontPixelSizeText: Fonts.fontPixelDebugTitle - model: [ "TD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nSerial#: %10" + model: [ "TD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nTD Serial#: %10" .arg(vAdjustmentVersions.tdVerMajor ) .arg(vAdjustmentVersions.tdVerMinor ) .arg(vAdjustmentVersions.tdVerMicro ) @@ -259,6 +259,25 @@ .arg(vAdjustmentVersions.tdSerial ) ] } + + DebugDataColumn { id: _DDVersionsColumn + textObjectName :"_DDVersionsData" + title : "" + horizontalAlignmentText: Text.AlignLeft + fontPixelSizeText: Fonts.fontPixelDebugTitle + model: [ "DD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nDD Serial#: %10" + .arg(vAdjustmentVersions.ddVerMajor ) + .arg(vAdjustmentVersions.ddVerMinor ) + .arg(vAdjustmentVersions.ddVerMicro ) + .arg(vAdjustmentVersions.ddVerBuild ) + .arg(vAdjustmentVersions.ddVerFPGAMajor ) + .arg(vAdjustmentVersions.ddVerFPGAMinor ) + .arg(vAdjustmentVersions.ddVerFPGALab ) + .arg(vAdjustmentVersions.ddVerFPGAId ) + .arg(vAdjustmentVersions.ddVerCompatibilityRev ) + .arg(vAdjustmentVersions.ddSerial ) + ] + } } Index: sources/model/MModel.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/MModel.h (.../MModel.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/model/MModel.h (.../MModel.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -84,9 +84,9 @@ #include "MAdjustDGRequests.h" #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" -#include "MAdjustDGVersionsResponse.h" +#include "MAdjustDDVersionsResponse.h" #include "MAdjustTDSerialNumberResponse.h" -#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustDDSerialNumberResponse.h" #include "MAdjustHDServiceModeResponse.h" #include "MAdjustHDServiceDatesResponse.h" #include "MAdjustDGServiceDatesResponse.h" @@ -455,9 +455,9 @@ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ - REGISTER_METATYPE( AdjustVersionsDGResponseData ) \ + REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ REGISTER_METATYPE( AdjustSerialNumberTDResponseData ) \ - REGISTER_METATYPE( AdjustSerialNumberDGResponseData ) \ + REGISTER_METATYPE( AdjustSerialNumberDDResponseData ) \ REGISTER_METATYPE( AdjustServiceModeResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesHDResponseData ) \ REGISTER_METATYPE( AdjustServiceDatesDGResponseData ) \ @@ -593,9 +593,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberTDResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustServiceDatesDGResponseData ) \ @@ -793,9 +793,9 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberTDResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustServiceDatesDGResponseData ) \ @@ -1098,9 +1098,9 @@ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustVersionsDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSerialNumberTDResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDGResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSerialNumberDDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesHDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustServiceDatesDGResponseData ) \ Index: sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDGSerialNumberResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 19-Dec-2022 + * \author (original) Behrouz NematiPour + * \date (original) 13-Jun-2021 + * + */ +#include "MAdjustDDSerialNumberResponse.h" + +using namespace Model; + +QVariantList MAdjustSerialNumberDDResponse::parameters() const { + return { + _data.mSerialNumber + }; +} + +/** + * \brief MAdjustSerialNumberDDResponse::isValid + * \details Checks if character meets DG serial constraints. (Alphanumeric or '-') + * \param vChar - the character. + * \return bool - whether character is valid. + */ +bool MAdjustSerialNumberDDResponse::isValid(const QChar &vChar) +{ + return vChar.isLetterOrNumber() || vChar == '-'; +} + +/** + * \brief MAdjustSerialNumberDDResponse::fromByteArray + * \details Removes any invalid characters from DG serial string. + * \param vByteArray - DG serial string represented as a byte array. + * \return true if serial contains any valid characters. + */ +bool MAdjustSerialNumberDDResponse::fromByteArray(const QByteArray &vByteArray, int *) { + // only keep valid characters from serial and stop if end of line reached + QString serial; + for ( char c: vByteArray ) { + if ( !c ) break; + QChar ch(c); + if ( isValid(ch) ) { + serial += ch; + } + } + + // whitespace cannot be in serial and empty serial is invalid + _data.mSerialNumber = serial.trimmed(); + return ! _data.mSerialNumber.isEmpty(); +} + +MAdjustSerialNumberDDResponse::Data MAdjustSerialNumberDDResponse::data() const { + return _data; +} Index: sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -0,0 +1,77 @@ +/*! + * + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDDSerialNumberResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 19-Dec-2022 + * \author (original) Behrouz NematiPour + * \date (original) 13-Jun-2021 + * + */ +#pragma once + +// Qt + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustSerialNumberDDResponse class + * \details The DD serial number response data model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x8800| 0x070 | Rsp | Y | DD | UI | DD Serial Number | + * + * | Payload || + * | || + * | #1:(bytes) | \ref Data::serialNumber + null term | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | Serial | + * + */ +class MAdjustSerialNumberDDResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + bool isValid(const QChar &vChar); + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("Serial"); } + + struct Data { + QString mSerialNumber; + }; + + MAdjustSerialNumberDDResponse() {} + + bool fromByteArray (const QByteArray &vByteArray, int *vIndex = nullptr) override; + Data data ( ) const ; +private: + Data _data; +}; +} + +typedef Model::MAdjustSerialNumberDDResponse::Data AdjustSerialNumberDDResponseData; Index: sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -0,0 +1,65 @@ +/*! + * + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDDVersionsResponse.cpp + * \author (last) Michael Garthwaite + * \date (last) 28-Feb-2022 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 + * + */ +#include "MAdjustDDVersionsResponse.h" + +using namespace Model; + +QVariantList MAdjustVersionsDDResponse::parameters() const { + return { + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, + _data.mCompatibilityRev .value, + }; +} + +bool MAdjustVersionsDDResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mMajor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMinor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mMicro )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBuild )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFPGAId )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFPGAMajor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFPGAMinor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFPGALab )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCompatibilityRev )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false; +} + +AdjustVersionsDDResponseData MAdjustVersionsDDResponse::data() const { + Data data; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor .value; + data.mFPGAMinor = _data.mFPGAMinor .value; + data.mFPGALab = _data.mFPGALab .value; + data.mCompatibilityRev = _data.mCompatibilityRev .value; + return data; +} Index: sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h =================================================================== diff -u --- sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h (revision 0) +++ sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -0,0 +1,104 @@ +/*! + * + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MAdjustDDVersionsResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 27-Jun-2022 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustVersionsDDResponse class + * \details The DD versions data model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * | 0x0F00 | 0x101 | Rsp | Y | DD | All | DD Versions Data | + * + * | Payload || + * | || + * | #1:(U08) | \ref Data::mMajor | + * | #2:(U08) | \ref Data::mMinor | + * | #3:(U08) | \ref Data::mMicro | + * | #4:(U16) | \ref Data::mBuild | + * | #5:(U08) | \ref Data::mFPGAId | + * | #6:(U08) | \ref Data::mFPGAMajor | + * | #7:(U08) | \ref Data::mFPGAMinor | + * | #8:(U08) | \ref Data::mFPGALab | + * | #9:(U32) | \ref Data::mCompatibilty Rev | + * + * \sa Data + * \sa MAdjustVersionsDDResponse : DD Versions Response Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | Version | + * + */ +class MAdjustVersionsDDResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U08 mMajor ; + Types::U08 mMinor ; + Types::U08 mMicro ; + Types::U16 mBuild ; + Types::U08 mFPGAId ; + Types::U08 mFPGAMajor ; + Types::U08 mFPGAMinor ; + Types::U08 mFPGALab ; + Types::U32 mCompatibilityRev ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("VersionRsp") ; } + + struct Data { + quint8 mMajor = 0; /*!< DD Versions Major value of type quint8 extracted out */ + quint8 mMinor = 0; /*!< DD Versions Minor value of type quint8 extracted out */ + quint8 mMicro = 0; /*!< DD Versions Micro value of type quint8 extracted out */ + quint16 mBuild = 0; /*!< DD Versions Build value of type quint16 extracted out */ + quint8 mFPGAId = 0; /*!< DD Versions FPGA ID value of type quint8 extracted out */ + quint8 mFPGAMajor = 0; /*!< DD Versions FPGA Major value of type quint8 extracted out */ + quint8 mFPGAMinor = 0; /*!< DD Versions FPGA Minor value of type quint8 extracted out */ + quint8 mFPGALab = 0; /*!< DD Versions FPGA Lab value of type quint8 extracted out */ + quint32 mCompatibilityRev = 0; /*!< DD Compatibility Revision */ + }; + + MAdjustVersionsDDResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustVersionsDDResponse::Data AdjustVersionsDDResponseData; Fisheye: Tag 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 refers to a dead (removed) revision in file `sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -145,7 +145,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0x9F00 | 0x200 | Rsp | Y | UI | HD | UI Versions/SN Response | + * | 0x1600 | 0x041 | Rsp | Y | UI | TD | UI Versions/SN Response | * * | Payload || * | || Index: sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h (.../MAdjustTDVersionsRequest.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h (.../MAdjustTDVersionsRequest.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -5,7 +5,7 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MAdjustHDVersionsRequest.h + * \file MAdjustTDVersionsRequest.h * \author (last) Behrouz NematiPour * \date (last) 30-Jul-2021 * \author (original) Behrouz NematiPour @@ -28,23 +28,23 @@ /*! * \brief The MAdjustVersionsTDRequest class - * \details The HD versions data model + * \details The TD versions data model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0x9E00 | 0x020 | Req | Y | HD | UI | HD Versions Request Data | + * | 0x1500 | 0x040 | Req | Y | TD | UI | TD Versions Request Data | * * | Payload || * | || * * \sa Data - * \sa MAdjustVersionsTDRequest : HD Versions Request Data + * \sa MAdjustVersionsTDRequest : TD Versions Request Data * *

Logging info

* | || * | || * | typeText | Event | - * | unitText | HD | + * | unitText | TD | * | infoText | VersionReq | * */ Index: sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h (.../MAdjustTDVersionsResponse.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h (.../MAdjustTDVersionsResponse.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x0E00 | 0x020 | Rsp | Y | TD | All | TD Versions Data | + * | 0x0E00 | 0x100 | Rsp | Y | TD | All | TD Versions Data | * * | Payload || * | || Index: sources/model/hd/data/MTDAirTrapData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x2A00| 0x040 | 1 Hz | N | HD | All | TD Air Trap Data | + * |0x2A00| 0x100 | 1 Hz | N | TD | All | TD Air Trap Data | * * | Payload || * | || @@ -40,7 +40,7 @@ * | #3:(U32) | \ref Data::mLowLevelRaw | * | #4:(U32) | \ref Data::mUpLevelRaw | * | #5:(U32) | \ref Data::mValveState | - * | #6:(BOOL)| \ref Data::mControlling | + * | #6:(U32) | \ref Data::mControlling | * * \sa Data * @@ -81,7 +81,7 @@ quint32 mLowLevelRaw = 0; ///< lower level raw value quint32 mUpLevelRaw = 0; ///< upper level raw value quint32 mValveState = 0; ///< air valve state - bool mControlling = 0; ///< air control + quint32 mControlling = 0; ///< air control }; MTDAirTrapData () { } Index: sources/model/hd/data/MTDBatteryData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDBatteryData.h (.../MTDBatteryData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDBatteryData.h (.../MTDBatteryData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -26,12 +26,13 @@ namespace Model { /*! + * TODO: Subject to change upon FW implementation * \brief The MTDBatteryData class * \details The TD Battery data model * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x9400| 0x040 | 1 Hz | N | HD | All | TD Battery Data | + * |0x9400| 0x100 | 1 Hz | N | TD | All | TD Battery Data | * * | Payload || * | || Index: sources/model/hd/data/MTDBloodPumpData.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDBloodPumpData.h (.../MTDBloodPumpData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/model/hd/data/MTDBloodPumpData.h (.../MTDBloodPumpData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1100| 0x040 | 1 Hz | N | HD | All | TD Blood Pump Data | + * |0x1100| 0x100 | 1 Hz | N | TD | All | TD Blood Pump Data | * * | Payload || * | || Index: sources/model/hd/data/MTDEjectorData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x4E00| 0x040 | 1 Hz | N | HD | All | TD Ejector Data | + * |0x4E00| 0x100 | 1 Hz | N | TD | All | TD Ejector Data | * * | Payload || * | || Index: sources/model/hd/data/MTDSwitchesData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDSwitchesData.h (.../MTDSwitchesData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDSwitchesData.h (.../MTDSwitchesData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x2100| 0x040 | 1 Hz | N | HD | All | TD Switches Data | + * |0x2100| 0x100 | 1 Hz | N | TD | All | TD Switches Data | * * | Payload || * | || Index: sources/model/hd/data/MTDTemperatureData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDTemperatureData.h (.../MTDTemperatureData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDTemperatureData.h (.../MTDTemperatureData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -26,16 +26,17 @@ namespace Model { /*! + * TODO: Subject to change upon FW implementation * \brief The MTDTemperatureData class * \details The TD Temparature data model * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x9100| 0x040 | 1 Hz | N | HD | All | TD Temperature Data | + * |0x9100| 0x0100 | 1 Hz | N | TD | All | TD Temperature Data | * * | Payload || * | || - * | #1:(U32) | \ref Data::mBoardTemp | //// LEAHIZED + * | #1:(U32) | \ref Data::mBoardTemp | * * \sa Data * Index: sources/model/hd/data/MTDValvesData.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDValvesData.h (.../MTDValvesData.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/model/hd/data/MTDValvesData.h (.../MTDValvesData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x2B00| 0x040 | 1 Hz | N | HD | All | TD Valves Data | + * |0x2B00| 0x100 | 1 Hz | N | TD | All | TD Valves Data | * * | Payload || * | || Index: sources/model/hd/data/MTDVoltageData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/model/hd/data/MTDVoltageData.h (.../MTDVoltageData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDVoltageData.h (.../MTDVoltageData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1D00| 0x040 | 1 Hz | N | HD | All | TD Voltage Data | + * |0x1D00| 0x100 | 1 Hz | N | TD | All | TD Voltage Data | * * | Payload || * | || Index: sources/storage/Logger.cpp =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -342,7 +342,7 @@ else { fileName = _logFileNameDate + _fileSeparator + _logFileNameTime - + _fileSeparator + _logFileNameHDSN + + _fileSeparator + _logFileNameTDSN + _fileSeparator + _logFileNameMode ; } @@ -581,7 +581,7 @@ if ( vData.length() >= 1 ) { QString tdSerial= vData[0].toString(); if ( tdSerial.trimmed().isEmpty() ) tdSerial = "Unknown"; - _logFileNameHDSN = tdSerial; + _logFileNameTDSN = tdSerial; } } break; Index: sources/storage/Logger.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/storage/Logger.h (.../Logger.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/storage/Logger.h (.../Logger.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -108,7 +108,7 @@ // The HSSerial is going to be the HD Serial always, // but while booting the logger is initialized first before the HD sends its serial number. // therefore during the bootup and POST that we don't have the serial, will use BootPOST. - QString _logFileNameHDSN = "BootPOST" ; + QString _logFileNameTDSN = "BootPOST" ; // The Mode is the device main states comming from HD_OpMode // this is not exactly the HD_OpModes and will be interpreted in desired cycles. Index: sources/view/hd/data/VTDAirTrapData.h =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/view/hd/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -40,7 +40,7 @@ PROPERTY( quint32 , lowLevelRaw , 0) PROPERTY( quint32 , upLevelRaw , 0) PROPERTY( quint32 , valveState , 0) - PROPERTY( bool , controlling , 0) + PROPERTY( quint32 , controlling , 0) VIEW_DEC(VTDAirTrap, TDAirTrapData) }; Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -26,9 +26,9 @@ ACTION_VIEW_CONNECTION( AdjustVersionsTDRequestData); ACTION_VIEW_CONNECTION(AdjustVersionsTDResponseData); - ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); + ACTION_VIEW_CONNECTION(AdjustVersionsDDResponseData); ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData); - ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberDDResponseData); } void VAdjustmentVersions::onActionReceive(const AdjustVersionsTDRequestData &) @@ -39,7 +39,7 @@ void VAdjustmentVersions::onActionReceive(const AdjustVersionsTDResponseData &vData) { - // HD versions data + // TD versions data tdVerMajor ( vData.mMajor ); tdVerMinor ( vData.mMinor ); tdVerMicro ( vData.mMicro ); @@ -66,47 +66,47 @@ // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** - adjustmentHD(true); // set here only because adjustment parent needs it, but HD Versions does not + adjustmentTD(true); // set here only because adjustment parent needs it, but HD Versions does not } -void VAdjustmentVersions::onActionReceive(const AdjustVersionsDGResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsDDResponseData &vData) { - // DG versions data - dgVerMajor ( vData.mMajor ); - dgVerMinor ( vData.mMinor ); - dgVerMicro ( vData.mMicro ); - dgVerBuild ( vData.mBuild ); - dgVerFPGAId ( vData.mFPGAId ); - dgVerFPGAMajor ( vData.mFPGAMajor ); - dgVerFPGAMinor ( vData.mFPGAMinor ); - dgVerFPGALab ( vData.mFPGALab ); - dgVerCompatibilityRev ( vData.mCompatibilityRev ); + // DD versions data + ddVerMajor ( vData.mMajor ); + ddVerMinor ( vData.mMinor ); + ddVerMicro ( vData.mMicro ); + ddVerBuild ( vData.mBuild ); + ddVerFPGAId ( vData.mFPGAId ); + ddVerFPGAMajor ( vData.mFPGAMajor ); + ddVerFPGAMinor ( vData.mFPGAMinor ); + ddVerFPGALab ( vData.mFPGALab ); + ddVerCompatibilityRev ( vData.mCompatibilityRev ); - dgVerDevice ( - _dgVerDeviceFormat + ddVerDevice ( + _ddVerDeviceFormat .arg ( vData.mMajor ) .arg ( vData.mMinor ) .arg ( vData.mMicro ) .arg ( vData.mBuild ) .arg ( vData.mCompatibilityRev )); - dgVerFPGA ( - _dgVerFPGAFormat + ddVerFPGA ( + _ddVerFPGAFormat .arg ( vData.mFPGAId ) .arg ( vData.mFPGAMajor ) .arg ( vData.mFPGAMinor ) .arg ( vData.mFPGALab )); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** - adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not + adjustmentDD(true); // set here only because adjustment parent needs it, but TD Versions does not } void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberTDResponseData &vData) { tdSerial( vData.mSerialNumber ); } -void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDGResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDDResponseData &vData) { - dgSerial( vData.mSerialNumber ); + ddSerial( vData.mSerialNumber ); } Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -21,9 +21,9 @@ #include "VAdjustmentResponseBase.h" #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" -#include "MAdjustDGVersionsResponse.h" +#include "MAdjustDDVersionsResponse.h" #include "MAdjustTDSerialNumberResponse.h" -#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustDDSerialNumberResponse.h" namespace View { @@ -44,15 +44,15 @@ const QString _tdVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _tdVerFPGAFormat = "%1.%2.%3.%4"; - const QString _dgVerDeviceFormat = "%1.%2.%3.%4.%5"; - const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; + const QString _ddVerDeviceFormat = "%1.%2.%3.%4.%5"; + const QString _ddVerFPGAFormat = "%1.%2.%3.%4"; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustmentHD , 0) - TRIGGER( bool , adjustmentDG , 0) + TRIGGER( bool , adjustmentTD , 0) + TRIGGER( bool , adjustmentDD , 0) - // HD Versions data + // TD Versions data PROPERTY( quint8 , tdVerMajor , 0) PROPERTY( quint8 , tdVerMinor , 0) PROPERTY( quint8 , tdVerMicro , 0) @@ -63,30 +63,30 @@ PROPERTY( quint8 , tdVerFPGALab , 0) PROPERTY( quint32 , tdVerCompatibilityRev , 0) - // DG Versions data - PROPERTY( quint8 , dgVerMajor , 0) - PROPERTY( quint8 , dgVerMinor , 0) - PROPERTY( quint8 , dgVerMicro , 0) - PROPERTY( quint16 , dgVerBuild , 0) - PROPERTY( quint8 , dgVerFPGAId , 0) - PROPERTY( quint8 , dgVerFPGAMajor , 0) - PROPERTY( quint8 , dgVerFPGAMinor , 0) - PROPERTY( quint8 , dgVerFPGALab , 0) - PROPERTY( quint32 , dgVerCompatibilityRev , 0) + // DD Versions data + PROPERTY( quint8 , ddVerMajor , 0) + PROPERTY( quint8 , ddVerMinor , 0) + PROPERTY( quint8 , ddVerMicro , 0) + PROPERTY( quint16 , ddVerBuild , 0) + PROPERTY( quint8 , ddVerFPGAId , 0) + PROPERTY( quint8 , ddVerFPGAMajor , 0) + PROPERTY( quint8 , ddVerFPGAMinor , 0) + PROPERTY( quint8 , ddVerFPGALab , 0) + PROPERTY( quint32 , ddVerCompatibilityRev , 0) PROPERTY( QString , tdVerDevice ,"") PROPERTY( QString , tdVerFPGA ,"") PROPERTY( QString , tdSerial ,"") - PROPERTY( QString , dgVerDevice ,"") - PROPERTY( QString , dgVerFPGA ,"") - PROPERTY( QString , dgSerial ,"") + PROPERTY( QString , ddVerDevice ,"") + PROPERTY( QString , ddVerFPGA ,"") + PROPERTY( QString , ddSerial ,"") VIEW_DEC_CLASS(VAdjustmentVersions) VIEW_DEC_SLOT ( AdjustVersionsTDRequestData) VIEW_DEC_SLOT (AdjustVersionsTDResponseData) - VIEW_DEC_SLOT (AdjustVersionsDGResponseData) + VIEW_DEC_SLOT (AdjustVersionsDDResponseData) VIEW_DEC_SLOT (AdjustSerialNumberTDResponseData) - VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberDDResponseData) // ---------- Version public slots: Index: sources/view/settings/VBluetooth.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -20,7 +20,6 @@ // Project #include "main.h" // Doxygen : do not remove #include "VView.h" -#include "MAdjustTDSerialNumberResponse.h" #include "MBluetooth.h" #include "MUIBloodPressureData.h"