Merge pull request #2029 from adustm/b_fix_MBED_16_STM32F4

Fix #2027 Add timeinfo.tm_isdst = -1 to pass MBED_16 test with IAR.
pull/2139/head
Martin Kojtal 2016-07-11 11:07:40 +01:00 committed by GitHub
commit 967b45a3ec
4 changed files with 8 additions and 0 deletions

View File

@ -163,6 +163,8 @@ time_t rtc_read(void)
timeinfo.tm_hour = timeStruct.Hours; timeinfo.tm_hour = timeStruct.Hours;
timeinfo.tm_min = timeStruct.Minutes; timeinfo.tm_min = timeStruct.Minutes;
timeinfo.tm_sec = timeStruct.Seconds; timeinfo.tm_sec = timeStruct.Seconds;
// Daylight Saving Time information is not available
timeinfo.tm_isdst = -1;
// Convert to timestamp // Convert to timestamp
time_t t = mktime(&timeinfo); time_t t = mktime(&timeinfo);

View File

@ -182,6 +182,8 @@ time_t rtc_read(void)
timeinfo.tm_hour = timeStruct.Hours; timeinfo.tm_hour = timeStruct.Hours;
timeinfo.tm_min = timeStruct.Minutes; timeinfo.tm_min = timeStruct.Minutes;
timeinfo.tm_sec = timeStruct.Seconds; timeinfo.tm_sec = timeStruct.Seconds;
// Daylight Saving Time information is not available
timeinfo.tm_isdst = -1;
// Convert to timestamp // Convert to timestamp
time_t t = mktime(&timeinfo); time_t t = mktime(&timeinfo);

View File

@ -182,6 +182,8 @@ time_t rtc_read(void)
timeinfo.tm_hour = timeStruct.Hours; timeinfo.tm_hour = timeStruct.Hours;
timeinfo.tm_min = timeStruct.Minutes; timeinfo.tm_min = timeStruct.Minutes;
timeinfo.tm_sec = timeStruct.Seconds; timeinfo.tm_sec = timeStruct.Seconds;
// Daylight Saving Time information is not available
timeinfo.tm_isdst = -1;
// Convert to timestamp // Convert to timestamp
time_t t = mktime(&timeinfo); time_t t = mktime(&timeinfo);

View File

@ -182,6 +182,8 @@ time_t rtc_read(void)
timeinfo.tm_hour = timeStruct.Hours; timeinfo.tm_hour = timeStruct.Hours;
timeinfo.tm_min = timeStruct.Minutes; timeinfo.tm_min = timeStruct.Minutes;
timeinfo.tm_sec = timeStruct.Seconds; timeinfo.tm_sec = timeStruct.Seconds;
// Daylight Saving Time information is not available
timeinfo.tm_isdst = -1;
// Convert to timestamp // Convert to timestamp
time_t t = mktime(&timeinfo); time_t t = mktime(&timeinfo);