application / sources

model

Clone Tools

Stats

Commits this week: 4
Total Committers: 12
Last Commit: 27 Mar
Commits this week: 4

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 10 Feb 2023
10:12 am

Dara Navaei

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Options
    • -1
    • +1
    ./dg/data/MDGHeatersData.cpp
    • -1
    • +1
    ./dg/data/MDGHeatersData.h
    • -1
    • +1
    ./dg/data/MDGPressuresData.cpp
    • -1
    • +1
    ./dg/data/MDGPressuresData.h
    • -1
    • +1
    ./dg/data/MDGTemperaturesData.cpp
    • -1
    • +1
    ./dg/data/MDGTemperaturesData.h
    • -20
    • +14
    ./hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    ./hd/data/pretreatment/MPreTreatmentStatesData.cpp
    • -1
    • +1
    ./hd/data/pretreatment/MPreTreatmentStatesData.h
  10. … 42 more files in changeset.
9:51 am

Behrouz NematiPour

Merge branch 'DEN-14733-UI-BN-S90-2' into staging

Options
    • -9
    • +42
    ./dg/data/MDGHeatersData.cpp
    • -10
    • +33
    ./dg/data/MDGHeatersData.h
    • -12
    • +16
    ./dg/data/MDGPressuresData.cpp
    • -4
    • +7
    ./dg/data/MDGPressuresData.h
    • -13
    • +45
    ./dg/data/MDGTemperaturesData.cpp
    • -26
    • +50
    ./dg/data/MDGTemperaturesData.h
    • -1
    • +1
    ./hd/alarm/MAlarmMapping.cpp
    • -0
    • +8
    ./hd/data/pretreatment/MPreTreatmentStatesData.cpp
    • -29
    • +35
    ./hd/data/pretreatment/MPreTreatmentStatesData.h
  10. … 35 more files in changeset.
9:23 am

Behrouz NematiPour

9:23 am

Behrouz NematiPour

9:23 am

Michael Garthwaite , vduong  (deleted user) and jishii  (deleted user)

9:20 am

Sean Nash and vduong  (deleted user)

9:18 am

vduong  (deleted user)

Yes, assignments break bindings. RESOLVED

Yes, assignments break bindings.

RESOLVED

9:17 am

vduong  (deleted user)

Ok, sounds good. RESOLVED

Ok, sounds good.

RESOLVED

8:23 am

Behrouz NematiPour

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.

8:17 am

Behrouz NematiPour

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.

8:14 am

vduong  (deleted user)

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.

7:40 am

vduong  (deleted user)

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

7:16 am

vduong  (deleted user)

RESOLVED

RESOLVED

7:12 am

Behrouz NematiPour

Thanks for the feedback. Fixed.

Thanks for the feedback.
Fixed.

7:03 am

vduong  (deleted user)

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.

Thursday 09 Feb 2023
10:40 pm

Behrouz NematiPour

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 |

*

*/

Options
    • -13
    • +45
    ./dg/data/MDGTemperaturesData.cpp
    • -26
    • +50
    ./dg/data/MDGTemperaturesData.h
  3. … 5 more files in changeset.
8:56 pm

Behrouz NematiPour

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 |

*

*/

Options
    • -12
    • +16
    ./dg/data/MDGPressuresData.cpp
    • -4
    • +7
    ./dg/data/MDGPressuresData.h
  3. … 3 more files in changeset.
8:55 pm

Behrouz NematiPour

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 |

*

*/

Options
    • -0
    • +8
    ./hd/data/pretreatment/MPreTreatmentStatesData.cpp
    • -29
    • +35
    ./hd/data/pretreatment/MPreTreatmentStatesData.h
  3. … 3 more files in changeset.
7:19 pm

Behrouz NematiPour

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 |

*

*/

Options
    • -9
    • +42
    ./dg/data/MDGHeatersData.cpp
    • -10
    • +33
    ./dg/data/MDGHeatersData.h
  3. … 5 more files in changeset.
4:39 pm

jishii  (deleted user)

4:38 pm

Behrouz NematiPour

DEN-14736 : IMP: DEN-14486

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

Options
    • -1
    • +1
    ./hd/alarm/MAlarmMapping.cpp
  2. … 6 more files in changeset.
1:55 pm

Vy <vduong@sunriselabs.com>

DEN-14743 Bluetooth bug fixes - improve connection handling and message display

Options
    • -0
    • +1
    ./settings/MBluetooth.h
  2. … 4 more files in changeset.
11:08 am

Sean Nash

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

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

11:06 am

Sean Nash

RESOLVED.

RESOLVED.

10:07 am

Behrouz NematiPour

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.

10:04 am

Behrouz NematiPour

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.

9:24 am

Michael Garthwaite

RESOLVED.

RESOLVED.

9:22 am

Michael Garthwaite

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.

8:41 am

Sean Nash

Why is her name in string table?

Why is her name in string table?

8:37 am

Sean Nash

Any reason this alarm is commented out?

Any reason this alarm is commented out?