dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts with DEN-13903.

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

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

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

DEN-13834 updated the blood leak broadcast

Merge branch 'DEN-13903-s80-mg-DIAL-205' into develop

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

DEN-13903: DIAL-205: Fixed test errors. Renamed HDSubOpmode to HDStandbyStates.

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

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

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.

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

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
Merge branch 'DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3' into develop

DEN-13834 updated flow_sensors.py

    • -0
    • +169
    /dialin/dg/flow_sensors.py
Merged DEN-13834

DEN-13834 updated the flow sensors driver. Added a new software configuration

    • -160
    • +0
    /dialin/dg/dialysate_flow_sensor.py
Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into develop

DEN-13801: Updated SW configs for HD v3

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

Merge branch 'DEN-12716-UI_BN_S70' into staging

Merge branch 'DEN-13637-UI_BN_S77' into develop

Merge branch 'DEN-12716-UI_BN_S70' into develop

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

DEN-13427: Fixed doc string for hd op mode

DEN-13460 updated the DG RTC message ID from HD