Dashboard

Removed Button.h

- refactored DD modules

    • -2
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -31
    • +191
    /leahi_dialin/dd/modules/drybicart.py
    • -10
    • +69
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -33
    • +65
    /leahi_dialin/dd/modules/heaters.py
    • -16
    • +39
    /leahi_dialin/dd/modules/levels.py
    • -46
    • +242
    /leahi_dialin/dd/modules/mixing_cntrl.py
    • -18
    • +98
    /leahi_dialin/dd/modules/pre_gen_dialysate.py
    • -12
    • +26
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -8
    • +49
    /leahi_dialin/dd/modules/rinse_pump.py
    • -14
    • +27
    /leahi_dialin/dd/modules/substitution_pump.py
  1. … 4 more files in changeset.
LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addressed cr comments

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +70
    /sources/model/dd/adjustment/settings/MRoWaterModeResponse.h
  1. … 9 more files in changeset.
LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addresed cr comments

LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addressed cr commetns

    • -11
    • +180
    /DD_RO_WaterMode/interface.ui
removed from settings and config and now handled by fw

removed from settings and config and now handled by fw

added

added

LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

address cr comments

LDT-4063: Updated Generic confirm cmd

Addressed review comments

Addressed review comments

Merge remote-tracking branch 'origin/staging' into LDT-5102-dd-concentrate-pumps-hardware-d

Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

Revert "Merge branch 'develop' into LDT-5102-dd-concentrate-pumps-hardware-d"

This reverts commit f43d59af8e69ef1459bafe91873ce41cf63a4a75, reversing

changes made to 7f56f07660862bc62524c506699193a7e5f48f96.

    • -163
    • +61
    /firmware/App/Controllers/DryBiCart.c
    • -13
    • +3
    /firmware/App/Controllers/Heaters.c
    • -51
    • +16
    /firmware/App/Controllers/MixingControl.c
    • -4
    • +4
    /firmware/App/Controllers/MixingControl.h
    • -10
    • +5
    /firmware/App/Controllers/RinsePump.c
  1. … 9 more files in changeset.
- Updated descriptions - Refactored FP module - Refactored DD module

    • -55
    • +55
    /leahi_dialin/common/dd_defs_proxy.py
    • -45
    • +96
    /leahi_dialin/dd/dialysate_delivery.py
    • -156
    • +50
    /leahi_dialin/dd/modules/alarms.py
    • -20
    • +118
    /leahi_dialin/dd/modules/balancing_chamber.py
    • -48
    • +165
    /leahi_dialin/dd/modules/blood_leak.py
    • -33
    • +56
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -30
    • +48
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -29
    • +43
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -162
    • +127
    /leahi_dialin/dd/modules/valves.py
    • -20
    • +35
    /leahi_dialin/dd/modules/voltages.py
    • -0
    • +10
    /leahi_dialin/dd/proxies/ro_proxy.py
    • -26
    • +39
    /leahi_dialin/dd/proxies/td_proxy.py
    • -43
    • +125
    /leahi_dialin/fp/filtration_purification.py
  1. … 29 more files in changeset.
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

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

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

    • -2
    • +5
    /firmware/App/Services/NVMessagingDD.c
    • -2
    • +5
    /firmware/App/Services/NVMessagingDD.h
  1. … 3 more files in changeset.
Merge branch 'develop' into LDT-5102-dd-concentrate-pumps-hardware-d

conflict resolution

Fixed.

Fixed.

Moved.

Moved.

Move buttons down just above "Comm.h". And why is buttons being included here?

Move buttons down just above "Comm.h". And why is buttons being included here?

This reason code is not used anywhere, and the existing REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE can be used if a rejection response is needed. I removed the new reason code.

This reason code is not used anywhere, and the existing REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE can be used if a rejection response is needed. I removed the new reason code.

I don't see it.

I don't see it.

I don't see it.

I don't see it.

I would think reason code 1 would work for this - do we really need to add this one?

I would think reason code 1 would work for this - do we really need to add this one?