Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r4b22b45e775c0525bc1d76e83e265af91a59785e -rcc511a2e779106c4fda8305c25bd1f9d9fbf06ce --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 4b22b45e775c0525bc1d76e83e265af91a59785e) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision cc511a2e779106c4fda8305c25bd1f9d9fbf06ce) @@ -41,8 +41,8 @@ FPGA_STATE_RCV_HEADER, ///< Receive header state for the FPGA. FPGA_STATE_WRITE_ALL_ACTUATORS, ///< Write actuators command state for the FPGA. FPGA_STATE_RCV_ALL_SENSORS, ///< Receive sensors state for the FPGA. - FPGA_STATE_READ_ALL_SENSORS2, ///< Read async sensors state for the FPGA. - FPGA_STATE_RCV_ALL_SENSORS2, ///< Receive async sensors state for the FPGA. + FPGA_STATE_READ_ALL_SENSORS_ASYNC, ///< Read async sensors state for the FPGA. + FPGA_STATE_RCV_ALL_SENSORS_ASYNC, ///< Receive async sensors state for the FPGA. FPGA_STATE_FAILED, ///< Failed state for the FPGA. NUM_OF_FPGA_STATES ///< Number of FPGA states. } FPGA_STATE_T; @@ -168,7 +168,7 @@ F32 dialysateInFlowAccFlow; ///< Reg 552. Dialysate inlet flow accumulated flow. F32 dialysateInFlowSignalStrength; ///< Reg 556. Dialysate inlet flow signal strength. U16 fpgaVAux5Voltage; ///< Reg 560. Aux. voltage 5. -} FPGA_SENSORS2_T; +} FPGA_SENSORS_ASYNC_T; #pragma pack(pop) // ********** private data ********** @@ -198,10 +198,10 @@ static g_dmaCTRL fpgaDMAReadRespControlRecord; ///< DMA record for controlling a DMA read command reception to buffer. // FPGA data -static FPGA_HEADER_T fpgaHeader; ///< Record of last received FPGA header data. -static FPGA_SENSORS_T fpgaSensorReadings; ///< Record of last received FPGA priority sensor data. -static FPGA_ACTUATORS_T fpgaActuatorSetPoints; ///< Record of next transmitted FPGA priority actuator data. -static FPGA_SENSORS2_T fpgaSensorReadings2; ///< Record of last received async (as needed) FPGA sensor data. +static FPGA_HEADER_T fpgaHeader; ///< Record of last received FPGA header data. +static FPGA_SENSORS_T fpgaSensorReadings; ///< Record of last received FPGA priority sensor data. +static FPGA_ACTUATORS_T fpgaActuatorSetPoints; ///< Record of next transmitted FPGA priority actuator data. +static FPGA_SENSORS_ASYNC_T fpgaSensorReadingsAsync; ///< Record of last received async (as needed) FPGA sensor data. // ********** private function prototypes ********** @@ -210,8 +210,8 @@ static FPGA_STATE_T handleFPGAWriteAllActuatorsState( void ); static FPGA_STATE_T handleFPGAReceiveAllSensorsState( void ); #ifdef READ_FPGA_ASYNC_DATA -static FPGA_STATE_T handleFPGAReceiveAllSensors2State( void ); -static FPGA_STATE_T handleFPGAReadAllSensors2State( void ); +static FPGA_STATE_T handleFPGAReceiveAllSensorsAsyncState( void ); +static FPGA_STATE_T handleFPGAReadAllSensorsAsyncState( void ); #endif static void resetFPGACommFlags( void ); @@ -433,8 +433,8 @@ break; #ifdef READ_FPGA_ASYNC_DATA - case FPGA_STATE_RCV_ALL_SENSORS2: - fpgaState = handleFPGAReceiveAllSensors2State(); + case FPGA_STATE_RCV_ALL_SENSORS_ASYNC: + fpgaState = handleFPGAReceiveAllSensorsAsyncState(); break; #endif @@ -492,8 +492,8 @@ break; #ifdef READ_FPGA_ASYNC_DATA - case FPGA_STATE_READ_ALL_SENSORS2: - fpgaState = handleFPGAReadAllSensors2State(); + case FPGA_STATE_READ_ALL_SENSORS_ASYNC: + fpgaState = handleFPGAReadAllSensorsAsyncState(); break; #endif @@ -681,7 +681,7 @@ #ifndef READ_FPGA_ASYNC_DATA result = FPGA_STATE_WRITE_ALL_ACTUATORS; #else - result = FPGA_STATE_READ_ALL_SENSORS2; + result = FPGA_STATE_READ_ALL_SENSORS_ASYNC; #endif } else // bad CRC @@ -708,29 +708,29 @@ #ifdef READ_FPGA_ASYNC_DATA /*********************************************************************//** * @brief - * The handleFPGAReadAllSensors2State function handles the FPGA state where \n + * The handleFPGAReadAllSensorsAsyncState function handles the FPGA state where \n * the read async sensors command is sent to the FPGA. * @details * Inputs : none * Outputs : read async sensors command sent to FPGA * @return next FPGA state *************************************************************************/ -static FPGA_STATE_T handleFPGAReadAllSensors2State( void ) +static FPGA_STATE_T handleFPGAReadAllSensorsAsyncState( void ) { - FPGA_STATE_T result = FPGA_STATE_RCV_ALL_SENSORS2; + FPGA_STATE_T result = FPGA_STATE_RCV_ALL_SENSORS_ASYNC; U16 crc; // construct read command to read low priority async registers starting at address 0x200 fpgaReadCmdBuffer[ 0 ] = FPGA_READ_CMD_CODE; fpgaReadCmdBuffer[ 1 ] = GET_LSB_OF_WORD( FPGA_BULK_ASYNC_READ_START_ADDR ); fpgaReadCmdBuffer[ 2 ] = GET_MSB_OF_WORD( FPGA_BULK_ASYNC_READ_START_ADDR ); - fpgaReadCmdBuffer[ 3 ] = sizeof(FPGA_SENSORS2_T); + fpgaReadCmdBuffer[ 3 ] = sizeof(FPGA_SENSORS_ASYNC_T); crc = crc16( fpgaReadCmdBuffer, FPGA_READ_CMD_HDR_LEN ); fpgaReadCmdBuffer[ 4 ] = GET_MSB_OF_WORD( crc ); fpgaReadCmdBuffer[ 5 ] = GET_LSB_OF_WORD( crc ); // prep DMA for sending the read cmd and receiving the response fpgaReadCommandInProgress = TRUE; - setupDMAForReadResp( FPGA_READ_RSP_HDR_LEN + sizeof(FPGA_SENSORS2_T) + FPGA_CRC_LEN ); + setupDMAForReadResp( FPGA_READ_RSP_HDR_LEN + sizeof(FPGA_SENSORS_ASYNC_T) + FPGA_CRC_LEN ); setupDMAForReadCmd( FPGA_READ_CMD_HDR_LEN + FPGA_CRC_LEN ); startDMAReceiptOfReadResp(); startDMAReadCmd(); @@ -740,24 +740,24 @@ /*********************************************************************//** * @brief - * The handleFPGAReceiveAllSensors2State function handles the FPGA state \n + * The handleFPGAReceiveAllSensorsAsyncState function handles the FPGA state \n * where the bulk async read response should be ready to parse. * @details * Inputs : none * Outputs : async sensor values updated * @return next FPGA state *************************************************************************/ -static FPGA_STATE_T handleFPGAReceiveAllSensors2State( void ) +static FPGA_STATE_T handleFPGAReceiveAllSensorsAsyncState( void ) { - FPGA_STATE_T result = FPGA_STATE_READ_ALL_SENSORS2; + FPGA_STATE_T result = FPGA_STATE_READ_ALL_SENSORS_ASYNC; // if bulk read command is ACK'd, collect the readings if ( TRUE == fpgaReadCommandResponseReceived ) { // did FPGA Ack the read command? if ( fpgaReadResponseBuffer[ 0 ] == FPGA_READ_CMD_ACK ) { - U32 rspSize = FPGA_READ_RSP_HDR_LEN + sizeof(FPGA_SENSORS2_T); + U32 rspSize = FPGA_READ_RSP_HDR_LEN + sizeof(FPGA_SENSORS_ASYNC_T); U32 crcPos = rspSize; U16 crc = MAKE_WORD_OF_BYTES( fpgaReadResponseBuffer[ crcPos ], fpgaReadResponseBuffer[ crcPos + 1 ] ); @@ -766,7 +766,7 @@ { fpgaCommRetryCount = 0; // capture the read values - memcpy( &fpgaSensorReadings2, &fpgaReadResponseBuffer[ FPGA_READ_RSP_HDR_LEN ], sizeof( FPGA_SENSORS2_T ) ); + memcpy( &fpgaSensorReadingsAsync, &fpgaReadResponseBuffer[ FPGA_READ_RSP_HDR_LEN ], sizeof( FPGA_SENSORS_ASYNC_T ) ); result = FPGA_STATE_WRITE_ALL_ACTUATORS; } else // bad CRC @@ -1017,7 +1017,7 @@ *************************************************************************/ F32 getFPGABloodFlowSignalStrength( void ) { - return fpgaSensorReadings2.bloodFlowSignalStrength; + return fpgaSensorReadingsAsync.bloodFlowSignalStrength; } /*********************************************************************//** @@ -1031,7 +1031,7 @@ *************************************************************************/ F32 getFPGADialysateFlowSignalStrength( void ) { - return fpgaSensorReadings2.dialysateInFlowSignalStrength; + return fpgaSensorReadingsAsync.dialysateInFlowSignalStrength; } #endif