Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 21 more files in changeset.
staging merge chery pick - DEN-16658-ui-dn-s116-sonar-fix-msg-update

DEN-16659: UI: Fix SonarQube Reported Issues

Changed the code in the geValue in the types.h to address the array index out of range reported by SonarQube.

Added the more functions to the tst_utilities.ccp to fully cover the getValue function.

DEN-16444: UI: UI Logs do not Capture TDi and TRo Moving Average Values

Updated the application to incorporate the two new float values in the DG temperature sensors payload.

DEN-16444: UI: UI Logs do not Capture TDi and TRo Moving Average Values

Updated the getValue function to updated the start index of the data.

DEN-16444: UI: UI Logs do not Capture TDi and TRo Moving Average Values

Updated the unit test functions for the getValue function.

DEN-16659: UI: Fix SonarQube Reported Issues

Changed the /tmp/ address and brought it into the main.cpp

DEN-16659: UI: Fix SonarQube Reported Issues

Removed a qDebug line

DEN-16659: UI: Fix SonarQube Reported Issues

Made the gStandard_tmp variable an extern

  1. … 15 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 15 more files in changeset.
DEN-16444: UI: UI Logs do not Capture TDi and TRo Moving Average Values

Updated the application to incorporate the two new float values in the DG temperature sensors payload.

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
    • -2
    • +2
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGRequests.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGSerialNumberResponse.cpp
    • -1
    • +1
    ./adjustment/settings/MAdjustDGSerialNumberResponse.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.cpp
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.h
    • -1
    • +1
    ./adjustment/settings/MDuetRoWaterDG.cpp
    • -1
    • +1
    ./adjustment/settings/MDuetRoWaterDG.h
  1. … 598 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
    • -2
    • +2
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGRequests.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGSerialNumberResponse.cpp
    • -1
    • +1
    ./adjustment/settings/MAdjustDGSerialNumberResponse.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.cpp
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.h
    • -1
    • +1
    ./adjustment/settings/MDuetRoWaterDG.cpp
    • -1
    • +1
    ./adjustment/settings/MDuetRoWaterDG.h
  1. … 598 more files in changeset.
DEN-16531: UI: The reservoir message structure has changed on FW and UI needs to adjust.

  1. … 3 more files in changeset.
DENBUG-204: UI: The reservoir message structure has changed on FW and UI needs to adjust.

DEN-16531: UI: The reservoir message structure has changed on FW and UI needs to adjust.

  1. … 3 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.h
  1. … 19 more files in changeset.
CS-5: UI: TxCode generation on device

    • -1
    • +1
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.h
  1. … 9 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -4
    • +4
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
    • -3
    • +3
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGRequests.h
  1. … 52 more files in changeset.
DEN-15316: Usability: UI: Remove Extra Button for Disinfection

- Implemented the MVC and messaging.

    • -0
    • +77
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
    • -0
    • +106
    ./adjustment/settings/MAdjustDGCleaningUsageResponse.h
    • -2
    • +27
    ./adjustment/settings/MAdjustDGRequests.h
  1. … 16 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -3
    • +3
    ./adjustment/settings/MDuetRoWaterDG.cpp
    • -4
    • +4
    ./adjustment/settings/MDuetRoWaterDG.h
  1. … 22 more files in changeset.
DEN-15072 RO Water Input Mode

- Implemented the models

    • -0
    • +64
    ./adjustment/settings/MDuetRoWaterDG.cpp
    • -0
    • +165
    ./adjustment/settings/MDuetRoWaterDG.h
  1. … 8 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./adjustment/settings/MAdjustDGRequests.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.h
  1. … 46 more files in changeset.
CR: Addressing Code Review comment UI-DEN-14936-1#c16983

http://devapps.diality.us:8060/cru/UI-DEN-14936-1#c16983

DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 9 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 4 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 3 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 2 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -1
    • +1
    ./adjustment/settings/MAdjustDGRequests.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.h
  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 45 more files in changeset.
Merge branch 'DEN-14733-UI-BN-S90-2' into staging

  1. … 38 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2D00

/*!

* \brief The MDGTemperatures class

* \details The DG temperatures data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data |

*

* | Payload ||

* | ||

* | #01:(F32) | \ref Data::mInletPrimaryHeater |

* | #02:(F32) | \ref Data::mHeatDisinfect |

* | #03:(F32) | \ref Data::mOutletPrimaryHeater |

* | #04:(F32) | \ref Data::mConductivitySensor1 |

* | #05:(F32) | \ref Data::mConductivitySensor2 |

* | #06:(F32) | \ref Data::mOutletRedundancy |

* | #07:(F32) | \ref Data::mInletDialysate |

* | #08:(F32) | \ref Data::mPrimaryHeaterThermoCouple |

* | #09:(F32) | \ref Data::mTrimmerHeaterThermoCouple |

* | #10:(F32) | \ref Data::mPrimaryHeaterColdJunction |

* | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction |

* | #12:(F32) | \ref Data::mPrimaryHeaterInternal |

* | #13:(F32) | \ref Data::mTrimmerHeaterInternal |

* | #14:(F32) | \ref Data::mFpgaBoard |

* | #15:(F32) | \ref Data::mLoadCellA1B1 |

* | #16:(F32) | \ref Data::mLoadCellA2B2 |

* | #17:(F32) | \ref Data::mInternalTHDORTD |

* | #18:(F32) | \ref Data::mInternalTDIRTD |

* | #19:(F32) | \ref Data::mInteralTHDRTD |

* | #20:(F32) | \ref Data::mInternalCondSnsrTemp |

* | #21:(F32) | \ref Data::mBaroTempSensor |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Temperatures |

*

*/

  1. … 5 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2000

/*!

* \brief The MDGPressures class

* \details The DG pressures data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data |

*

* | Payload ||

* | ||

* | #1:(F32) | \ref Data::mROInletPSI |

* | #2:(F32) | \ref Data::mROOutletPSI |

* | #3:(F32) | \ref Data::mDrainInletPSI |

* | #4:(F32) | \ref Data::mDrainOutletPSI |

* | #5:(F32) | \ref Data::mBarometricPSI |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Pressures |

*

*/

  1. … 3 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2C00

/*!

* \brief The MDGHeaters class

* \details The DG heaters data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data |

*

* | Payload ||

* | ||

* | # 1:(F32) | \ref Data::mMainPrimayHeaterDC |

* | # 2:(F32) | \ref Data::mSmallPrimaryHeaterDC |

* | # 3:(F32) | \ref Data::mTrimmerHeaterDC |

* | # 4:(F32) | \ref Data::mPrimaryTargetTemp |

* | # 5:(F32) | \ref Data::mTrimmerTargetTemp |

* | # 6:(F32) | \ref Data::mPrimaryHeaterState |

* | # 7:(F32) | \ref Data::mTrimmerHeaterState |

* | # 8:(F32) | \ref Data::mPrimaryEfficiency |

* | # 9:(F32) | \ref Data::mPrimaryCalcTargetTemp |

* | #10:(F32) | \ref Data::mTrimmerCalcCurrentTemp |

* | #11:(F32) | \ref Data::mTrimmerUseLastDC |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Heaters |

*

*/

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./adjustment/settings/MAdjustDGRequests.h
    • -2
    • +2
    ./adjustment/settings/MAdjustDGSerialNumberResponse.cpp
    • -2
    • +2
    ./adjustment/settings/MAdjustDGSerialNumberResponse.h
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.cpp
    • -1
    • +1
    ./adjustment/settings/MAdjustDGServiceDatesResponse.h
  1. … 594 more files in changeset.
Cherry Pick [DEN-13053-S82-JI : 86d954] ClousSync device Registration Error

Fixed syntax of cloudsync post in run.sh file so that cloudsync runs on post

Changed UI serial implementation to trim off any whitespace or invalid characters in serials received from HD and DG

Changed CloudSync controller to only send messages to CloudSync if device is registered

    • -2
    • +30
    ./adjustment/settings/MAdjustDGSerialNumberResponse.cpp
    • -0
    • +1
    ./adjustment/settings/MAdjustDGSerialNumberResponse.h
  1. … 4 more files in changeset.
Fixed syntax of cloudsync post in run.sh file so that cloudsync runs on post

Changed UI serial implementation to trim off any whitespace or invalid characters in serials received from HD and DG

Changed CloudSync controller to only send messages to CloudSync if device is registered

    • -2
    • +30
    ./adjustment/settings/MAdjustDGSerialNumberResponse.cpp
    • -0
    • +1
    ./adjustment/settings/MAdjustDGSerialNumberResponse.h
  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -3
    • +3
    ./adjustment/settings/MAdjustDGServiceDatesResponse.cpp
    • -4
    • +4
    ./adjustment/settings/MAdjustDGServiceDatesResponse.h
  1. … 97 more files in changeset.