Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -r36923cf573ee2ae49ddaaf001068934c6bf88c6c --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c) @@ -78,8 +78,8 @@ static U32 fansPublishCounter; ///< Fans data publish interval counter. static BOOL isPOSTComplete; ///< Flag that indicates whether POST is complete or not. static BOOL hasAlarmBeenRaised; ///< Flag that indicates whether RPM out of range alarm has been raised once. -static OVERRIDE_U32_T rpmAlarmStartTimeOffset = { 0, 0, 0, 0}; ///< RPM out of range alarm start time offset. -static U32 rpmAlarmStartTime; ///< RPM alarm start time. +static U32 rpmAlarmStartTimeOffset; ///< RPM out of range alarm start time offset. +static S32 rpmAlarmStartTime; ///< RPM alarm start time. /// Temperature to duty cycle conversion slope (duty cycle not in percent) static const F32 SLOPE = ( FANS_MAX_DUTY_CYCLE - FANS_MIN_DUTY_CYCLE ) / ( MAX_ALLOWED_AMBINET_TEMPERATURE - MIN_ALLOWED_AMBIENT_TEMPERATURE ); @@ -115,21 +115,18 @@ FAN_NAMES_T fan; // Initialize the variables - fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; - fansControlCounter = 0; - fansPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT; - isPOSTComplete = FALSE; - hasAlarmBeenRaised = FALSE; - rpmAlarmStartTime = 0; - rpmAlarmStartTimeOffset.data = 0; - rpmAlarmStartTimeOffset.ovData = 0; - rpmAlarmStartTimeOffset.ovInitData = 0; - rpmAlarmStartTimeOffset.override = 0; - fansStatus.dutyCycle.data = 0.0; - fansStatus.dutyCycle.ovInitData = 0.0; - fansStatus.dutyCycle.ovData = 0.0; - fansStatus.dutyCycle.override = OVERRIDE_RESET; - fansStatus.targetRPM = 0.0; + fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; + fansControlCounter = 0; + fansPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT; + isPOSTComplete = FALSE; + hasAlarmBeenRaised = FALSE; + rpmAlarmStartTime = 0; + rpmAlarmStartTimeOffset = 0; + fansStatus.dutyCycle.data = 0.0; + fansStatus.dutyCycle.ovInitData = 0.0; + fansStatus.dutyCycle.ovData = 0.0; + fansStatus.dutyCycle.override = OVERRIDE_RESET; + fansStatus.targetRPM = 0.0; // Initialize the fans for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ ) @@ -460,18 +457,13 @@ // and remain silent for a defined period of time. else { - // Get the offset time since the last alarm. If the offset time has been overridden, then do not include the time that the alarm was raised first. - // Overrides are used to verify the code so what is sent to the firmware from override is intended to be the actual time so check whether the alarm is - // raised properly or not. Adding the start time of the alarm might cause inaccuracy in the verification process. - // For instance, if 86390 seconds is overridden to make sure the alarm is not raise before 24 hours or 86400, if the rpmAlarmStartTime is added to it - // it might make the time to be greater than 86400 seconds and therefore the alarm is raised again while it is not expected. - U32 offsetTime = getRPMAlarmStartTimeOffset(); - U32 elapsedTime = ( OVERRIDE_KEY == rpmAlarmStartTimeOffset.override ? offsetTime : calcTimeSince( rpmAlarmStartTime ) + offsetTime ); + S32 elapsedTime = rpmAlarmStartTime - rpmAlarmStartTimeOffset; - if ( elapsedTime >= SECONDS_IN_A_DAY * MS_PER_SECOND ) + if ( calcTimeSince( elapsedTime ) >= SECONDS_IN_A_DAY * MS_PER_SECOND ) { - hasAlarmBeenRaised = FALSE; - rpmAlarmStartTime = 0; + hasAlarmBeenRaised = FALSE; + rpmAlarmStartTime = 0; + rpmAlarmStartTimeOffset = 0; } } } @@ -485,14 +477,14 @@ *************************************************************************/ static U32 getRPMAlarmStartTimeOffset( void ) { - U32 startTime = rpmAlarmStartTimeOffset.data; + /*U32 startTime = rpmAlarmStartTimeOffset.data; if ( OVERRIDE_KEY == rpmAlarmStartTimeOffset.override ) { startTime = rpmAlarmStartTimeOffset.ovData; } - return startTime; + return startTime;*/ } /*********************************************************************//** @@ -531,7 +523,7 @@ data.fansDutyCycle = ( OVERRIDE_RESET == fansStatus.dutyCycle.override ? fansStatus.dutyCycle.data : fansStatus.dutyCycle.ovData ) * FRACTION_TO_PERCENT_FACTOR; data.fansTargetRPM = fansStatus.targetRPM; data.fanInlet1RPM = getMeasuredFanRPM( FAN_INLET_1 ); - data.rpmAlarmTimeOffset = getRPMAlarmStartTimeOffset(); + data.rpmAlarmTimeOffset = rpmAlarmStartTimeOffset; broadcastData( MSG_ID_HD_FANS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( FANS_DATA_T ) ); @@ -645,54 +637,27 @@ /*********************************************************************//** * @brief - * The testSetFanRPMAlarmStartTimeOffsetOverride function overrides the RPM alarm - * start time offset. + * The testSetFanRPMAlarmStartTimestamp function set the fan RPM alarm start + * time offset. * @details Inputs: none * @details Outputs: rpmAlarmStartTimeOffset - * @param seconds seconds to override + * @param seconds the seconds the time to be offset * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetFanRPMAlarmStartTimeOffsetOverride( U32 seconds ) +BOOL testSetFanRPMAlarmStartTimestamp( U32 seconds ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { - rpmAlarmStartTimeOffset.ovData = seconds * MS_PER_SECOND; - rpmAlarmStartTimeOffset.override = OVERRIDE_KEY; - - result = TRUE; + rpmAlarmStartTimeOffset = seconds * MS_PER_SECOND; } return result; } /*********************************************************************//** * @brief - * The testResetFanRPMAlarmStartTimeOffsetOverride function resets the RPM alarm - * start time offset override. - * @details Inputs: none - * @details Outputs: rpmAlarmStartTimeOffset - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testResetFanRPMAlarmStartTimeOffsetOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - rpmAlarmStartTimeOffset.override = OVERRIDE_RESET; - rpmAlarmStartTimeOffset.ovData = 0; - rpmAlarmStartTimeOffset.data = 0; - - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief * The testSetFansDutyCycleOverride function overrides fans duty cycle * @details Inputs: none * @details Outputs: fansStatus Index: firmware/App/Controllers/Fans.h =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r36923cf573ee2ae49ddaaf001068934c6bf88c6c --- firmware/App/Controllers/Fans.h (.../Fans.h) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Controllers/Fans.h (.../Fans.h) (revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c) @@ -52,15 +52,14 @@ F32 getMeasuredFanRPM( FAN_NAMES_T fan ); +BOOL testSetFanRPMAlarmStartTimestamp( U32 seconds ); + BOOL testSetFanPublishIntervalOverride( U32 value ); BOOL testResetFanPublishIntervalOverride( void ); BOOL testSetFanRPMOverride( U32 fanId, F32 rpm ); BOOL testResetFanRPMOverride( U32 fanId ); -BOOL testSetFanRPMAlarmStartTimeOffsetOverride( U32 seconds ); -BOOL testResetFanRPMAlarmStartTimeOffsetOverride( void ); - BOOL testSetFansDutyCycleOverride( F32 value ); BOOL testResetFansDutyCycleOverride( void ); Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r36923cf573ee2ae49ddaaf001068934c6bf88c6c --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c) @@ -1610,8 +1610,9 @@ handleTestSyringePumpForceSensorCalibrateRequest( message ); break; - case MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE: - handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message ); + case MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET: + handleTestFansRPMAlarmStartTimeOffsetRequest( message ); + break; case MSG_ID_HD_SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE: handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r3db5538afb80bc12822304d698343e0325fa708e -r36923cf573ee2ae49ddaaf001068934c6bf88c6c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 3db5538afb80bc12822304d698343e0325fa708e) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c) @@ -6798,39 +6798,6 @@ /*********************************************************************//** * @brief - * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a - * request to override the fan RPM alarm start time. - * @details Inputs: none - * @details Outputs: message handled - * @param message a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // verify payload length - if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); - - if ( FALSE == payload.reset ) - { - result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 ); - } - else - { - result = testResetFanRPMAlarmStartTimeOffsetOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** - * @brief * The handleSetFansDutyCycleOverrideRequest function handles a * request to override the fans duty cycle. * @details Inputs: none @@ -6908,6 +6875,33 @@ /*********************************************************************//** * @brief + * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a + * request to set the fans RPM alarm start time offset. + * @details Inputs: none + * @details Outputs: message handled + * @param message : a pointer to the message to handle + * @return none + *************************************************************************/ +void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message ) +{ + U32 rpmTimeOffset; + + BOOL result = FALSE; + + // Verify payload length + if ( sizeof(U32) == message->hdr.payloadLen ) + { + memcpy( &rpmTimeOffset, message->payload, sizeof(U32) ); + + result = testSetFanRPMAlarmStartTimestamp( rpmTimeOffset ); + } + + // Respond to request + sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); +} + +/*********************************************************************//** + * @brief * The sendHDSWConfigRecord function sends out the HD software configuration record. * @details Inputs: none * @details Outputs: HD software configuration record msg constructed and queued Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r36923cf573ee2ae49ddaaf001068934c6bf88c6c --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c) @@ -419,6 +419,7 @@ // MSG_ID_HD_SET_SW_CONFIG_RECORD void handleSetHDSoftwareConfigRecord( MESSAGE_T *message ); + #ifdef EMC_TEST_BUILD // MSG_ID_CAN_ERROR_COUNT BOOL broadcastCANErrorCount( U32 count ); @@ -774,9 +775,6 @@ // MSG_ID_HD_STOP_RTC_CLOCK void handleStopHDRTCClock( MESSAGE_T *message ); -// MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OVERRIDE -void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message ); - // MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message ); @@ -786,6 +784,9 @@ // MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params); +// MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET +void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message ); + /**@}*/ #endif