Clone
 

micahel garthwaite <mgarthwaite@diality.com> in dialin

Merge branch 'DIAL-283-no-moving-average-commands-conductivity' into staging

DIAL-283: cd2 moving average override.

Merge branch 'DEN-16242-pressure-limit-request-fix' into staging

DEN-16242: added alarm id 47

Merge branch 'DEN-16242-pressure-limit-request-fix' into develop

DEN-16242: fixed proxy cmd having a return value when it shouldnt.

Merge branch 'DIAL-281-requesting-heat-disinfect-timer-overrides' into staging

Merge branch 'DIAL-281-requesting-heat-disinfect-timer-overrides' into develop

DIAL-282: Changed events to use local tz instead of UTC.

DIAL-281: msg_ids and documentation for heat disinfection timer overrides.

DIAL-281: added state timer overrides for heat disinfection states at 82 c and 77 c.

Merge branch 'DIAL-276-dg-event-event-id-15-prints-duplicate-events-with-different-state-time' into staging

DIAL-276: added previous missing MSG_IDs for rtc register overrides

DIAL-276: STT-2891: pressure overrides for filtered values

Merge branch 'DIAL-277-watchdog-override-for-dg' into staging

Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

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-277-watchdog-override-for-dg

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

DIAL-280: code review comments for alarm defs

DIAL-280: updated alarm defs

DIAL-277: moved hd button response from hd_proxy to the buttons sub module

DIAL-280: fixed typo in dg defs

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

DIAL-280: fixes after syncing

DIAL-280: Alarm and MSG_ID sync

  1. … 17 more files in changeset.
DIAL-280: Reservoir data broadcast override.

DEN-14706: Dialin handling of Pending ACK overrides

Merge branch 'DIAL-277-watchdog-override-for-dg' into develop