dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

required changes are done.

required changes are done.

DEN-16093 handler for DG park concnetrate pump added

DG-DEN-16280_Stuck IN Post Treatment When Inlet Water Alarm Appears
DG-DEN-16280_Stuck IN Post Treatment When Inlet Water Alarm Appears
DEN-15973 Change #define name

Consider calling a (new) function in ConcentratePumps.c that would do all of this (decides whether to accept or reject command and parks the pumps if accepting, sets reject reason code if rejecting...

Consider calling a (new) function in ConcentratePumps.c that would do all of this (decides whether to accept or reject command and parks the pumps if accepting, sets reject reason code if rejecting). Function would also create and send the cmd response message and return TRUE/FALSE which would set local result here for the ack response message below.
We should reject cmd if pumps are busy/on and/or if current DG mode is fill or fault mode.

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

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Suggest aligning comments in the block above

Suggest aligning comments in the block above

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

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

    • -1
    • +1
    /firmware/App/Drivers/SafetyShutdown.c
Merged DEN-16250