Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r94895e32fe18e78b98fe3bb7786838cf00afdbfa -r054fa08b67ed2a31f7848b179fbcd1b4da501b0f
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 94895e32fe18e78b98fe3bb7786838cf00afdbfa)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 054fa08b67ed2a31f7848b179fbcd1b4da501b0f)
@@ -103,15 +103,12 @@
 static U32 lastCANPacketSentTimeStamp = 0;
 
 #ifdef DEBUG_ENABLED
-    static U08 pcXmitPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    static U08 pcXmitPacket[ 1024 ];
     static U08 pcRecvPacket[ PC_MESSAGE_PACKET_SIZE ] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
     // DMA control records
     static g_dmaCTRL pcDMAXmitControlRecord;                // DMA transmit control record (UART-debug)
     static g_dmaCTRL pcDMARecvControlRecord;                // DMA receive control record (UART-debug)
-
-    //static U08 dbgRcvFromDialin[2048];
-    //static U32 dbgRcvFromDialinIdx = 0;
 #endif
 
 static PENDING_ACK_RECORD_T pendingAckList[ PENDING_ACK_LIST_SIZE ];    // list of outgoing messages that are awaiting an ACK
@@ -364,13 +361,6 @@
             // if packet retrieved, add to buffer
             if ( result != 0 )
             {
-//#ifdef DEBUG_ENABLED
-//                if ( srcCANBox == COMM_BUFFER_IN_CAN_PC )
-//                {
-//                    memcpy( &dbgRcvFromDialin[dbgRcvFromDialinIdx], data, CAN_MESSAGE_PAYLOAD_SIZE);
-//                    dbgRcvFromDialinIdx += CAN_MESSAGE_PAYLOAD_SIZE;
-//                }
-//#endif
                 // add CAN packet to appropriate comm buffer based on the message box it came in on (s/b same #)
                 addToCommBuffer( srcCANBox, data, CAN_MESSAGE_PAYLOAD_SIZE );
             }
@@ -379,7 +369,7 @@
     else
     {
         // shouldn't get here - not an active message box
-        // s/w fault?
+        // TODO - s/w fault?
     }
 }
 
@@ -649,20 +639,19 @@
 {
     U32 result = 0;
     U32 dataPend = numberOfBytesInCommBuffer( COMM_BUFFER_OUT_UART_PC );
-    U32 dataSize;
 
-    if ( dataPend >= PC_MESSAGE_PACKET_SIZE )
+    if ( dataPend > 0 )
     {
-        dataSize = getFromCommBuffer( COMM_BUFFER_OUT_UART_PC, pcXmitPacket, PC_MESSAGE_PACKET_SIZE );
+        result = getFromCommBuffer( COMM_BUFFER_OUT_UART_PC, pcXmitPacket, dataPend );
 
-        // if there's another UART packet to send, send it
-        if ( dataSize == PC_MESSAGE_PACKET_SIZE )
+        // if there's data to transmit, transmit it
+        if ( result > 0 )
         {
             signalSCI1XmitsInitiated();
+            pcDMAXmitControlRecord.FRCNT = result;  // set DMA transfer size
             dmaSetCtrlPacket( DMA_CH3, pcDMAXmitControlRecord );
             dmaSetChEnable( DMA_CH3, DMA_HW );
             setSCI1DMATransmitInterrupt();
-            result = PC_MESSAGE_PACKET_SIZE;
         }
     }
 
@@ -1124,6 +1113,10 @@
             handleChangeTreatmentDurationRequest( message );
             break;
 
+        case MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST:
+            handleChangeBloodDialysateRateChangeRequest( message );
+            break;
+
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;