Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -234,7 +234,7 @@ // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // 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_AdjustVersionsDDRsp ,3*1+2+4*1+4 }, // variable length parameters {Gui::GuiActionType::ID_AdjustSerialTDRsp , 1 * 1 }, // minimum 1 parameter 1 byte {Gui::GuiActionType::ID_AdjustSerialDDRsp , 1 * 1 }, // minimum 1 parameter 1 byte // ---- Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -601,7 +601,7 @@ // ----- 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_AdjustVersionsDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp ); break; + case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); 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; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -97,9 +97,9 @@ // 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_AdjustVersionsTDReq = 0x1500, // 21 // ID_TDVersionsRxq - TD Version request received //// ----- @LEAHIZED ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED - ID_AdjustVersionsDGRsp = 0x0F00, // 15 + ID_AdjustVersionsDDRsp = 0x0F00, // 15 //// ----- @LEAHIZED 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 Index: sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp (.../MAdjustDDSerialNumberResponse.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp (.../MAdjustDDSerialNumberResponse.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -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 MAdjustDGSerialNumberResponse.cpp + * \file MAdjustDDSerialNumberResponse.cpp * \author (last) Behrouz NematiPour * \date (last) 19-Dec-2022 * \author (original) Behrouz NematiPour @@ -24,7 +24,7 @@ /** * \brief MAdjustSerialNumberDDResponse::isValid - * \details Checks if character meets DG serial constraints. (Alphanumeric or '-') + * \details Checks if character meets DD serial constraints. (Alphanumeric or '-') * \param vChar - the character. * \return bool - whether character is valid. */ @@ -35,8 +35,8 @@ /** * \brief MAdjustSerialNumberDDResponse::fromByteArray - * \details Removes any invalid characters from DG serial string. - * \param vByteArray - DG serial string represented as a byte array. + * \details Removes any invalid characters from DD serial string. + * \param vByteArray - DD serial string represented as a byte array. * \return true if serial contains any valid characters. */ bool MAdjustSerialNumberDDResponse::fromByteArray(const QByteArray &vByteArray, int *) { Index: sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h (.../MAdjustDDSerialNumberResponse.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h (.../MAdjustDDSerialNumberResponse.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -31,7 +31,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8800| 0x070 | Rsp | Y | DD | UI | DD Serial Number | + * |0x8800| 0x101 | Rsp | Y | DD | UI | DD Serial Number | * * | Payload || * | || Index: sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp (.../MAdjustTDSerialNumberResponse.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp (.../MAdjustTDSerialNumberResponse.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -24,7 +24,7 @@ /** * \brief MAdjustSerialNumberTDResponse::isValid - * \details Checks if character meets HD serial constraints. (alphanumeric or '-') + * \details Checks if character meets TD serial constraints. (alphanumeric or '-') * \param vChar - the character. * \return bool - whether character is valid. */ @@ -35,8 +35,8 @@ /** * \brief MAdjustSerialNumberTDResponse::fromByteArray - * \details Removes any invalid characters from HD serial string. - * \param vByteArray - HD serial string represented as a byte array. + * \details Removes any invalid characters from TD serial string. + * \param vByteArray - TD serial string represented as a byte array. * \return bool - whether serial contains any valid characters. */ bool MAdjustSerialNumberTDResponse::fromByteArray(const QByteArray &vByteArray, int *) { Index: sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h (.../MAdjustTDSerialNumberResponse.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h (.../MAdjustTDSerialNumberResponse.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -27,11 +27,11 @@ /*! * \brief The MAdjustSerialNumberTDResponse class - * \details The HD serial number response data model + * \details The TD serial number response data model * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| - * |0x9900| 0x020 | Rsp | Y | HD | UI | HD Serial Number | + * |0x9900| 0x040 | Rsp | Y | TD | UI | TD Serial Number | * * | Payload || * | || @@ -43,7 +43,7 @@ * | || * | || * | typeText | Event | - * | unitText | HD | + * | unitText | TD | * | infoText | Serial | * */ Index: sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp (.../MAdjustTDVersionsRequest.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp (.../MAdjustTDVersionsRequest.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -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.cpp + * \file MAdjustTDVersionsRequest.cpp * \author (last) Behrouz NematiPour * \date (last) 30-Jul-2021 * \author (original) Behrouz NematiPour Index: sources/model/hd/data/MTDTemperatureData.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/model/hd/data/MTDTemperatureData.h (.../MTDTemperatureData.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/model/hd/data/MTDTemperatureData.h (.../MTDTemperatureData.h) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x9100| 0x0100 | 1 Hz | N | TD | All | TD Temperature Data | + * |0x9100| 0x100 | 1 Hz | N | TD | All | TD Temperature Data | * * | Payload || * | || Index: sources/view/hd/data/VTDAirTrapData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r5f69bb944ed9b2186528f726def2630544bd0de6 --- sources/view/hd/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/view/hd/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision 5f69bb944ed9b2186528f726def2630544bd0de6) @@ -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 VHDAirTrapData.cpp + * \file VTDAirTrapData.cpp * \author (last) Dara Navaei * \date (last) 27-Feb-2024 * \author (original) Michael Garthwaite