Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad -ra990118f3679c55206a9b6ba231aab6631c1ad8b --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision a990118f3679c55206a9b6ba231aab6631c1ad8b) @@ -87,7 +87,8 @@ /// FGPA Toggle to RPM conversion coefficient static const F32 TOGGLE_PERIOD_2_RPM_COEFFICIENT = SEC_PER_MIN / ( TOGGLE_PERIOD_RESOLUTION_SECONDS * ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION ); -static OVERRIDE_U32_T fansPublishInterval = { FANS_DATA_PUBLISH_INTERVAL, FANS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Fans publish time interval override +static OVERRIDE_U32_T fansPublishInterval = { FANS_DATA_PUBLISH_INTERVAL, + FANS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Fans publish time interval override static FANS_EXEC_STATES_T handleExecStateWaitForPOST( void ); static FANS_EXEC_STATES_T handleExecStateRun( void ); @@ -521,13 +522,14 @@ { if ( ++fansPublishCounter > getPublishFansDataInterval() ) { - FANS_DATA_T fansData; + FANS_DATA_T data; - fansData.fansDutyCycle = fansStatus.targetDutyCycle * FRACTION_TO_PERCENT_FACTOR; - fansData.fansTargetRPM = fansStatus.targetRPM; - fansData.fanInlet1RPM = getMeasuredFanRPM( FAN_INLET_1 ); + data.fansDutyCycle = fansStatus.targetDutyCycle * FRACTION_TO_PERCENT_FACTOR; + data.fansTargetRPM = fansStatus.targetRPM; + data.fanInlet1RPM = getMeasuredFanRPM( FAN_INLET_1 ); + data.rpmAlarmTimeOffset = getRPMAlarmStartTimeOffset(); - broadcastData( MSG_ID_HD_FANS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&fansData, sizeof( FANS_DATA_T ) ); + broadcastData( MSG_ID_HD_FANS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( FANS_DATA_T ) ); fansPublishCounter = 0; } @@ -653,11 +655,10 @@ if ( TRUE == isTestingActivated() ) { - rpmAlarmStartTimeOffset.ovData = ( ( hours * MIN_PER_HOUR * SEC_PER_MIN ) + ( minutes * SEC_PER_MIN ) ) * MS_PER_SECOND; + rpmAlarmStartTimeOffset.ovData = rpmAlarmStartTimeOffset.ovData + ( ( hours * MIN_PER_HOUR * SEC_PER_MIN ) + ( minutes * SEC_PER_MIN ) ) * MS_PER_SECOND; rpmAlarmStartTimeOffset.override = OVERRIDE_KEY; result = TRUE; - } return result;