Index: firmware/App/Controllers/Fans.h =================================================================== diff -u -r27d91d88b73aa4194cef1d3b08decc12ccdecc33 -r0b17c6271cdc3c55697a74ecaadb477d9c8f5687 --- firmware/App/Controllers/Fans.h (.../Fans.h) (revision 27d91d88b73aa4194cef1d3b08decc12ccdecc33) +++ firmware/App/Controllers/Fans.h (.../Fans.h) (revision 0b17c6271cdc3c55697a74ecaadb477d9c8f5687) @@ -13,7 +13,7 @@ */ /// Fans names -typedef enum fans_Name +typedef enum DG_fans { FAN_INLET_1 = 0, ///< Fan inlet 1 FAN_INLET_2, ///< Fan inlet 2 @@ -22,12 +22,12 @@ FAN_OUTLET_2, ///< Fan outlet 2 FAN_OUTLET_3, ///< Fan outlet 3 NUM_OF_FANS_NAMES ///< Number of fans names -} FANS_NAMES_T; +} FAN_NAMES_T; /// Fans data publish typedef struct { - F32 fansTargetPWM; ///< Fans target PWM + F32 fansTargetDutyCycle; ///< Fans target duty cycle F32 fanInlet1RPM; ///< Fan inlet 1 RPM F32 fanInlet2RPM; ///< Fan inlet 2 RPM F32 fanInlet3RPM; ///< Fan inlet 3 RPM @@ -42,7 +42,7 @@ void execFans( void ); -F32 getFanRPM( FANS_NAMES_T fan ); +F32 getMeasuredFanRPM( FAN_NAMES_T fan ); BOOL testSetFanPublishIntervalOverride( U32 value ); BOOL testResetFanPublishIntervalOverride( void );