dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-11928-dg-conductivity-update

DEN-11928 addressed the code review comments

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

This was commented out for testing. It is back on.

This was commented out for testing. It is back on.

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

DEN-12224: Fixed alarm priority name change issue.

DEN-11928 updated the scripts

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

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

DEN-11928 updated the scripts

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

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

DIALIN-DEN-12358_SW Dev Sprint 67 MG
DIALIN-DEN-12358_SW Dev Sprint 67 MG
DEN-12224 updated the drivers

    • -31
    • +35
    /dialin/dg/conductivity_sensors.py
Merge branch 'DEN-12358-sw_dev-sprint-67_mg' into develop

DEN-12358: Updated dialyzer types.

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

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

Please update the documentation.

Please update the documentation.

Please update the documentation.

Please update the documentation.

Please update the documentation.

Please update the documentation.

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

DEN-12358: DIAL-156. Imported battery class to HD class.

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

DEN-12358: DIAL-156: Implemented a battery class. Created a percentage remaining override.

    • -0
    • +89
    /dialin/hd/battery.py
DEN-11928 Renamed idle_badfill_substates.py to gen_idle.py

    • -0
    • +108
    /dialin/dg/gen_idle.py
    • -108
    • +0
    /dialin/dg/idle_badfill_substates.py
DIALIN-DEN-11928_DG Conductivity Update
DIALIN-DEN-11928_DG Conductivity Update