Index: RTC.c =================================================================== diff -u -r7deab66e16200dd4b7c8214929fdb36fc6cb8a90 -r64ae00fa6e1df9850ace505b0c3cd9f1feffac64 --- RTC.c (.../RTC.c) (revision 7deab66e16200dd4b7c8214929fdb36fc6cb8a90) +++ RTC.c (.../RTC.c) (revision 64ae00fa6e1df9850ace505b0c3cd9f1feffac64) @@ -136,6 +136,8 @@ /// Number of seconds in 2 years. Assumes no leap year in 2 year period. static const U32 SECONDS_IN_2_YEARS = SECONDS_IN_NORMAL_YEAR * 2; +#define MIN_EPOCH_DATE ( 1689958503 ) ///< Epoch dates must be greater than 8/11/2023 + /// RTC self-test state enumeration. typedef enum RTC_Self_Test_States { @@ -1376,7 +1378,7 @@ broadcastData( MSG_ID_DG_RTC_EPOCH_DATA, COMM_BUFFER_OUT_CAN_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) ); #endif #ifdef _HD_ - broadcastData( MSG_ID_RTC_EPOCH_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) ); + broadcastData( MSG_ID_RTC_EPOCH_DATA, COMM_BUFFER_OUT_CAN_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) ); #endif } @@ -1410,26 +1412,25 @@ *************************************************************************/ static RTC_EXEC_STATE_T handleExecVerifyWriteState( void ) { - RTC_EXEC_STATE_T result = RTC_EXEC_STATE_VERIFY_WRITE; BOOL isStatusOk = serviceRTC( txBuffer, rxBuffer, RTC_GENERAL_BUFFER_LENGTH ); if ( ( RTC_SERVICE_COMPLETE == RTCServiceState ) && ( TRUE == isStatusOk ) ) { // Compare received buffer with what was transmitted - if ( 0 != memcmp( &writeSaveBuffer[1], &rxBuffer[1], ( RTC_GENERAL_BUFFER_LENGTH - 1 )* 2 ) ) + if ( 0 != memcmp( &writeSaveBuffer[1], &rxBuffer[1], ( RTC_GENERAL_BUFFER_LENGTH - 1 )* 2 ) ) { - memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer)); + memset( debugEventBuffer, 0x00, sizeof( debugEventBuffer ) ); snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC Verify: %02X:%02X, %02X:%02X, %02X:%02X, %02X:%02X", rxBuffer[0], writeSaveBuffer[0], rxBuffer[1], writeSaveBuffer[1], rxBuffer[2], writeSaveBuffer[2], rxBuffer[3], writeSaveBuffer[3] ); broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) ); - memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer)); + memset( debugEventBuffer, 0x00, sizeof (debugEventBuffer ) ); snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC Verify: %02X:%02X, %02X:%02X, %02X:%02X, %02X:%02X", rxBuffer[4], writeSaveBuffer[4], rxBuffer[5], writeSaveBuffer[5], rxBuffer[6], writeSaveBuffer[6], rxBuffer[7], writeSaveBuffer[7] ); broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) ); - memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer)); + memset( debugEventBuffer, 0x00, sizeof( debugEventBuffer ) ); snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC Verify: %02X:%02X, %02X:%02X, %02X:%02X", rxBuffer[8], writeSaveBuffer[8], rxBuffer[9], writeSaveBuffer[9], rxBuffer[10], writeSaveBuffer[10] ); broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) ); @@ -1815,16 +1816,16 @@ { BOOL result = TRUE; - memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer)); - snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC HD epoch check"); + memset( debugEventBuffer, 0x00, sizeof( debugEventBuffer ) ); + snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC HD epoch check" ); broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) ); - if ( epoch < 1689958503 ) + if ( epoch < MIN_EPOCH_DATE ) { result = FALSE; - memset(debugEventBuffer, 0x00, sizeof(debugEventBuffer)); - snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC HD epoch: %d", epoch); + memset( debugEventBuffer, 0x00, sizeof( debugEventBuffer ) ); + snprintf( debugEventBuffer, sizeof( debugEventBuffer ), "$RTC HD epoch: %d", epoch ); broadcastData( DEBUG_EVENT_MSG_ID, COMM_BUFFER_OUT_CAN_BROADCAST, debugEventBuffer, sizeof( debugEventBuffer ) ); }