Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r79e9be79f488da3a4aef5d755d359fff91a8db3e -r021e6ea5f99fd6da424d8ab81d6a106f2cb41294 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 79e9be79f488da3a4aef5d755d359fff91a8db3e) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 021e6ea5f99fd6da424d8ab81d6a106f2cb41294) @@ -156,8 +156,8 @@ U08 fpgaReserved1; ///< Reg 375. Reserved U16 fpgaValveStates; ///< Reg 376. Valves states - U16 fpgaFan1Pulse; ///< Reg 378. Fan 1 pulse time in 2.5 us solution - U16 fpgaFan2Pulse; ///< Reg 380. Fan 2 pulse time in 2.5 us solution + U16 fpgaFanIn1Pulse; ///< Reg 378. Fan inlet 1 pulse time in 2.5 us resolution + U16 fpgaFanOut1Pulse; ///< Reg 380. Fan outlet 1 pulse time in 2.5 us resolution U08 fpgaEmstatOutByte; ///< Reg 382. Emstat output FIFO - data from the Emstat device U08 fpgaEmstatRxErrorCount; ///< Reg 383. Number of receive errors since power-up @@ -169,6 +169,12 @@ U08 fpgaGPIOReg; ///< Reg 392. FGPA GPIO register U08 fpgaDummyByte2Addr; ///< Reg 393. Dummy byte address to maintain an even addressing scheme U16 fpgaADCTemp; ///< Reg 394. Internal FPGA die temperature ADC + + U16 fpgaFanIn2Pulse; ///< Reg 396. Fan inlet 2 pulse time in 2.5 resolution + U16 fpgaFanOut2Pulse; ///< Reg 398. Fan outlet 2 pulse time in 2.5 resolution + U16 fpgaFanIn3Pulse; ///< Reg 400. Fan inlet 3 pulse time in 2.5 resolution + U16 fpgaFanOut3Pulse; ///< Reg 402. Fan outlet 3 pulse time in 2.5 resolution + } DG_FPGA_SENSORS_T; typedef struct @@ -1594,7 +1600,7 @@ *************************************************************************/ U16 getFPGAInletFan1TogglePeriod( void ) { - return fpgaSensorReadings.fpgaFan1Pulse; + return fpgaSensorReadings.fpgaFanIn1Pulse; } /*********************************************************************//** @@ -1606,7 +1612,7 @@ *************************************************************************/ U16 getFPGAInletFan2TogglePeriod( void ) { - return fpgaSensorReadings.fpgaFan2Pulse; + return fpgaSensorReadings.fpgaFanIn2Pulse; } /*********************************************************************//** @@ -1618,7 +1624,7 @@ *************************************************************************/ U16 getFPGAInletFan3TogglePeriod( void ) { - return 0; + return fpgaSensorReadings.fpgaFanIn3Pulse; } /*********************************************************************//** @@ -1630,7 +1636,7 @@ *************************************************************************/ U16 getFPGAOutletFan1TogglePeriod( void ) { - return 0; + return fpgaSensorReadings.fpgaFanOut1Pulse; } /*********************************************************************//** @@ -1642,7 +1648,7 @@ *************************************************************************/ U16 getFPGAOutletFan2TogglePeriod( void ) { - return 0; + return fpgaSensorReadings.fpgaFanOut2Pulse; } /*********************************************************************//** @@ -1654,7 +1660,7 @@ *************************************************************************/ U16 getFPGAOutletFan3TogglePeriod( void ) { - return 0; + return fpgaSensorReadings.fpgaFanOut3Pulse; } /*********************************************************************//**