Fisheye on application/sources/model/hd/alarm/MAlarmMapping.cpp

application (bugfix/DEN-16597-UI-BN-S114): UI-DEN-13965: UI-DEN-13965-3...

Behrouz NematiPour — Mon, 10 Oct 2022 17:07:09 -0700

Behrouz NematiPour committed 787e085 on branch master, @Environement_Swith and 189 more in application

UI-DEN-13965: UI-DEN-13965-3

- Handling the case a new alarm is received, while a confirm is requested, UI should send a cancel to HD and close the dialog and have user to re-issue the confirm if needed.

· /sources/ApplicationController.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/PowerItem.qml	(-0, +5)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/confirm/VConfirm.cpp	(-0, +2)	\| History	\| Source	\| Diff
· /sources/view/confirm/VConfirm.h	(-0, +3)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]...

Behrouz NematiPour — Thu, 06 Oct 2022 12:54:04 -0700

Behrouz NematiPour committed 3a2114c on branch master, @Environement_Swith and 191 more in application

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the save issue.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/confirm/VConfirm.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]...

Behrouz NematiPour — Wed, 05 Oct 2022 19:08:07 -0700

Behrouz NematiPour committed 40c0995 on branch master, @Environement_Swith and 191 more in application

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the issue with the kyeValue of different categories overwriting by adding the category as the top level.

- I still have issue in saving for the settings, which writes duplicate.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-3, +6)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.cpp	(-54, +37)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.h	(-17, +36)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-5, +10)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/storage/StorageGlobals.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.cpp	(-5, +6)	\| History	\| Source	\| Diff
· /sources/view/VTreatmentCreate.cpp	(-4, +5)	\| History	\| Source	\| Diff
· /sources/view/hd/alarm/VAlarmStatus.cpp	(-29, +25)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-7, +7)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated MAlarmMapping.cpp

Dara Navaei — Tue, 04 Oct 2022 12:01:11 -0700

Dara Navaei committed 0e9aa2b on branch master, @Environement_Swith and 191 more in application

Bamboo Commit: Updated MAlarmMapping.cpp

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-14, +20)

| History

| Source

| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 04 Oct 2022 12:00:27 -0700

Dara Navaei committed f502bc5 on branch master, @Environement_Swith and 191 more in application

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

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/AlarmItem.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/PowerItem.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/Footer.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TouchRect.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/dialogs/PowerOff.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/globals/Variables.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml

(-1, +1)

| History

| Source

| Diff

… 14 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13939: IMP: Fixed the merge issue...

Behrouz NematiPour — Mon, 03 Oct 2022 13:07:19 -0700

Behrouz NematiPour committed bd47699 on branch master, @Environement_Swith and 192 more in application

DEN-13939: IMP: Fixed the merge issue

- Not sure why git didn't get the changes on the ModalDialog's Norification changes to NotificationSmall, and caused the issue on the property IconVisible.

· /sources/gui/qml/components/ModalDialog.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/PowerOff.qml	(-2, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainHome.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-3, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(-4, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-2, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13939: IMP: Implementation of the the message [0xBA00]...

Behrouz NematiPour — Fri, 30 Sep 2022 16:41:12 -0700

Behrouz NematiPour committed 13e65c3 on branch master, @Environement_Swith and 192 more in application

DEN-13939: IMP: Implementation of the the message [0xBA00]

Messaging:

- Modified the message 0xBB00 required length from 3xU32 to 2xU32

- Renamed the VConfrimDialog to VConfirm, since the view class is not the actual dialog implementation.

- Merged the vPowerOff view to the VConfrim, and removed the VPowerOff view classes.

Alarm Integration:

- AlarmItem: add the hasAlarm to theAlarmMinimize as well to prevent the AlarmBar being visible when there is no active alarm.

- VAlarmStatus: fixed the issue with the hasAlarm property which was causing the AlarmDialog being visible while there was not active alarm.

Confirm Dialog:

- Used the PowerItem.qml and the PowerOff Dialog for Generic Confirm, and improved the code to be repurposed.

- Footer: updated the Footer component to be able to re-layout the touchrects without an open/close cycle.

- TouchRect: exposed the the buttons text.

· /denali.pro

(-5, +3)

| History

| Source

| Diff

· /denali.pro.user

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-2, +2)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.cpp

(-2, +1)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-0, +7)

| History

| Source

| Diff

· /sources/gui/qml/AlarmItem.qml

(-1, +7)

| History

| Source

| Diff

· /sources/gui/qml/PowerItem.qml

(-31, +63)

| History

| Source

| Diff

· /sources/gui/qml/components/Footer.qml

(-8, +20)

| History

| Source

| Diff

· /sources/gui/qml/components/TouchRect.qml

(-0, +1)

| History

| Source

| Diff

· /sources/gui/qml/dialogs/PowerOff.qml

(-22, +47)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-6, +0)

| History

| Source

| Diff

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/view/VPowerOff.cpp

(-25, +0)

| History

| Source

| Diff

· /sources/view/VPowerOff.h

(-48, +0)

| History

| Source

| Diff

· /sources/view/VView.h

(-3, +1)

| History

| Source

| Diff

… 5 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated MAlarmMapping.cpp

Dara Navaei — Wed, 28 Sep 2022 16:41:54 -0700

Dara Navaei committed 94d1750 on branch master, @Environement_Swith and 191 more in application

Bamboo Commit: Updated MAlarmMapping.cpp

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-15, +24)

| History

| Source

| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 28 Sep 2022 16:41:05 -0700

Dara Navaei committed 265ce74 on branch master, @Environement_Swith and 191 more in application

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

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /scripts/run.sh

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.h

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/Threads.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/Threads.h

(-1, +1)

| History

| Source

| Diff

· /sources/bluetooth/BluetoothInterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/FrameInterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-1, +1)

| History

| Source

| Diff

… 81 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13939: IMP: Implementation of the the message [0xBA00]...

Behrouz NematiPour — Thu, 22 Sep 2022 03:22:24 -0700

Behrouz NematiPour committed 86acb3c on branch master, @Environement_Swith and 192 more in application

DEN-13939: IMP: Implementation of the the message [0xBA00]

- The Model/View are implemented and exposed to QML.

· /AlarmMapping.csv	(-1, +4)	\| History	\| Source	\| Diff
· /alarmMapping.sh	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro	(-0, +10)	\| History	\| Source	\| Diff
· /denali.pro.user	(-11, +20)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.cpp	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +6)	\| History	\| Source	\| Diff
· /sources/model/MModel.h	(-0, +10)	\| History	\| Source	\| Diff
· /sources/model/confirm/MDuetConfirmHDi.cpp	(-0, +49)	\| History	\| Source
· /sources/model/confirm/MDuetConfirmHDi.h	(-0, +85)	\| History	\| Source
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +5)	\| History	\| Source	\| Diff
· /sources/view/VView.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/view/confirm/VConfirmDialog.cpp	(-0, +46)	\| History	\| Source
· /sources/view/confirm/VConfirmDialog.h	(-0, +56)	\| History	\| Source

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated MAlarmMapping.cpp

Dara Navaei — Tue, 13 Sep 2022 11:19:41 -0700

Dara Navaei committed f536bdd on branch master, @Environement_Swith and 191 more in application

Bamboo Commit: Updated MAlarmMapping.cpp

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-14, +20)

| History

| Source

| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 13 Sep 2022 11:18:59 -0700

Dara Navaei committed 54c4136 on branch master, @Environement_Swith and 191 more in application

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

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-1, +1)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /scripts/run.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/setup.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/start.sh

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/_wip_/fileCopy/main.cpp

(-6, +6)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-1, +1)

| History

| Source

| Diff

… 86 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-12640: UI: Pressure readings on blood prime / rinseback...

Behrouz NematiPour — Mon, 12 Sep 2022 02:03:11 -0700

Behrouz NematiPour committed 8df3fd1 on branch master, @Environement_Swith and 193 more in application

DEN-12640: UI: Pressure readings on blood prime / rinseback

- Added bottom line separators.

· /sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13845: CRV: Merge issue of DEN-12716-UI_BN_S70 into staging...

Behrouz NematiPour — Sun, 11 Sep 2022 04:08:23 -0700

Behrouz NematiPour committed b3a919e on branch master, @Environement_Swith and 195 more in application

DEN-13845: CRV: Merge issue of DEN-12716-UI_BN_S70 into staging

- Due to some enum changes, UI couldn't build

- An idea implemented to detect the enum changes by compiler. The implementation may be able to improve.

· /AlarmMapping.csv	(-27, +39)	\| History	\| Source	\| Diff
· /sources/gui/GuiGlobals.h	(-0, +5)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp	(-3, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h	(-4, +4)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-293, +305)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(-1, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(-1, +3)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(-32, +104)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(-2, +4)	\| History	\| Source	\| Diff
· /unittests/tst_models.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13844: DEN-13774: VITALS numpad appears during rinseback if BP interval is on...

Behrouz NematiPour — Thu, 01 Sep 2022 18:40:49 -0700

Behrouz NematiPour committed b238ed3 on branch master, @Environement_Swith and 192 more in application

DEN-13844: DEN-13774: VITALS numpad appears during rinseback if BP interval is on

- It was only working on the HDOpMode to be in-treatment, but needed to get the HDTreatmentState as well to make sure it is in Dialysis state too.

· /AlarmMapping.csv	(-3, +6)	\| History	\| Source	\| Diff
· /cppcheck.err	(-16, +35)	\| History	\| Source	\| Diff
· /cppcheck.log	(-241, +212)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +11)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-14, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/TreatmentStack.qml	(-29, +29)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-4, +7)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar...

Behrouz NematiPour — Tue, 30 Aug 2022 19:25:33 -0700

Behrouz NematiPour committed efb549a on branch master, @Environement_Swith and 192 more in application

DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar

- Changed the Alarm Dialog (Title decreased by 4, Description increased by 4) / Bar (increased by 6) font size,

- Adjusted the AlarmDialog Timer position and layout.

- Removed the mouseArea from the WaitDone component.

- Added titel/description fontPixedSize for the NotificationDialog and NotificationBar

- Clear the reasontext on home screen when is not visible anymore.

- Clear the reasontext on SettingsDG when is not visible anymore.

- Used NotificationBarSmall instead of NotificationBar in:

- ModalDialog

- MainHome

- TreatmentAdjustmentBase

- TreatmentFlowBase

· /AlarmMapping.csv	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ModalDialog.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TimeText.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/WaitDone.qml	(-4, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/NotificationDialog.qml	(-4, +10)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainHome.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-3, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13736: Disinfection demo...

Behrouz NematiPour — Mon, 29 Aug 2022 16:23:25 -0700

Behrouz NematiPour committed 3c10146 on branch master, @Environement_Swith and 192 more in application

DEN-13736: Disinfection demo

- Some changes has been made to UI to able to navigate to the home while on disinfection.

- CloudSync disabled by default.

· /AlarmMapping.csv	(-7, +7)	\| History	\| Source	\| Diff
· /scripts/run.sh	(-1, +1)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.cpp	(-1, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-298, +298)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VHDOperationModeData.cpp	(-4, +22)	\| History	\| Source	\| Diff
· /sources/view/hd/data/VHDOperationModeData.h	(-3, +14)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13743: IMP: Device Registration - CloudSync POST test - Device Serial/Version req/rsp...

Behrouz NematiPour — Wed, 24 Aug 2022 12:50:01 -0700

Behrouz NematiPour committed e5577fb on branch master, @Environement_Swith and 192 more in application

DEN-13743: IMP: Device Registration - CloudSync POST test - Device Serial/Version req/rsp

- Added the disable functionality ( main.h SINGLETON_... macros ) for the Singleton classes, which are basically controllers, to stop their thread event loop, so they literally stop working.

- Connected the disable functionality of the controllers like, CloudSync, Bluetooth (Maybe later Logger), to the POST result.

- Improved the ./run.sh script and same on the ApplicationPOST class.

- Set the minimum of the HD/DG serial length to 1 byte, since it is not exactly at 15 or 20 char length.

- Removed the "CS" from the UI log of sending out the messages to CS, which the source is UI, not the CS and this is confusing.

- Removed the "Settings/DG Cleaning" scheduling section.

- Changed the POST version/serial request from UI to all to be identified in the log from "Versionreq" to "POSTInfReq".

- Added a new UI POST Alarm in AlarmDefs.h, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC = 295, ///< UI POST CloudSync failure

- Fixed a potential bug on SD-Card not ready service logging.

· /AlarmMapping.csv	(-1, +2)	\| History	\| Source	\| Diff
· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /main.cpp	(-23, +33)	\| History	\| Source	\| Diff
· /scripts/run.sh	(-18, +42)	\| History	\| Source	\| Diff
· /sources/ApplicationController.cpp	(-0, +13)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-0, +7)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.cpp	(-8, +23)	\| History	\| Source	\| Diff
· /sources/ApplicationPost.h	(-28, +36)	\| History	\| Source	\| Diff
· /sources/bluetooth/BluetoothInterface.cpp	(-0, +5)	\| History	\| Source	\| Diff
· /sources/canbus/MessageGlobals.h	(-2, +2)	\| History	\| Source	\| Diff
· /sources/cloudsync/CloudSyncController.cpp	(-1, +8)	\| History	\| Source	\| Diff
· /sources/device/DeviceController.cpp	(-8, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/main.h	(-0, +27)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/settings/MAdjustHDRequests.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmTriggered.cpp	(-1, +0)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x9A]...

Behrouz NematiPour — Thu, 18 Aug 2022 15:52:54 -0700

Behrouz NematiPour committed c4b9550 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x9A]

- The UI application was refusing to send the message 0x9A, and the type of the message to be sent should change to U32 to work since FW is using U32 for bool.

· /AlarmMapping.csv	(-1, +5)	\| History	\| Source	\| Diff
· /sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +6)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: Updated the Blood Prime message [0x5900]...

Behrouz NematiPour — Tue, 16 Aug 2022 11:27:39 -0700

Behrouz NematiPour committed f8b8214 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: Updated the Blood Prime message [0x5900]

- It has 3 parameters (UI expected) but recently changed on the FW and sending only 2 which then UI rejects it. now updated to have only 3.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp	(-4, +0)	\| History	\| Source	\| Diff
· /sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h	(-2, +0)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp	(-1, +0)	\| History	\| Source	\| Diff
· /sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h	(-1, +0)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: Unhandled messages duplicate keys fix...

Behrouz NematiPour — Mon, 15 Aug 2022 20:47:30 -0700

Behrouz NematiPour committed 35db011 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: Unhandled messages duplicate keys fix

- it has been observed that the unhandled messages are not logged correctly and turned out it is because of the Types of each parameter used as keys and keys can't be duplicate by default which caused issue for the unhandled messages, since they may have 6 parameter and all with F32 type which then becomes one parameter of type F32.

- an attribute has been defined for the config file with the format:

#--duplicate_key_on

#--duplicate_key_off

to allow or disallow the duplicate key at any point in the config file.

- Note that the save config parameters are always unique key like AlarmVolume which doesn't make sense to have duplicate entry.

· /AlarmMapping.csv	(-4, +4)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-5, +5)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.cpp	(-6, +11)	\| History	\| Source	\| Diff
· /sources/model/settings/MSettings.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-10, +40)	\| History	\| Source	\| Diff
· /sources/storage/Settings.h	(-2, +5)	\| History	\| Source	\| Diff
· /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h	(-0, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: DEN-9297: Disinfection messaging flow review...

Behrouz NematiPour — Mon, 15 Aug 2022 02:42:15 -0700

Behrouz NematiPour committed 153bcdb on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: DEN-9297: Disinfection messaging flow review

- Disinfection current code/design review

- Disinfection Screens and Navigation implementation

- There are functions and properties used but not implemented yet in vDisinfectAdjustDisinfect, and some that are implemented are not implemented with the new design.

· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-6, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-146, +31)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-13, +9)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsStack.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: General Implementation [-k, -K]...

Behrouz NematiPour — Fri, 12 Aug 2022 17:39:37 -0700

Behrouz NematiPour committed cb7d9e1 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: General Implementation [-k, -K]

- The logic for the check-in and Ack messages reversed to be always disabled and can be enabled later if needed.

- For Integration/Unit tests the application needs to be called with these two switches otherwise tests will fail.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /main.cpp	(-14, +17)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.cpp	(-4, +4)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/main.h	(-2, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645 IMP: DEN-12958: UI shall generate the POST fail alarm if the SD-Card not present and stop logging...

Behrouz NematiPour — Thu, 11 Aug 2022 17:11:05 -0700

Behrouz NematiPour committed 465a935 on branch master, @Environement_Swith and 192 more in application

DEN-13645 IMP: DEN-12958: UI shall generate the POST fail alarm if the SD-Card not present and stop logging

__________

- Log Export

- Added the Alarm generation on the GuiController if SD-Card is not ready, or is/becomes read-only.

- AlarmGenerator

- Added the SD-Card failure alarm - ALARM_ID_UI_POST_FAILURE_SDCARD

- Added alarm clear - ALARM_ID_NO_ALARM

- Added a flag to stop logging if the SD-Card is not ready or is readonly.

- Removed pause on log clean up.

- Improved the DeviceController SD-Card, USB status detection.

- Fixed and improved the MVC connection betweein device/Application/Gui controllers.

- A CLI switch ( -S ) added to disable the feature that is disabling the log if the SD-Card doesn't exist. So if the -S switch is used while calling the denali application, the logging will NOT be disabled, if SD-Card fails.

- In the ExportButton and USBButton(eject) removed the enable logic and has to be done outside of the component. It has been done for the Settings/export and Post-Tx/Review.

- Added title and file count for each SD-Card and USB-Drive panels.

__________

- Run.sh

- Added a check for the CloudSync and if the folder doesn't exist it won't do the rest

- Kill the denali application, in case it is still running.

- Added SD-Card type as part of its detection and if it is not ext4 format it fails the test.

- Optimized the mount point detection.

__________

- NoCANBus

- added the NoCANBus to the fault and init modes to not to navigate to those if NoCANBus is true. Otherwise it conflict with navigate to the home.

- Added a log in case the NoCANBus is enabled.

__________

- Settings

- Converted the '\n' in the settings values to actual newline character.

__________

- Thread:

- Moved the QuiController in its own thread, _Gui_Thread.

__________

- Alarms

- Added an emit to update the Alarm Dialog with the latest title/message, received from Alarms.conf In case there was an alarm before even Alarm.conf is read.

· /AlarmMapping.csv

(-13, +13)

| History

| Source

| Diff

· /main.cpp

(-1, +8)

| History

| Source

| Diff

· /scripts/run.sh

(-34, +42)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-0, +26)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-0, +3)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-11, +20)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-0, +4)

| History

| Source

| Diff

· /sources/Threads.cpp

(-0, +2)

| History

| Source

| Diff

· /sources/Threads.h

(-0, +1)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-61, +45)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-3, +0)

| History

| Source

| Diff

· /sources/gui/GuiController.cpp

(-7, +29)

| History

| Source

| Diff

· /sources/gui/GuiController.h

(-0, +4)

| History

| Source

| Diff

· /sources/gui/GuiView.cpp

(-20, +17)

| History

| Source

| Diff

· /sources/gui/GuiView.h

(-3, +4)

| History

| Source

| Diff

… 13 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: General Implementation...

Behrouz NematiPour — Mon, 08 Aug 2022 12:24:26 -0700

Behrouz NematiPour committed 5e0731a on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: General Implementation

DEN-12836: Treatment Report/log export modifications

- Finalizing the log export.

· /sources/gui/qml/components/ExportButton.qml	(-4, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/USBButton.qml	(-5, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(-1, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsExportLogs.qml	(-30, +32)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: General Implementation...

Behrouz NematiPour — Sun, 07 Aug 2022 12:30:23 -0700

Behrouz NematiPour committed fa8a247 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: General Implementation

DEN-12836: Treatment Report/log export modifications

- Update the eject and export button status for the export service and treatment

· /sources/gui/GuiView.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ExportButton.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/USBButton.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13645: IMP: General Implementation...

Behrouz NematiPour — Fri, 05 Aug 2022 02:03:32 -0700

Behrouz NematiPour committed 7ebc073 on branch master, @Environement_Swith and 192 more in application

DEN-13645: IMP: General Implementation

DEN-12836: Treatment Report/log export modifications

· /AlarmMapping.csv	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro.user	(-4, +4)	\| History	\| Source	\| Diff
· /sources/ApplicationController.cpp	(-6, +23)	\| History	\| Source	\| Diff
· /sources/ApplicationController.h	(-2, +4)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.cpp	(-6, +20)	\| History	\| Source	\| Diff
· /sources/gui/GuiController.h	(-3, +7)	\| History	\| Source	\| Diff
· /sources/gui/GuiView.cpp	(-2, +28)	\| History	\| Source	\| Diff
· /sources/gui/GuiView.h	(-2, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsExportLogs.qml	(-21, +144)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/storage/Logger.cpp	(-7, +89)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-3, +19)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13489 IMP: General Implementation...

Behrouz NematiPour — Wed, 03 Aug 2022 02:59:49 -0700

Behrouz NematiPour committed 6f2622b on branch master, @Environement_Swith and 192 more in application

DEN-13489 IMP: General Implementation

DEN-13035: Update alarm body messages

- Removed the exclamation mark icon form the Alarm Dialog.

- Removed the exclamation mark icon form the Alarm Bar.

- Made the whole AlarmDialog title bar doubleClick and diagnostics opener if the alarm is not minimizable.

- Moved the Alarm ID from title to the bottom left of the dialog with format: "ID:".

- Clipped the AlarmDialon body message area, crop the text if longer than dialog area.

- Changed the "settings" property name of the VSettings to "instructions".

- Changed the date/time formats keys to simplify the code and conf file.

- Implemented the Alarm Body messages, to load from Alams/Alarms.conf, instead of the FW.

- The FW texts/documents will still being used if the Alarms.conf doesn't have a definition.

- A instruction base capability has also been added to the MVC, but UI still not supporting it.

· /AlarmMapping.csv

(-3, +3)

| History

| Source

| Diff

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-3, +3)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/AlarmItem.qml

(-8, +9)

| History

| Source

| Diff

· /sources/gui/qml/components/NotificationBar.qml

(-9, +9)

| History

| Source

| Diff

· /sources/gui/qml/dialogs/NotificationDialog.qml

(-18, +27)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-4, +3)

| History

| Source

| Diff

· /sources/gui/qml/pages/TreatmentFlowBase.qml

(-8, +6)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsDG.qml

(-3, +3)

| History

| Source

| Diff

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-293, +293)

| History

| Source

| Diff

· /sources/model/settings/MSettings.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/storage/Settings.h

(-0, +25)

| History

| Source

| Diff

· /sources/storage/StorageGlobals.cpp

(-0, +7)

| History

| Source

| Diff

· /sources/storage/StorageGlobals.h

(-0, +6)

| History

| Source

| Diff

… 4 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Fixed the issue on the PatientID confirm text

Behrouz NematiPour — Wed, 27 Jul 2022 16:32:46 -0700

Behrouz NematiPour committed 7d3e62c on branch master, @Environement_Swith and 192 more in application

Fixed the issue on the PatientID confirm text

· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13489: IMP: General Implementation for any bugs and any other implementations...

Behrouz NematiPour — Tue, 26 Jul 2022 00:20:10 -0700

Behrouz NematiPour committed 627b978 on branch master, @Environement_Swith and 192 more in application

DEN-13489: IMP: General Implementation for any bugs and any other implementations

- Enable Dialin logging CL switch has changed to disable dialin logging, to make the dialin logging as enabled by default and removed -d from run.sh. [Sean's Request]

- Added log unhandled as error to the unhandled reader as well.

- Implemented the NoCANBus to be used when no CANBus enabled. For now it is only bypassing the create treatment button command and helps to get to the treatment parameters for the touchscreen test. [EEMN's Support]

- Fixed a bug on the Volume Adjustment on post, sending to HD to update HD alarm volume with previous, adjusted value, which was sending a request one again receiving HD response, and it was a potential crash loop.

- Added disable acknowledgment logs (req,bak) CL switch, -K : --disable-acknow-log [Sean's Request]

· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /main.cpp	(-8, +17)	\| History	\| Source	\| Diff
· /scripts/run.sh	(-2, +1)	\| History	\| Source	\| Diff
· /sources/MainTimer.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/canbus/FrameInterface.cpp	(-5, +5)	\| History	\| Source	\| Diff
· /sources/canbus/MessageDispatcher.cpp	(-9, +9)	\| History	\| Source	\| Diff
· /sources/canbus/MessageInterpreter.cpp	(-1, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml	(-4, +5)	\| History	\| Source	\| Diff
· /sources/main.h	(-1, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/Logger.h	(-2, +0)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-9, +22)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.h	(-2, +3)	\| History	\| Source	\| Diff