Clone
 

sean <snash@diality.com> in dialin

Merge branch 'dialin_refactoring_3' of ssh://dvm-linux02:7999/vv/dialin into dialin_refactoring_3

Minor fix to DG RO pump class.

Added more override support for DG sub-systems.

Added HD version support to HD ui_proxy.

Minor fixes to ui_proxy.py.

Added new HD proxy sub class for DG. Renamed ui subclass of HD to ui_proxy.

    • -0
    • +168
    /dialin/dg/hd_proxy.py
    • -0
    • +439
    /dialin/hd/ui_proxy.py
Fixes to HD and DG classes. Added several new DG sub-classes. Moved doxygen config to document folder. Updated document script.

    • -0
    • +19
    /dialin/dg/constants.py
    • -166
    • +83
    /dialin/dg/dialysate_generator.py
    • -0
    • +111
    /dialin/dg/drain_pump.py
    • -0
    • +131
    /dialin/dg/load_cells.py
    • -0
    • +131
    /dialin/dg/pressures.py
    • -0
    • +82
    /dialin/dg/reservoirs.py
    • -0
    • +118
    /dialin/dg/ro_pump.py
    • -17
    • +16
    /dialin/hd/dialysate_inlet_flow.py
    • -29
    • +28
    /dialin/hd/dialysate_outlet_flow.py
  1. … 8 more files in changeset.
Updated HD/UI messaging.

Added reason code to UF and treatment time settings change response.

Merge branch 'dialinACK' of ssh://dvm-linux02:7999/vv/dialin into dialinACK

Added blood & dialysate flow rate change to UI subclass of HD.

Fixed some comments for doxygen.

Added handling for HD treatment state broadcast message. Added treatment duration change request command to UI.

Merge branch 'dialinACK' of ssh://dvm-linux02:7999/vv/dialin into dialinACK

Added UF commands between UI and HD to HD library.

Fixed last Alarm class features.

Added detection of alarm activations and clears to the Alarms class.

Fixed bug with dialysate inlet pump published data.

Added UI sub-class to HD.

Added pressure/occlusion.

Added more DPo support. Minor fixes.

Updated CAN Core to automatically re-send messages that time out. Updated HD to include DPo. Updated most pump parameters to float from int type.

Added sequence # to message structure. Fixed exception following a CRC error.

Added zero seq field to all messages constructed.

Merge branch 'pending-from-dg-codereview' of ssh://dvm-linux02:7999/vv/dialin into pending-from-dg-codereview

Minor fixes to HD.

Fixed bug with HD alarm messages handler.

Fixed init for HD alarm class.

Updated alarm status sync msg parsing.

Added dialysate inlet pump override commands to HD.