LEAHI-DD-FIRMWARE-LDT-3630

I think the 2 initial rpm constants are inputs. The test config we would normally not include.

I think the 2 initial rpm constants are inputs. The test config we would normally not include.

I think the word "Initial" should be in the function name (i.e. getFreshDialPumpInitialRpm).

I think the word "Initial" should be in the function name (i.e. getFreshDialPumpInitialRpm).

LEAHI-DD-FIRMWARE-LDT-3630_Update FW to set D12 Speed to 1250 RPM during dialysate generation mode for B1.9/2.0
LEAHI-DD-FIRMWARE-LDT-3630_Update FW to set D12 Speed to 1250 RPM during dialysate generation mode for B1.9/2.0
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +1
    /sources/view/settings/VNetworkModel.h
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix issues in Device Controller and Logger due to change of file extension to QStr5ing

    • -7
    • +11
    /sources/device/DeviceController.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Change CS rejection reason order to reject reason then logname

- Add log Tally fn

- Change Log Upload, Log backup to use log tally

- Change findpending to be dynamic due to tally changes

- Change pending/uploaded extension format to account for tally with %1

    • -31
    • +23
    /sources/device/DeviceController.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- add duplicate function for 2010

    • -0
    • +35
    /sources/device/DeviceController.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Address CR comments

    • -1
    • +9
    /sources/cloudsync/CloudSyncController.h
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Add new error message for cloudsync for log duplicates

- Add more parameters to 2010 signal

- add Switch case logic for 2010 reject reason. Logic to be implemented and discussed

    • -1351
    • +1369
    /sources/cloudsync/CloudSyncController.cpp
    • -331
    • +333
    /sources/cloudsync/CloudSyncController.h
    • -4
    • +12
    /sources/device/DeviceController.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -0
    • +14
    /sources/model/settings/MWifiNetwork.h
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -14
    • +0
    /sources/model/settings/MWifiNetwork.h
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -0
    • +14
    /sources/model/dg/data/MDGGeneralEvent.h
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 607 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merged release/p1b/staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merged release/stagingmerge-DEN-17325-release_24_dn