Changeset 470

Timestamp:

Jun 27, 2021, 10:08:56 PM (3 years ago)

Author:

coas-nagasima

Message:

時刻の計算を修正

Location:

azure_iot_hub_f767zi/trunk

Files:

• app_iothub_client/src/command.c (modified) (1 diff)
• asp_baseplatform/OBJ/STM32F767NUCLEO144_GCC/MAC/lwip_test.c (modified) (1 diff)
• asp_baseplatform/pdic/stm32f7xx/clock.c (modified) (2 diffs)
• asp_baseplatform/pdic/stm32f7xx/device.c (modified) (2 diffs)

azure_iot_hub_f767zi/trunk/app_iothub_client/src/command.c

@@ -57 +57 @@
 "          CUP command            cup   control\n"
 "          IOT                    connect azure\n"
-"          CS             set connection string\n"
+"          SETCS          set connection string\n"
 "          CSGEN               provision device\n"
 "          PROXY                  set proxy    \n"

azure_iot_hub_f767zi/trunk/asp_baseplatform/OBJ/STM32F767NUCLEO144_GCC/MAC/lwip_test.c

@@ -255 +255 @@
         gmtime_r(&current_time, &current_time_val);
         printf("%04d/%02d/%02d %02d:%02d:%02d\n",
-                current_time_val.tm_year+1900, current_time_val.tm_mon, current_time_val.tm_mday,
+                current_time_val.tm_year+1970, current_time_val.tm_mon, current_time_val.tm_mday,
                 current_time_val.tm_hour, current_time_val.tm_min, current_time_val.tm_sec);
 }

azure_iot_hub_f767zi/trunk/asp_baseplatform/pdic/stm32f7xx/clock.c

@@ -217 +217 @@
                 timedate.tm_mday = 1;
         printf("%04d/%02d/%02d\n", arg1, timedate.tm_mon, timedate.tm_mday);
-        timedate.tm_year = arg1-1900;
+        timedate.tm_year = arg1-1970;
         timedate.tm_isdst = 0;
         mktime((struct tm *)&timedate);
@@ -291 +291 @@
         }
         mktime(&timedate);
-        printf("  %04d/%02d/%02d yday[%d]\n", timedate.tm_year+1900, timedate.tm_mon, timedate.tm_mday, timedate.tm_yday);
+        printf("  %04d/%02d/%02d yday[%d]\n", timedate.tm_year+1970, timedate.tm_mon, timedate.tm_mday, timedate.tm_yday);
         printf("    %02d:%02d:%02d wday[%d]\n", timedate.tm_hour, timedate.tm_min, timedate.tm_sec, timedate.tm_wday);
         return 0;

azure_iot_hub_f767zi/trunk/asp_baseplatform/pdic/stm32f7xx/device.c

@@ -1158 +1158 @@
         SVC_PERROR(wai_sem(RTCSEM));
 
-        datetmp = (((uint32_t)byte2bcd(pt->tm_year) << 16) |
-                                ((uint32_t)byte2bcd(pt->tm_mon + 1) << 8) |
+        datetmp = (((uint32_t)byte2bcd(pt->tm_year - 30) << 16) |
+                                ((uint32_t)byte2bcd(pt->tm_mon) << 8) |
                                 ((uint32_t)byte2bcd(pt->tm_mday)) |
                                 ((uint32_t)pt->tm_wday << 13));
@@ -1244 +1244 @@
          */
         datetmp = sil_rew_mem((uint32_t *)(TADR_RTC_BASE+TOFF_RTC_DR)) & RTC_DR_RESERVED_MASK;
-        pt->tm_year = (uint8_t)bcd2byte((uint8_t)((datetmp & (RTC_DR_YT | RTC_DR_YU)) >> 16));
-        pt->tm_mon = (uint8_t)bcd2byte((uint8_t)((datetmp & (RTC_DR_MT | RTC_DR_MU)) >> 8)) - 1;
+        pt->tm_year = (uint8_t)bcd2byte((uint8_t)((datetmp & (RTC_DR_YT | RTC_DR_YU)) >> 16)) + 30;
+        pt->tm_mon = (uint8_t)bcd2byte((uint8_t)((datetmp & (RTC_DR_MT | RTC_DR_MU)) >> 8));
         pt->tm_mday = (uint8_t)bcd2byte((uint8_t)(datetmp & (RTC_DR_DT | RTC_DR_DU)));
         pt->tm_wday = (uint8_t)((datetmp & (RTC_DR_WDU)) >> 13);