application

sources

Clone Tools

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 16 Dec
Commits this week: 1

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 minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 15 Feb 2023
4:00 pm

Vy <vduong@sunriselabs.com>

DEN-14743 Add pairing confirmation dialog

Options
    • -1
    • +19
    ./gui/qml/pages/settings/SettingsBluetoothCuff.qml
1:14 pm

Vy <vduong@sunriselabs.com>

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

Options
    • -26
    • +106
    ./bluetooth/BluetoothInterface.cpp
    • -3
    • +16
    ./bluetooth/BluetoothInterface.h
    • -0
    • +1
    ./view/settings/VBluetooth.cpp
Friday 10 Feb 2023
10:12 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
10:12 am

Dara Navaei

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

Options
    • -1
    • +1
    ./canbus/CanInterface.h
    • -1
    • +1
    ./canbus/FrameInterface.h
    • -1
    • +1
    ./canbus/MessageAcknowModel.h
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +1
    ./canbus/MessageInterpreter.cpp
    • -1
    • +1
    ./cloudsync/CloudSyncController.cpp
    • -1
    • +1
    ./cloudsync/CloudSyncController.h
    • -1
    • +1
    ./device/DeviceController.cpp
    • -1
    • +1
    ./gui/GuiController.cpp
    • -1
    • +1
    ./gui/GuiView.h
    • -1
    • +1
    ./gui/qml/PowerItem.qml
    • -1
    • +1
    ./gui/qml/components/DebugDataColumn.qml
    • -1
    • +1
    ./gui/qml/components/Slider.qml
    • -1
    • +1
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -1
    • +1
    ./gui/qml/main.qml
  16. … 36 more files in changeset.
9:51 am

Behrouz NematiPour

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

Options
    • -1
    • +1
    ./canbus/CanInterface.h
    • -4
    • +4
    ./canbus/MessageGlobals.h
    • -5
    • +5
    ./canbus/MessageInterpreter.cpp
    • -1
    • +6
    ./device/DeviceController.cpp
    • -11
    • +2
    ./gui/GuiController.cpp
    • -0
    • +3
    ./gui/GuiView.h
    • -4
    • +1
    ./gui/qml/PowerItem.qml
    • -3
    • +3
    ./gui/qml/components/DebugDataColumn.qml
    • -10
    • +12
    ./gui/qml/components/Slider.qml
    • -20
    • +41
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -1
    • +15
    ./gui/qml/main.qml
    • -1
    • +3
    ./gui/qml/pages/MainStack.qml
    • -10
    • +13
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +3
    ./main.h
    • -9
    • +42
    ./model/dg/data/MDGHeatersData.cpp
  16. … 29 more files in changeset.
7:12 am

Behrouz NematiPour

CR comment: UI-DEN-14517-1#c16470

http://devapps.diality.us:8060/cru/UI-DEN-14517-1#c16470

Options
    • -1
    • +1
    ./cloudsync/CloudSyncController.cpp
6:41 am

Behrouz NematiPour

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

DEN-14768

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

Options
    • -10
    • +12
    ./gui/qml/components/Slider.qml
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
    • -2
    • +2
    ./canbus/MessageGlobals.h
    • -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
    • -0
    • +8
    ./view/dg/data/VDGTemperaturesData.h
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
    • -10
    • +15
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -12
    • +16
    ./model/dg/data/MDGPressuresData.cpp
    • -4
    • +7
    ./model/dg/data/MDGPressuresData.h
    • -4
    • +5
    ./view/dg/data/VDGPressuresData.cpp
    • -4
    • +5
    ./view/dg/data/VDGPressuresData.h
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
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -0
    • +8
    ./model/hd/data/pretreatment/MPreTreatmentStatesData.cpp
    • -29
    • +35
    ./model/hd/data/pretreatment/MPreTreatmentStatesData.h
    • -0
    • +2
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
    • -0
    • +2
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.h
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
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -3
    • +3
    ./gui/qml/dialogs/DiagnosticsDialog.qml
    • -9
    • +42
    ./model/dg/data/MDGHeatersData.cpp
    • -10
    • +33
    ./model/dg/data/MDGHeatersData.h
    • -3
    • +11
    ./view/dg/data/VDGHeatersData.cpp
    • -4
    • +12
    ./view/dg/data/VDGHeatersData.h
  7. … 1 more file in changeset.
4:38 pm

Behrouz NematiPour

DEN-14736 : IMP: DEN-14486

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

Options
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
    • -3
    • +32
    ./view/hd/alarm/VAlarmActiveList.cpp
    • -1
    • +6
    ./view/hd/alarm/VAlarmActiveList.h
    • -0
    • +6
    ./view/hd/alarm/VAlarmStatus.cpp
    • -1
    • +1
    ./view/hd/alarm/VAlarmStatus.h
  6. … 2 more files in changeset.
1:55 pm

Vy <vduong@sunriselabs.com>

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

Options
    • -10
    • +101
    ./bluetooth/BluetoothInterface.cpp
    • -1
    • +2
    ./bluetooth/BluetoothInterface.h
    • -1
    • +1
    ./gui/qml/pages/settings/SettingsBluetoothCuff.qml
    • -0
    • +1
    ./model/settings/MBluetooth.h
    • -1
    • +5
    ./view/settings/VBluetooth.cpp
Wednesday 08 Feb 2023
9:00 pm

Behrouz NematiPour

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

Options
    • -1
    • +1
    ./canbus/CanInterface.h
    • -0
    • +3
    ./gui/GuiView.h
    • -4
    • +0
    ./gui/qml/PowerItem.qml
    • -1
    • +15
    ./gui/qml/main.qml
    • -1
    • +3
    ./gui/qml/pages/MainStack.qml
    • -0
    • +3
    ./main.h
    • -1
    • +1
    ./model/hd/alarm/MAlarmMapping.cpp
  8. … 5 more files in changeset.
6:21 pm

Behrouz NematiPour

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

Options
    • -5
    • +9
    ./gui/qml/pages/treatment/TreatmentStack.qml
1:32 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -16
    • +23
    ./model/hd/alarm/MAlarmMapping.cpp
1:32 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./gui/qml/main.qml
    • -1
    • +1
    ./gui/qml/pages/settings/SettingsWiFi.qml
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    ./model/settings/MWifiNetwork.h
    • -1
    • +1
    ./view/settings/VNetworkModel.cpp
    • -1
    • +1
    ./view/settings/VNetworkModel.h
    • -1
    • +1
    ./wifi/WifiInterface.cpp
    • -1
    • +1
    ./wifi/WifiInterface.h
  9. … 5 more files in changeset.
1:31 am

Behrouz NematiPour

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

- added security recommended USB mount flags

MS_SYNCHRONOUS

MS_NOEXEC

MS_NODEV

MS_NOSUID

Options
    • -1
    • +6
    ./device/DeviceController.cpp
12:43 am

Behrouz NematiPour

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.

Options
    • -11
    • +2
    ./gui/GuiController.cpp
    • -1
    • +1
    ./storage/Logger.h
Tuesday 07 Feb 2023
11:36 pm

Behrouz NematiPour

DEN-14736 : IMP: Shutdown dialog / Alarm Dialog

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

Options
    • -0
    • +1
    ./gui/qml/PowerItem.qml
11:26 pm

Behrouz NematiPour

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

Options
    • -5
    • +4
    ./gui/qml/pages/treatment/TreatmentStack.qml
Monday 06 Feb 2023
3:42 pm

Behrouz NematiPour

DEN-14736 : IMP: Unhandled Msg ID log

- Added the messaged Id to the Unhandled messages log

Options
    • -5
    • +5
    ./canbus/MessageInterpreter.cpp
    • -3
    • +4
    ./model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    ./storage/Logger.h
  4. … 3 more files in changeset.
Thursday 02 Feb 2023
7:57 pm

Behrouz NematiPour

DEN-14581 : General Implementation

- Added a WiFi connection indication

- Improved the WiFi list parser

Options
    • -1
    • +16
    ./gui/qml/main.qml
    • -1
    • +1
    ./gui/qml/pages/settings/SettingsWiFi.qml
    • -8
    • +10
    ./model/hd/alarm/MAlarmMapping.cpp
    • -9
    • +39
    ./view/settings/VNetworkModel.cpp
    • -8
    • +14
    ./view/settings/VNetworkModel.h
    • -13
    • +17
    ./wifi/WifiInterface.cpp
    • -1
    • +3
    ./wifi/WifiInterface.h
  8. … 4 more files in changeset.
6:15 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
6:14 pm

Dara Navaei

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

Options
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
5:40 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    ./model/hd/alarm/MAlarmMapping.cpp
5:40 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./gui/qml/AlarmItem.qml
    • -1
    • +1
    ./gui/qml/PowerItem.qml
    • -1
    • +1
    ./gui/qml/pages/disinfect/DisinfectStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentStack.qml
    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    ./view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
    • -1
    • +1
    ./view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
    • -1
    • +1
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
    • -1
    • +1
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.h
    • -1
    • +1
    ./view/hd/data/treatment/VHDTreatmentStatesData.cpp
    • -1
    • +1
    ./view/hd/data/treatment/VHDTreatmentStatesData.h
  15. … 1 more file in changeset.
2:57 pm

Behrouz NematiPour

DEN-14736 IMP: Confirm Always on Top

- The Alarm won't cancel the Confirmation anymore

- The Alarm Dialog will still get updated while minimized.

- The Alarm Dialog will get maximized if the confirmation dialog gets closed.

Options
    • -0
    • +4
    ./gui/qml/AlarmItem.qml
    • -0
    • +5
    ./gui/qml/PowerItem.qml
    • -1
    • +0
    ./gui/qml/pages/pretreatment/PreTreatmentStack.qml
    • -2
    • +2
    ./model/hd/alarm/MAlarmMapping.cpp
  5. … 4 more files in changeset.
2:09 pm

Behrouz NematiPour

DEN-14736 IMP: Chem Flush

- Adding the Chemical Flush button

Options
    • -2
    • +20
    ./gui/qml/pages/disinfect/DisinfectStack.qml
    • -4
    • +14
    ./view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
    • -0
    • +2
    ./view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
1:53 pm

Behrouz NematiPour

DEN-14736 IMP: Update states

- Updated states regarding changes have been made in FW Common

- \sa : http://devapps.diality.us:8060/cru/HD-DEN-14549-1

Options
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
    • -1
    • +0
    ./gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
    • -1
    • +1
    ./gui/qml/pages/pretreatment/PreTreatmentStack.qml
    • -8
    • +2
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
    • -6
    • +3
    ./view/hd/data/pretreatment/VPreTreatmentStatesData.h
    • -4
    • +0
    ./view/hd/data/treatment/VHDTreatmentStatesData.cpp
    • -5
    • +0
    ./view/hd/data/treatment/VHDTreatmentStatesData.h
  9. … 2 more files in changeset.