Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r051cd0430ef8342bd606115c98871e26dc24acf1 -r410afd26b3ae5e372310c696c82f58c59235e10d --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 410afd26b3ae5e372310c696c82f58c59235e10d) @@ -1,4 +1,5 @@ +#include #include // for memcpy() #include "Compatible.h" @@ -8,13 +9,12 @@ #include "FluidPump.h" #include "Level.h" #include "Messaging.h" -#include "ModeWaterGen.h" -#include "ModeWaterPreGen.h" +#include "ModeGenPermeate.h" #include "OperationModes.h" #include "PAL.h" #include "Pressure.h" #include "ROPump.h" -#include "SystemCommRO.h" +#include "SystemCommFP.h" #include "Temperature.h" #include "Utilities.h" #include "Valves.h" @@ -41,16 +41,16 @@ static const COMM_BUFFER_T tdResponseBuffers[ NUM_OF_COMM_BUFFERS ] = { COMM_BUFFER_NOT_USED, ///< CAN message boxes start at 1 so we will not use this buffer - COMM_BUFFER_OUT_CAN_RO_ALARM, ///< Buffer for responding to incoming TD alarm messages - COMM_BUFFER_OUT_CAN_RO_ALARM, ///< Buffer for responding to incoming DD alarm messages + COMM_BUFFER_OUT_CAN_FP_ALARM, ///< Buffer for responding to incoming TD alarm messages + COMM_BUFFER_OUT_CAN_FP_ALARM, ///< Buffer for responding to incoming DD alarm messages COMM_BUFFER_NOT_USED, ///< Buffer for outgoing RO alarm messages so no response buffer - COMM_BUFFER_OUT_CAN_RO_ALARM, ///< Buffer for responding to incoming UI alarm messages - COMM_BUFFER_OUT_CAN_RO_2_DD, ///< Buffer for responding to incoming DD to RO messages + COMM_BUFFER_OUT_CAN_FP_ALARM, ///< Buffer for responding to incoming UI alarm messages + COMM_BUFFER_OUT_CAN_FP_2_DD, ///< Buffer for responding to incoming DD to RO messages COMM_BUFFER_NOT_USED, ///< Buffer for outgoing RO to DD messages so no response buffer - COMM_BUFFER_OUT_CAN_RO_BROADCAST, ///< Buffer for responding to incoming TD broadcast messages - COMM_BUFFER_OUT_CAN_RO_BROADCAST, ///< Buffer for responding to incoming DD broadcast messages + COMM_BUFFER_OUT_CAN_FP_BROADCAST, ///< Buffer for responding to incoming TD broadcast messages + COMM_BUFFER_OUT_CAN_FP_BROADCAST, ///< Buffer for responding to incoming DD broadcast messages COMM_BUFFER_NOT_USED, ///< Buffer for outgoing RO broadcast messages so no response buffer - COMM_BUFFER_OUT_CAN_RO_BROADCAST, ///< Buffer for responding to incoming UI broadcast messages + COMM_BUFFER_OUT_CAN_FP_BROADCAST, ///< Buffer for responding to incoming UI broadcast messages COMM_BUFFER_OUT_CAN_PC, ///< Buffer for responding to incoming PC to RO messages COMM_BUFFER_NOT_USED, ///< Buffer for outgoing RO to PC messages so no response buffer }; @@ -94,7 +94,7 @@ { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST, &testConductivitySensorErrorCounterOverride }, { MSG_ID_FP_TEMPERATURE_OVERRIDE_REQUEST, &testMeasuredTemperatureOverride }, { MSG_ID_DD_FP_START_STOP_CMD_REQUEST, &handleGenerateWaterRequestMsg }, -{ MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPreGenWaterDataPublishIntervalOverride }, +{ MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPreGenDataPublishIntervalOverride }, { MSG_ID_FP_SET_OPERATION_MODE_REQUEST, &testSetOperationMode }, { MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testTemperatureSensorsDataPublishIntervalOverride }, }; @@ -222,7 +222,7 @@ msg.hdr.payloadLen = 0; // serialize and queue the message for transmit on broadcast channel - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_RO_BROADCAST, ACK_NOT_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_FP_BROADCAST, ACK_NOT_REQUIRED ); return result; } @@ -382,7 +382,7 @@ memset( payloadPtr, 0, sizeof( U32) * 3 ); // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_RO_ALARM, ACK_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_FP_ALARM, ACK_REQUIRED ); return result; } @@ -410,7 +410,7 @@ memcpy( payloadPtr, &alarm, sizeof( U32 ) ); // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_RO_ALARM, ACK_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_FP_ALARM, ACK_REQUIRED ); return result; } @@ -439,7 +439,7 @@ memcpy( payloadPtr, &alarm, sizeof( U32 ) ); // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_RO_ALARM, ACK_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_FP_ALARM, ACK_REQUIRED ); return result; } @@ -455,7 +455,7 @@ * @param dat2 Second data associated with event * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 ) +BOOL sendEvent( FP_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 ) { BOOL result; MESSAGE_T msg; @@ -475,7 +475,7 @@ memcpy( &msg.payload, &eventStruct, sizeof( EVENT_PAYLOAD_T ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_RO_BROADCAST, ACK_NOT_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_FP_BROADCAST, ACK_NOT_REQUIRED ); return result; }