dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-4589_Sprint_26

Merge branch 'master' into staging

DEN-4589: Fixed drain pump bug, added get_fpga_version()

Merge branch 'DEN-4438_SalineBolus'

DEN-4589: Removed pkg-resources dependency

DEN-4589: Adding missing dg get_fpga_version

DEN-4589: Version fix

DEN-4589: Added missing get_fpga_version, adjusted treatment parameters response ordering.

DEN-4589: Updated Changelog

Merge pull request #2 in VV/dialin from DEN-4322-dg-water-ro-rejection to staging

* commit '219f8023145f879d9b17191f60a3f7700ff32665':

DEN-4322: Removed alignment per code review

DEN-4322: Removed RO rejection ratio override command

DEN-4322: Updated Dialin API for DG RO rejection ratio

Merge DEN-4344_Sprint 25 into staging

    • -12
    • +34
    /dialin/dg/dialysate_generator.py
  1. … 4 more files in changeset.
Updated to Projects instead of projects

DEN-4589 - Updated to Projects instead of projects

Fixed duplicate version.py

Merge staging into DEN-4589_Sprint_26

    • -31
    • +47
    /dialin/hd/dialysate_inlet_flow.py
    • -5
    • +23
    /dialin/hd/dialysate_outlet_flow.py
  1. … 3 more files in changeset.
DIAL-29: Added DG temperature sensors enum

    • -0
    • +34
    /tests/unit_tests/test_dg_temperature_sensors.py
DEN-4445 Code Review 0

DEN-4589: Added static code analysis

    • -0
    • +5
    /tools/run_static_code_analysis.sh
DEN-4344, DIAL-9: Documentation fixes

Removed empty file

DIAL-28, DEN-4589, DEN-4344: Ensure unit tests don't mix with hardware reliant tests, finalized import test

    • -0
    • +35
    /tests/test_ui_proxy.py
    • -60
    • +0
    /tests/unit_tests/test_dg_valves.py
DIAL-28, DEN-4589, DEN-4344: Simplified dialin import system

DEN-4322: Removed alignment per code review

DEN-4589 Fixed HD import issue and reworked version.py to work outside of git repos.

    • -0
    • +20
    /tests/test_print_version.py
DEN-4322: Removed RO rejection ratio override command

Updated hd simulator test

DEN-4322: Updated Dialin API for DG RO rejection ratio

    • -15
    • +68
    /dialin/dg/conductivity_sensors.py
Added canbus convenience functions

DEN-4443: Integration Testing

- Added a function to check for can0 so if the canbus is not configured we can fail the test.

Fixed ro pump msg ids, added fpga version to dg and hd versions, added test imports to unit tests, cleaned up get alarm states

    • -0
    • +79
    /tests/unit_tests/test_imports.py