Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r6311eb9b65fdeec7a285d25e07f3932ac0fb6cf1 -r07b9515c080aa68fecfa331cbc593adea4c0b8dc --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6311eb9b65fdeec7a285d25e07f3932ac0fb6cf1) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 07b9515c080aa68fecfa331cbc593adea4c0b8dc) @@ -41,8 +41,7 @@ U32 alarmState; // 0 = no alarms, 1 = low priority, 2 = medium priority, 3 = high priority U32 alarmTop; // ID of top active alarm U32 silenceExpiresIn; // seconds - U08 alarmsSilenced; // 1 = silenced, 0 = not silenced - U08 alarmsFlags; // bit flags: 1 = true, 0 = false for each bit + U16 alarmsFlags; // bit flags: 1 = true, 0 = false for each bit } ALARM_COMP_STATUS_PAYLOAD_T; typedef struct @@ -194,15 +193,16 @@ payload.alarmState = (U32)almStatus.alarmsState; payload.alarmTop = (U32)almStatus.alarmTop; payload.silenceExpiresIn = almStatus.alarmsSilenceExpiresIn; - payload.alarmsSilenced = (U08)almStatus.alarmsSilenced; payload.alarmsFlags = ( almStatus.systemFault ? BIT_BY_POS(0) : 0 ); payload.alarmsFlags |= ( almStatus.stop ? BIT_BY_POS(1) : 0 ); payload.alarmsFlags |= ( almStatus.noClear ? BIT_BY_POS(2) : 0 ); payload.alarmsFlags |= ( almStatus.noResume ? BIT_BY_POS(3) : 0 ); payload.alarmsFlags |= ( almStatus.noRinseback ? BIT_BY_POS(4) : 0 ); payload.alarmsFlags |= ( almStatus.noEndTreatment ? BIT_BY_POS(5) : 0 ); - payload.alarmsFlags |= ( almStatus.noEndTreatment ? BIT_BY_POS(6) : 0 ); + payload.alarmsFlags |= ( almStatus.noNewTreatment ? BIT_BY_POS(6) : 0 ); payload.alarmsFlags |= ( almStatus.bypassDialyzer ? BIT_BY_POS(7) : 0 ); + payload.alarmsFlags |= ( almStatus.alarmsToEscalate ? BIT_BY_POS(8) : 0 ); + payload.alarmsFlags |= ( almStatus.alarmsSilenced ? BIT_BY_POS(9) : 0 ); memcpy( payloadPtr, &payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );