application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13198-UI_BN_75' into develop

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.

    • -14
    • +0
    /sources/gui/qml/pages/MainStack.qml
    • -29
    • +29
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -4
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

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

    • -1
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +1
    /sources/gui/qml/components/TimeText.qml
    • -4
    • +0
    /sources/gui/qml/components/WaitDone.qml
    • -3
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -0
    • +4
    /sources/gui/qml/pages/settings/SettingsDG.qml
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

DEN-13756: DEMO Request: Add additional instructions for HD Door Open Alarm resolution

- On the AlarmBar the title should be displayed.

Merge branch 'DEN-13198-UI_BN_75' into develop

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.

    • -298
    • +298
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -3
    • +14
    /sources/view/hd/data/VHDOperationModeData.h
Updated Alarm mapping

    • -297
    • +298
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -297
    • +296
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

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.

    • -0
    • +5
    /sources/bluetooth/BluetoothInterface.cpp
    • -2
    • +2
    /sources/gui/qml/pages/settings/SettingsDG.qml
    • -2
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +0
    /sources/model/hd/alarm/MAlarmTriggered.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

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

- After my initial code review and looking into other messages, UI should never define a bool in any request message, and it has to be quint32 and an enum Options passing to that.

- Therefore the code has been fixed and cleaned up.

Merge branch 'DEN-13198-UI_BN_75' into develop

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.

    • -2
    • +6
    /sources/model/hd/alarm/MAlarmMapping.cpp
Latest Unit testing modules

    • -293
    • +297
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop

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

- Implemented the disinfection mode response

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x80]

- Renamed the disinfection start response

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x9A]

- Implemented the Disinfection Mode Request message.

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
DEN-13645: IMP: DEN9297: Disinfection implementation [ Disinfection Messages ] [0x7F,0x80]

- Cleaned up / refactor the messages [ 127 (0x7F), 128 (0x80) ]

    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -17
    • +39
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -7
    • +4
    /sources/gui/qml/pages/settings/SettingsDG.qml
Merge branch 'DEN-13198-UI_BN_75' into develop

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.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop