dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12224 merged staging

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

DEN-11928 addressed the code review comments

Merge branch 'staging' into DEN-11928-dg-conductivity-update

DEN-11928 addressed the code review comments

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

DEN-12224: Fixed alarm priority name change issue.

DEN-11928 updated the scripts

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

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.

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
DEN-11928 Updated Dialin Python scripts

    • -0
    • +108
    /dialin/dg/idle_badfill_substates.py
DEN-11928 Updated

DEN-11928 Updated test script

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

DEN-12358: Added additional alarm properties and get functions for them.

DEN-12358: DIAL-152: Updated class properties and hd.treatment.reset() to be in sync with latest firmware changes.

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

DEN-12358: DIAL-152 and DIAL-138: Updated names in dg alarms to be similiar to HD's. Added remaining alarm flags to HD alarms.

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

DEN-12358: DIAL-150: renamed get_current_alarms_state to get_current_alarm_priority. Renamed get_alarm_status to get_all_alarm_states.