Activity dialin/

Commenting out these variables will cause out of sync issues between what is currently in DG develop. Current conductivity data struct in DG develop: /// Conductivity data struct. F32 roRejectionR...

Commenting out these variables will cause out of sync issues between what is currently in DG develop. Current conductivity data struct in DG develop:

/// Conductivity data struct.
F32 roRejectionRatio; ///< RO rejection ratio
F32 cpi; ///< CPi conductivity sensor value
F32 cpo; ///< CPo conductivity sensor value
F32 cd1; ///< CD1 conductivity sensor value
F32 cd2; ///< CD2 conductivity sensor value
F32 cpiRaw; ///< CPi raw conductivity sensor value (without 2% temperature compensated)
F32 cpoRaw; ///< CPo raw conductivity sensor value (without 2% temperature compensated)
F32 cd1Raw; ///< CD1 raw conductivity sensor value (without 2% temperature compensated)
F32 cd2Raw; ///< CD2 raw conductivity sensor value (without 2% temperature compensated)
U32 cpiSensorStatus; ///< CPi conductivity sensor status
U32 cpoSensorStatus; ///< CPo conductivity sensor status
U32 cd1SensorStatus; ///< CD1 conductivity sensor status
U32 cd2SensorStatus; ///< CD2 conductivity sensor status
CONDUCTIVITY_DATA_T;

please be careful when we are merging this into staging

1:05 pm

Dara Navaei

More
351c77f
changed 0 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 193 more

Merge branch 'DEN-11928-dg-conductivity-update' of ssh://dvm-linux02:7999/vv/dialin into DEN-11928-dg-conductivity-update

1:05 pm

Dara Navaei

More
4d5e171
changed 5 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 193 more DIALIN-DEN-11928-1 DIALIN-DEN-12224-1

DEN-11928 updated the scripts

- -5
- +7
/dialin/dg/conductivity_sensors.py
- History
- Source
- Diff
/dialin/dg/conductivity_sensors.py
- -1
- +1
/dialin/dg/dialysate_fill.py
- History
- Source
- Diff
/dialin/dg/dialysate_fill.py
- -1
- +1
/dialin/dg/gen_idle.py
- History
- Source
- Diff
/dialin/dg/gen_idle.py
- -10
- +36
/tests/dg_tests.py
- History
- Source
- Diff
/tests/dg_tests.py
- -6
- +6
/tests/hd_nvm_scripts.py
- History
- Source
- Diff
/tests/hd_nvm_scripts.py

11:40 am

Hung Nguyen <hnguyen@diality.com>

More
def93f7
changed 2 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 193 more DIALIN-DEN-11928-1

DEN-11928 Changed 'f' to 'i' to display the gen idle mode sub-sub-state correctly

- -1
- +1
/dialin/dg/gen_idle.py
- History
- Source
- Diff
/dialin/dg/gen_idle.py
- -1
- +1
/tests/test_conductivity.py
- History
- Source
- Diff
/tests/test_conductivity.py

4:16 pm

Michael Garthwaite

More
5e35d21
changed 0 files
DEN-12358-sw_dev-sprint-67_mg, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 128 more

Merge branch 'staging' into DEN-12358-sw_dev-sprint-67_mg

4:14 pm

Michael Garthwaite

More
DIALIN-DEN-12358-1
started review

DIALIN-DEN-12358_SW Dev Sprint 67 MG

1:54 pm

Dara Navaei

More
7fda529
changed 4 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more DIALIN-DEN-12224-1

DEN-12224 updated the drivers

- -1
- +25
/dialin/dg/concentrate_pumps.py
- History
- Source
- Diff
/dialin/dg/concentrate_pumps.py
- -31
- +35
/dialin/dg/conductivity_sensors.py
- History
- Source
- Diff
/dialin/dg/conductivity_sensors.py
- -5
- +21
/tests/dg_tests.py
- History
- Source
- Diff
/tests/dg_tests.py
- -2
- +2
/tests/hd_nvm_scripts.py
- History
- Source
- Diff
/tests/hd_nvm_scripts.py

10:59 am

Michael Garthwaite

More
4b5ae3e
changed 0 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Merge branch 'DEN-12358-sw_dev-sprint-67_mg' into develop

10:58 am

Michael Garthwaite

More
2fd9d80
changed 1 file
DEN-12358-sw_dev-sprint-67_mg, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 128 more DIALIN-DEN-12358-1

DEN-12358: Updated dialyzer types.

- -4
- +6
/dialin/hd/treatment.py
- History
- Source
- Diff
/dialin/hd/treatment.py

10:36 am

Michael Garthwaite

More
Re: DIALIN-DEN-11928-1
commented on review

Please change the struct.unpack parameters from big endian to little endian. Reference below: https://docs.python.org/3/library/struct.html#format-characters

Please change the struct.unpack parameters from big endian to little endian. Reference below:

https://docs.python.org/3/library/struct.html#format-characters

10:35 am

Michael Garthwaite

More
Re: DIALIN-DEN-11928-1
commented on review

Please change the struct.unpack parameters from big endian to little endian. Reference below: https://docs.python.org/3/library/struct.html#format-characters

Please change the struct.unpack parameters from big endian to little endian. Reference below:

https://docs.python.org/3/library/struct.html#format-characters

10:32 am