sources

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
DEN-14743 Add pairing confirmation dialog

DEN-14743 Modify to only require single time pairing for data sync

    • -26
    • +106
    ./bluetooth/BluetoothInterface.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./gui/qml/components/DebugDataColumn.qml
    • -1
    • +1
    ./gui/qml/dialogs/DiagnosticsDialog.qml
  1. … 36 more files in changeset.
Merge branch 'DEN-14733-UI-BN-S90-2' into staging

    • -3
    • +3
    ./gui/qml/components/DebugDataColumn.qml
    • -20
    • +41
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -10
    • +13
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 29 more files in changeset.
Yes, assignments break bindings. RESOLVED

Yes, assignments break bindings.

RESOLVED

Ok, sounds good. RESOLVED

Ok, sounds good.

RESOLVED

Good point, But you can't. The readonly properties are only working with bindings, not assignments. I am using that as a public variable.

Good point,
But you can't.
The readonly properties are only working with bindings, not assignments.
I am using that as a public variable.

Good point, I agree with the two intervals, it would be clarifying. For the counter, though, it might not be always the case. I will start doing it in my next task, since I would like to change all...

Good point,
I agree with the two intervals, it would be clarifying.
For the counter, though, it might not be always the case.
I will start doing it in my next task, since I would like to change all, to be consistent across the entire code base.

If _root.isOpen is not modified outside of this powerItem.qml, You can make it a readonly property and bind it to the powerDialog's property.

If _root.isOpen is not modified outside of this powerItem.qml, You can make it a readonly property and bind it to the powerDialog's property.

Only a suggestion: It is a good idea to append the unit to the end of the variable name especially for time. It helps improve readability and clarity. For instance, here, we have ms and the next o...

Only a suggestion:
It is a good idea to append the unit to the end of the variable name especially for time. It helps improve readability and clarity.

For instance, here, we have ms and the next one, _pendingInterval is in seconds. and I believe _pendingCounter is in minutes based on the .cpp file's comment.

_interval_ms
_pendingInterval_sec
_pendingCounter_min

RESOLVED

RESOLVED

Thanks for the feedback. Fixed.

Thanks for the feedback.
Fixed.

The variable, destination, itself is a QString, you don't need to do QString("%1").arg(destination), you can pass destination in directly.

The variable, destination, itself is a QString, you don't need to do QString("%1").arg(destination), you can pass destination in directly.

DEN-14736 : IMP: DEN-14768 : InTx UF Adj

DEN-14768

Ultrafiltration Adjustment Screen Slider Does Not Update Maximum UF Vol after Duration Settings Adjustment

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 |

*

*/

    • -3
    • +3
    ./gui/qml/components/DebugDataColumn.qml
    • -7
    • +23
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -13
    • +45
    ./model/dg/data/MDGTemperaturesData.cpp
    • -26
    • +50
    ./model/dg/data/MDGTemperaturesData.h
    • -13
    • +21
    ./view/dg/data/VDGTemperaturesData.cpp
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 |

*

*/

    • -10
    • +15
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -12
    • +16
    ./model/dg/data/MDGPressuresData.cpp
DEN-14736 : IMP: Updated MsgID 0x5C00

/*!

* \brief The MTreatmentStates class

* \details The treatment states data model

* These are states of the current treatment.

* It also includes the ultrafiltration states, saline bolus states.

*

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

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

* |0x5C00| 0x040 | 7 | 1 Hz | N | HD | All | Pre-Treatment States Data |

*

* | Payload ||

* | ||

* | #1:(U32) | \ref Data::mSubMode |

* | #2:(U32) | \ref Data::mWaterSampleState |

* | #3:(U32) | \ref Data::mSelfTestConsumablesState |

* | #4:(U32) | \ref Data::mSelfTestNoCartridgeState |

* | #5:(U32) | \ref Data::mInstallationState |

* | #6:(U32) | \ref Data::mSelfTestDryState |

* | #7:(U32) | \ref Data::mPrimeState |

* | #8:(U32) | \ref Data::mRecirculateState |

* | #9:(U32) | \ref Data::mPatientConnectionState |

* | #9:(U32) | \ref Data::mWetSelfTestsState |

* | #9:(U32) | \ref Data::mPreTreatmentRsrvrState |

*

* \sa Data

* \sa HD_Pre_Treatment_Mode_States

* \sa HD_Pre_Treatment_Sample_Water_States

* \sa HD_Pre_Treatment_Consumable_Self_Test_States

* \sa HD_Pre_Treatment_No_Cart_Self_Tests_States

* \sa HD_Pre_Treatment_Dry_Self_Tests_States

* \sa HD_Pre_Treatment_Prime_States

* \sa HD_Pre_Treatment_Recirc_States

*

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

* | ||

* | ||

* | typeText | Datum |

* | unitText | HD |

* | infoText | PreTreatmentStates |

*

*/

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 |

*

*/

    • -3
    • +3
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -10
    • +33
    ./model/dg/data/MDGHeatersData.h
  1. … 1 more file in changeset.
DEN-14736 : IMP: DEN-14486

- DEN-14486 : Incorrect alarm notification appears during DG Flush

    • -3
    • +32
    ./view/hd/alarm/VAlarmActiveList.cpp
  1. … 2 more files in changeset.
DEN-14743 Bluetooth bug fixes - improve connection handling and message display

    • -10
    • +101
    ./bluetooth/BluetoothInterface.cpp
So we will likely remove this TODO and comment later? RESOLVED.

So we will likely remove this TODO and comment later?
RESOLVED.