dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-13903-s80-mg-DIAL-204

Fixed merge conflicts.

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

Merge remote-tracking branch 'origin/DEN-13903-s80-mg-DIAL-204' into DEN-13903-s80-mg-DIAL-204

Merge branch 'staging' into DEN-13903-s80-mg-DIAL-204

Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into staging

Merge branch 'staging' into DEN-13427-sw_dev-sprint-75_mg

DEN-13903: Added raw option to load cell override command.

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

DEN-13903: Fixed return value for get alarm state function. Fixed bug in UF test script.

DEN-13903: added HD prefix to standby states enum.

DEN-13903: Renamed standby states enum and removed redundant.

DEN-13903: Added missing payloads to new set PWM commands for peristaltic pumps. Added standby states enum to HD Defs.

Merge branch 'staging' into DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2

Merge remote-tracking branch 'origin/DEN-13903-s80-mg-DIAL-204' into DEN-13903-s80-mg-DIAL-204

Revert "DEN-13903: DIAL-204: Removed duplicate enums. Added DG Service mode states. Removed StandbyStates for HD. Fixed tests in relation to the changes above."

This reverts commit 75d8984d2074be9262e4e78d9e10da4895cef0e5.

DEN-13903: DIAL-204: Removed duplicate enums. Added DG Service mode states. Removed StandbyStates for HD. Fixed tests in relation to the changes above.

DEN-13903: fixed indentation.

DEN-13903: DIAL-204: Implemented set PWM methods for all 3 HD pumps.

    • -0
    • +27
    /dialin/hd/dialysate_outlet_flow.py
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-12716-UI_BN_S70' into staging

DEN-13427: Fixed doc string for hd op mode

DEN-13460 updated the DG RTC message ID from HD

DEN-13427: updated Dry self test enum struct to contain new dry self test values.

DEN-13460: Updated dialysate_flow_sensor class to be in line with the DG flow sensor messaging & overrides.

    • -37
    • +35
    /dialin/dg/dialysate_flow_sensor.py
DEN-13427: DIAL-200: Updated Temperature handlers to include internal thd rtd. Added more positions for messages up to 30

DEN-13427: DEN-13795: fixed dg voltages override from sending over Dialin-HD channel to Dialin-DG channel.

DEN-13460 removed the raw load cell broadcast values

DEN-13427: fixed dg switch status to bit shift correctly to display 0 or 1 values