Index: firmware/.launches/DG.launch
===================================================================
diff -u -r97e0100921ccad633b39b509a93a7237e4d80446 -ra003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8
--- firmware/.launches/DG.launch (.../DG.launch) (revision 97e0100921ccad633b39b509a93a7237e4d80446)
+++ firmware/.launches/DG.launch (.../DG.launch) (revision a003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8)
@@ -7,10 +7,18 @@
+
+
+
+
+
+
+
+
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r67021fbc633259e8e1bce76749dbef7d0cb51998 -ra003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8
--- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 67021fbc633259e8e1bce76749dbef7d0cb51998)
+++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision a003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8)
@@ -132,6 +132,8 @@
U08 getFPGAADC2ReadCount( void );
U08 getFPGAADC2ErrorCount( void );
+U16 getFPGATimerCount( void );
+
BOOL noFPGAFluidLeakDetected( void );
U16 getFPGATimerCount( void );
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3ca2e68a33885153648ba20346e3548438b58724 -ra003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8
--- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 3ca2e68a33885153648ba20346e3548438b58724)
+++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision a003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8)
@@ -249,14 +249,6 @@
{
canTransmit( canREG1, lastCANPacketSentChannel, lastCANPacketSent );
}
-#ifdef DEBUG_ENABLED
- {
- char debugStr[100];
- strcpy( debugStr, "SystemComm-DG resend Last Frame.\n" );
- sendDebugData( (U08*)debugStr, strlen(debugStr) );
- sendDebugDataToUI( (U08*)debugStr );
- }
-#endif
}
// we must be only node on CAN bus - nobody is ACKing our transmitted frames
else
@@ -265,11 +257,6 @@
canXmitRetryCtr = MAX_XMIT_RETRIES;
signalCANXmitsCompleted(); // clear pending xmit flag
clearCANXmitBuffers(); // clear xmit buffers - nothing is going out right now
-#ifdef DEBUG_ENABLED
- char debugStr[100];
- strcpy( debugStr, "SystemComm-DG is only node.\n" );
- sendDebugData( (U08*)debugStr, strlen(debugStr) );
-#endif
} // end - are we retrying xmit or are we alone on CAN bus
} // end - pending xmit timeout?
} // end - transmit in progress or not
@@ -857,14 +844,6 @@
{
SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, 2 ); // 2 for DG
}
-#ifdef DEBUG_ENABLED
- {
- char debugStr[100];
-
- strcpy( debugStr, "SystemComm-DG-Bad Msg CRC.\n" );
- sendDebugDataToUI( (U08*)debugStr );
- }
-#endif
}
/*********************************************************************//**
@@ -1054,6 +1033,10 @@
handleUIClockSyncRequest( message );
break;
+ case MSG_ID_HD_DG_POST_RESULT_REQUEST:
+ handleDGPOSTResultRequest( message );
+ break;
+
case MSG_ID_UI_REQUEST_SERVICE_INFO:
handleDGServiceScheduleRequest( message );
break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3ca2e68a33885153648ba20346e3548438b58724 -ra003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8
--- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 3ca2e68a33885153648ba20346e3548438b58724)
+++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision a003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8)
@@ -3235,6 +3235,40 @@
/*********************************************************************//**
* @brief
+* The handleDGPOSTResultRequest function handles a request to report DG
+* POST results.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleDGPOSTResultRequest( MESSAGE_T *message )
+{
+ BOOL status = FALSE;
+ BOOL result = FALSE;
+ U08* payloadPtr = message->payload;
+
+ if ( 0 == message->hdr.payloadLen )
+ {
+ if ( TRUE == isPOSTCompleted() )
+ {
+ status = TRUE;
+ if ( TRUE == isPOSTPassed() )
+ {
+ result = TRUE;
+ }
+ sendPOSTFinalResult( result );
+ }
+ }
+ // If can't respond to request, NAK the message
+ if ( status != TRUE )
+ {
+ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
+ }
+}
+
+/*********************************************************************//**
+* @brief
* The handleSetDGCalibrationRecord function handles a request to set the DG
* calibration data record.
* @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r3ca2e68a33885153648ba20346e3548438b58724 -ra003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8
--- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 3ca2e68a33885153648ba20346e3548438b58724)
+++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a003e4d7bf7f3b72f55bbed6d6d8c6ac15a85cb8)
@@ -354,6 +354,9 @@
// MSG_ID_UI_DG_SET_RTC_REQUEST
void handleUIClockSyncRequest( MESSAGE_T *message );
+// MSG_ID_HD_DG_POST_RESULT_REQUEST
+void handleDGPOSTResultRequest( MESSAGE_T *message );
+
// MSG_ID_DG_SET_CALIBRATION_DATA
void handleSetDGCalibrationRecord( MESSAGE_T *message );