application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
UI-DEN-10206: UI-DEN-10206-1: addressing the code reviews.

    • -1
    • +1
    /sources/canbus/MessageAcknowModel.cpp
    • -2
    • +2
    /sources/cloudsync/CloudSyncController.h
UI-DEN-10206: UI-DEN-10206-1: addressing the code reviews.

    • -0
    • +1
    /sources/canbus/MessageAcknowModel.cpp
    • -2
    • +2
    /sources/cloudsync/CloudSyncController.h
Merge branch 'DEN-10602_UI_DEV_Add_PatientID_PreTreatment' into develop

Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-10607: Implementation [Screen]

- Got the information below from the settings to be consistent with all the other screens and views:

- acidConcentrateOptions

- bicarbonateConcentrateOptions

- dialyzerTypeOptions

- heparinTypeOptions

- Added the heparin to the list as well so later can be used on the create treatment screen.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-10607: Implementation [Screen]

- DEN-10608: Implementation [Navigation]

- DEN-10609: Implementation [Treatment Log]

    • -0
    • +1
    /sources/canbus/MessageAcknowModel.cpp
    • -1
    • +1
    /sources/gui/qml/components/StackItem.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Improved the POST

- Updated the run.sh

- Enabled the Sha256 in the application

- Fixed the ShaSum issue in the run.sh

- Added a command line argument to disable the alarm-no-minimize

- Set the timezone to UTC int eh setup script.

- Setup the correct greeting on the home screen

    • -0
    • +275
    /resources/settings/Messages/Unhandled.conf
    • -1
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -2
    • +20
    /sources/view/settings/VDateTime.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-10247: FW: UI Acknow timeout

- Moved the Check-In logic into the MessageAcknowModel and emit the check-in signal directly to the MessageDispatcher, and removed from MainTimer.

- Removed the POST start from main.cpp and moved in the Main.qml to notify the ApplicaionController onGUIReady to start the POST and Check-In.

    • -1
    • +2
    /sources/canbus/MessageAcknowModel.cpp
    • -0
    • +23
    /sources/canbus/MessageAcknowModel.h
    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
Re-Enable the POST

DEN-10206: BCuff: Known bugs: Only pair with one BCuff at a time

- Updated some BLE device status messaging due to received feed backs to avoid user confusion.

- Updated to emit the BLE paired devices signal in Device view and let UI decide to run the scan or not to have the failed information in UI as well in case needs to be shown

DEN-10206: BCuff: Known bugs: Only pair with one BCuff at a time

- Added the bluetooth_remove_paired.sh script call

- Added the timeout safety for the script calls.

- Filtered the UI acknowledgment on only the messages intent for the UI only.

    • -0
    • +28
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +32
    /sources/device/DeviceController.cpp
Delayed Checkin

- The delayed check-in idea, tested.

- The idea is that the UI is not ready when sending the check-in so delay the check-in to the point that GUI is loaded and can notify that it's ready and check-in and post can start.

- :: It didn't work.

- Some other timestamps were added to the code to get the time between the time message was sent. and UI receiving it, which is the 1.200 s between when the HD sends UI Version Req and when UI actually receives it, which is the root cause of the issue.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-10599: KeborMed [ Start working on the CloudSync infrastructure ]

- Added new line (\n) to the send out buffer.

DEN-10599: KeborMed [ Start working on the CloudSync infrastructure ]

- Updated/Improved CloudSync

- Figured the gedit changes the file in a way that breaks the Qt watch.

. It has been tested with Python file O/R/W/F/C and all worked fine.

. It has been tested by nano and works fine.

. It has been tested with shell echo command and works fine with >,>> .

    • -1
    • +25
    /sources/cloudsync/CloudSyncController.h
CloudSync: Using Logger to write Buffer

- I found it unnecessary to use logger since this is the temporary approach and also CloudSyncController has a thread for itself and don't need to keep the Logger busy and also preferred to keep the CloudSync separated from the other entities.

    • -0
    • +1
    /sources/cloudsync/CloudSyncController.h
PRS 464 Update: Treatment Parameter, Stop Heparin Dispensing Before End of Treatment

- const quint32 heparinStopTime_Max = 470 <- 480

DEN-10599: KeborMed [CloudSync infrastructure kickoff ]

- The infrastructure is done for send and receive

- IT only needs interpretation on send and action on receive of messages in CloudSync communication.

    • -2
    • +2
    /sources/bluetooth/BluetoothInterface.h
    • -3
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +192
    /sources/cloudsync/CloudSyncController.cpp
    • -0
    • +69
    /sources/cloudsync/CloudSyncController.h
    • -6
    • +38
    /sources/device/DeviceController.cpp
  1. … 6 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +15
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-10424_FW_Request_A4_A5_Msg_log' into develop

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

    • -23
    • +23
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-9968: GUI does not indicate the amount of time the device has been stopped in pre-treatment & treatment

- Added message ID_TreatmentStop = 0x4900, // 73 and its Model, View

- Added a timer on the Alarm Dialog which is visible in Treatment Stop and if the message above has a total value.

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +83
    /sources/model/hd/data/treatment/MTreatmentStopData.h
    • -0
    • +26
    /sources/view/hd/data/treatment/VTreatmentStopData.cpp
    • -0
    • +44
    /sources/view/hd/data/treatment/VTreatmentStopData.h
Part 2/2: Added the two new General HD/DG messages

    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -21
    • +0
    /sources/model/MAbstractDynamic.cpp
    • -0
    • +42
    /sources/model/dg/data/MDGGeneralEvent.cpp
    • -0
    • +86
    /sources/model/dg/data/MDGGeneralEvent.h
    • -0
    • +21
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -1
    • +17
    /sources/model/hd/alarm/MAlarmTriggered.h
    • -1
    • +1
    /sources/model/hd/data/MHDDebugText.cpp
    • -0
    • +42
    /sources/model/hd/data/MHDGeneralEvent.cpp
    • -0
    • +86
    /sources/model/hd/data/MHDGeneralEvent.h
DEN-10161: Missing END TREATMENT option in Treatment-Recirculate-Stop screen

- The screen (Reconnect) belongs to the TREATMENT_RECIRC_STOPPED_STATE state of the TREATMENT_RECIRC_STATE in the TREATMENT_STATE message, didn't even have a "END TREATMENT" button, which has been added.

- The time_IsLeft logic has NOT been removed yet, since I don't recall why it has been used in the first place.

Part 2/2: make the Alarm Triggered messages modification

- Created a class named MAbstractDynamic which is the base class of the dynamic model classes.

+ Dynamic Model classes are the ones with field descriptor (FD) and a data field (DF) after that which the data type in the data field is defined by field descriptor.

+ This combination for now is only for 2 set of FD, DF only.

- Made the Alarm Triggered inherit from MAbstractDynamic.

    • -0
    • +177
    /sources/model/MAbstractDynamic.cpp
    • -0
    • +102
    /sources/model/MAbstractDynamic.h
    • -155
    • +1
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -38
    • +3
    /sources/model/hd/alarm/MAlarmTriggered.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp