Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r4c8fb9738f785e8c786e8323d7327aa11d18ceb9 -r2ef6269801df1d8323d807c4e56d39e129c8ad4b --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 4c8fb9738f785e8c786e8323d7327aa11d18ceb9) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 2ef6269801df1d8323d807c4e56d39e129c8ad4b) @@ -934,7 +934,7 @@ handleAlarmCleared( message ); break; - case MSG_ID_UI_ALARM_USER_ACTION: + case MSG_ID_UI_ALARM_USER_ACTION_REQUEST: handleAlarmUserAction( message ); break; @@ -1003,7 +1003,7 @@ handleDGReservoirData( message ); break; - case MSG_ID_USER_REQUEST_ALARM_SILENCE: + case MSG_ID_USER_ALARM_SILENCE_REQUEST: handleUIAlarmSilenceRequest( message ); break; @@ -1043,7 +1043,7 @@ handleSampleWaterResult( message ); break; - case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM: + case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST: handleConsumableInstallConfirm( message ); break; @@ -1067,7 +1067,7 @@ handleStartTreatmentRequest( message ); break; - case MSG_ID_UI_RINSEBACK_CMD: + case MSG_ID_UI_RINSEBACK_CMD_REQUEST: handlRinsebackCmd( message ); break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rea731c287a4e43901956aaa9a0009a5ee8f4671f -r2ef6269801df1d8323d807c4e56d39e129c8ad4b --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision ea731c287a4e43901956aaa9a0009a5ee8f4671f) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2ef6269801df1d8323d807c4e56d39e129c8ad4b) @@ -697,14 +697,13 @@ BOOL sendTreatmentPeriodicDataToUI( TREATMENT_LOG_DATA_PERIODIC_T * periodDataPtr ) { MESSAGE_T msg; - U08 *payloadPtr = msg.payload; // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA; msg.hdr.payloadLen = sizeof( TREATMENT_LOG_DATA_PERIODIC_T ); - memcpy( payloadPtr, periodDataPtr, sizeof( TREATMENT_LOG_DATA_PERIODIC_T ) ); + memcpy( &msg.payload, periodDataPtr, sizeof( TREATMENT_LOG_DATA_PERIODIC_T ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer return serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED ); @@ -1745,7 +1744,7 @@ // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_DG_START_STOP_HEAT_DISINFECT; + msg.hdr.msgID = MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD; msg.hdr.payloadLen = sizeof( BOOL ); memcpy( msg.payload, &start, sizeof( BOOL ) );