Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r6e8917e48113a8798b26e489296a3f69509c0590 -r47a7da55aea88cd7a2b06870226122d0cc8be540 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6e8917e48113a8798b26e489296a3f69509c0590) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 47a7da55aea88cd7a2b06870226122d0cc8be540) @@ -340,7 +340,6 @@ BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min, S32 timeDiff, F32 rateDiff, F32 oldUFRate_mL_min ) { BOOL result; - F32 volume_L = volume_mL / (F32)ML_PER_LITER; MESSAGE_T msg; U08 *payloadPtr = msg.payload; @@ -353,7 +352,7 @@ payloadPtr += sizeof( BOOL ); memcpy( payloadPtr, &reason, sizeof( U32) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &volume_L, sizeof( F32 ) ); + memcpy( payloadPtr, &volume_mL, sizeof( F32 ) ); payloadPtr += sizeof( F32 ); memcpy( payloadPtr, &time_min, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); @@ -389,7 +388,6 @@ BOOL sendChangeUFSettingsOptionResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min ) { BOOL result; - F32 volume_L = volume_mL / (F32)ML_PER_LITER; MESSAGE_T msg; U08 *payloadPtr = msg.payload; @@ -402,7 +400,7 @@ payloadPtr += sizeof( BOOL ); memcpy( payloadPtr, &reason, sizeof( U32) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &volume_L, sizeof( F32 ) ); + memcpy( payloadPtr, &volume_mL, sizeof( F32 ) ); payloadPtr += sizeof( F32 ); memcpy( payloadPtr, &time_min, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); @@ -431,7 +429,6 @@ BOOL sendChangeTreatmentDurationResponse( BOOL accepted, U32 reason, U32 time_min, F32 volume_mL ) { BOOL result; - F32 volume_L = volume_mL / (F32)ML_PER_LITER; MESSAGE_T msg; U08 *payloadPtr = msg.payload; @@ -446,7 +443,7 @@ payloadPtr += sizeof( U32 ); memcpy( payloadPtr, &time_min, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &volume_L, sizeof( F32 ) ); + memcpy( payloadPtr, &volume_mL, sizeof( F32 ) ); // 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_HD_2_UI, ACK_REQUIRED ); @@ -508,7 +505,7 @@ * @param maxDialRate : Maximum dialysate flow rate (in mL/min). * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, U32 minUFVol, U32 maxUFVol, U32 minDialRate, U32 maxDialRate ) +BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate ) { BOOL result; MESSAGE_T msg; @@ -517,16 +514,16 @@ // create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_TREATMENT_PARAM_CHANGE_RANGES; - msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ); + msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( F32 ) + sizeof( F32 ) + sizeof( U32 ) + sizeof( U32 ); memcpy( payloadPtr, &minTime, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); memcpy( payloadPtr, &maxTime, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &minUFVol, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &maxUFVol, sizeof( U32 ) ); - payloadPtr += sizeof( U32 ); + memcpy( payloadPtr, &minUFVol, sizeof( F32 ) ); + payloadPtr += sizeof( F32 ); + memcpy( payloadPtr, &maxUFVol, sizeof( F32 ) ); + payloadPtr += sizeof( F32 ); memcpy( payloadPtr, &minDialRate, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); memcpy( payloadPtr, &maxDialRate, sizeof( U32 ) );