sources

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

RESOLVED.

RESOLVED.

It was removed. UI sends an alarmTriggered to HD for that, and should not display a dialog by itself. Since on the device, if there is no other alarm HD will eventually display it, and if there is ...

It was removed.
UI sends an alarmTriggered to HD for that, and should not display a dialog by itself.
Since on the device, if there is no other alarm HD will eventually display it, and if there is HD will override it.
It was just a bug in development then, which was always displaying a useless dialog on VM that doesn't even have a physical SD Card.

I laughed loud for a while https://devapps.diality.us/static/s73b8n/2static/images/wiki/icons/emoticons/biggrin.gif This is the spell checker dictionary. Since my spell checker was complaining and ...

I laughed loud for a while
This is the spell checker dictionary.
Since my spell checker was complaining and it was bugging me, and I always look at it like there is a bug in that area, I add her name so spell checker won't highlight it anymore.
It is a comment I have about the decision we made to remind me why I have that line of code commented.

RESOLVED.

RESOLVED.

is this alignment correct? I see you align by . above (line 35-38) but I don't see examples of aligning by ( for function calls.

is this alignment correct? I see you align by . above (line 35-38) but I don't see examples of aligning by ( for function calls.

Why is her name in string table?

Why is her name in string table?

Any reason this alarm is commented out?

Any reason this alarm is commented out?

UI-DEN-14733_UI BN S90
UI-DEN-14733_UI BN S90
DEN-14736 : IMP: Dry-Demo Support

- added the CLI switch -D : --enable-dry-demo

- added the CLI switch -A : --active-can-bus <CANBus>

- added the CLI switch -F : --disable-fault-screen

- will send confirmation response with ConfirmationID of 99 and as accepted(1):

- e.g. 03:32:29.560,bb00,UI,Confirm,99,1

  1. … 5 more files in changeset.
DEN-14736 : IMP: DEN-14779: In-Tx Qb, Qd, PBo, PBA Adj

    • -5
    • +9
    ./gui/qml/pages/treatment/TreatmentStack.qml
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +1
    ./gui/qml/pages/settings/SettingsWiFi.qml
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
  1. … 5 more files in changeset.
RESOLVED

RESOLVED

Updated

Updated

DEN-14736 : IMP: Secured the SD-Card mount

- added security recommended USB mount flags

MS_SYNCHRONOUS

MS_NOEXEC

MS_NODEV

MS_NOSUID

DEN-14736 : IMP: Removed the SD-Card alarm dialog

- it is not clear what needs to be done when SD-Card fails after a successful POST.

- May need to send an alarmTrigger to HD and stop logging.

- Removed for now.

DEN-14736 : IMP: Shutdown dialog / Alarm Dialog

- The shutdown dialog closure was not maximizing the minimized alarm dialog

DEN-14736 : IMP: DEN-14779: In-Tx Qb, Qd, PBo, PBA Adj

    • -5
    • +4
    ./gui/qml/pages/treatment/TreatmentStack.qml
RESOLVED

RESOLVED

RESOLVED

RESOLVED