Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rc12bff518c0b58065eede15469ad8a2a6f6e317b -re7f256098e5c23cc621af73b17160a247d40559c --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision c12bff518c0b58065eede15469ad8a2a6f6e317b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision e7f256098e5c23cc621af73b17160a247d40559c) @@ -144,12 +144,12 @@ U16 fpgaValveStates; U08 fpgaID; U08 fpgaRev; - U08 fpgaADC1Control; - U08 fpgaDiag; - U08 fpgaADC2Control; - U08 fpgaRTDControl; - U08 fpgaTHDoControl; - U08 fpgaTDiControl; + //U08 fpgaADC1Control; + //U08 fpgaDiag; + //U08 fpgaADC2Control; + //U08 fpgaRTDControl; + //U08 fpgaTHDoControl; + //U08 fpgaTDiControl; } FPGA_ACTUATORS_T; #pragma pack(pop) @@ -218,6 +218,7 @@ memset( &fpgaHeader, 0, sizeof(FPGA_HEADER_T) ); memset( &fpgaSensorReadings, 0, sizeof(DG_FPGA_SENSORS_T) ); memset( &fpgaActuatorSetPoints, 0, sizeof(FPGA_ACTUATORS_T) ); + fpgaActuatorSetPoints.fpgaValveStates = 0x015F; // TODO - temporary init per Blaine while testing - remove later. // initialize fpga comm buffers memset( &fpgaWriteCmdBuffer, 0, FPGA_WRITE_CMD_BUFFER_LEN ); @@ -1089,7 +1090,7 @@ *************************************************************************/ U32 getFPGATPiTemp( void ) { - return ( fpgaSensorReadings.fpgaTPiTemp & MASK_OFF_U32_MSB ); + return fpgaSensorReadings.fpgaTPiTemp; } /*********************************************************************//** @@ -1104,7 +1105,7 @@ *************************************************************************/ U32 getFPGATPoTemp( void ) { - return ( fpgaSensorReadings.fpgaTPoTemp & MASK_OFF_U32_MSB ); + return fpgaSensorReadings.fpgaTPoTemp; } /*********************************************************************//** @@ -1119,7 +1120,7 @@ *************************************************************************/ U32 getFPGACD1Temp( void ) { - return ( fpgaSensorReadings.fpgaCD1Temp & MASK_OFF_U32_MSB ); + return fpgaSensorReadings.fpgaCD1Temp; } /*********************************************************************//** @@ -1134,7 +1135,7 @@ *************************************************************************/ U32 getFPGACD2Temp( void ) { - return ( fpgaSensorReadings.fpgaCD2Temp & MASK_OFF_U32_MSB ); + return fpgaSensorReadings.fpgaCD2Temp; } /*********************************************************************//** @@ -1179,7 +1180,7 @@ *************************************************************************/ U32 getFPGATHDoTemp( void ) { - return ( fpgaSensorReadings.fpgaTHDoTemp & MASK_OFF_U32_MSB ); + return fpgaSensorReadings.fpgaTHDoTemp; } /*********************************************************************//** @@ -1223,7 +1224,7 @@ *************************************************************************/ U32 getFPGATDiTemp( void ) { - return ( fpgaSensorReadings.fpgaTDiTemp & MASK_OFF_U32_MSB ); + return fpgaSensorReadings.fpgaTDiTemp; } /*********************************************************************//** @@ -1296,7 +1297,7 @@ * @param none * @return Last primary heater internal temperature sensor read count *************************************************************************/ -U08 geetFPGAPrimaryHeaterReadCount( void ) +U08 getFPGAPrimaryHeaterReadCount( void ) { return fpgaSensorReadings.fpgaPrimaryHeaterReadCnt; }