dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: Fixed DG handling of HD op mode broadcast messages.

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge remote-tracking branch 'origin/DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears' into develop

    • -23
    • +88
    /firmware/App/Services/Reservoirs.c
    • -3
    • +56
    /firmware/App/Services/SystemComm.c
DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears

Incorporated HD mode check, to clear alarm 150/151

DEN-15973 Change persistence to 12 seconds

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

DEN-16093-merge in to develop

DEN-16093-changed prime Max time and conductivity poercent check

DEN-16093-code alignment done

DEN-16093-changes added in the park handler logic

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

DEN-16093 merge in to develop

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: attempted fix to DG recognition of HD mode.

DEN-16093 handler for DG park concnetrate pump added

DEN-15973 Change #define name

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge branch 'DIAL-280-reservoir-broadcast-override' into staging

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

    • -1
    • +50
    /firmware/App/Services/SystemComm.c
Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into staging

Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

DEN-16093-added DG park concentrate pumps

DEN-15973 Correct #define name

DEN-13973 Rename alarm

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo