Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into develop

LDT-566: updated comments to indicate TODOs

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

WIP on develop

LDT-566: fixed can protocol exception

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

WIP on develop

LDT-566: fixed can. updated temperature override to use the correct override message.

  1. … 1 more file in changeset.
Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into develop

LDT-566: implemented permeate tank override. implemented alarm overrides for dd and fp. Commented out debugging logs for now, to be configurable setting.

  1. … 5 more files in changeset.
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

  1. … 2 more files in changeset.
Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

  1. … 2 more files in changeset.
Merge branch staging into master

  1. … 2 more files in changeset.
Revert "Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop"

This reverts commit 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77, reversing

changes made to 9403e6711adf53da699ff25b4b7342286bf49b92.

  1. … 7 more files in changeset.
Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Fixed the issues caused SWVV main test to fail.

  1. … 7 more files in changeset.
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

  1. … 4 more files in changeset.
WIP on develop

Renamed RO class and sub modules to use FP to be in line with sub system names

  1. … 23 more files in changeset.
Merge branch 'LEAH-142-dial-td-base-object' into develop

fixed can pairings and valve channel id

WIP on LEAH-142-dial-td-base-object

fixed channel ID pairs.

TEST: misc fixes and disables to facilitate testing.

  1. … 4 more files in changeset.
TEST: renamed UI to HD channel to UI to TD. Commented out 2 lines in dialysate_delivery.py that were crashing Dialin.

  1. … 1 more file in changeset.
Fixed syntax naming for project name. Fixed instantiation errors for TD module. Fixed import pathing for TD modules.

  1. … 111 more files in changeset.