Changeset 464 for azure_iot_hub_f767zi/trunk/asp_baseplatform/pdic

Timestamp:

Jun 22, 2021, 9:00:19 PM (3 years ago)

Author:

coas-nagasima

Message:

WolfSSLとAzure IoT SDKを更新

Location:

azure_iot_hub_f767zi/trunk/asp_baseplatform/pdic/stm32f7xx

Files:

• clock.c (modified) (2 diffs)
• device.c (modified) (2 diffs)

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

@@ -209 +209 @@
                 arg1 = atoix(argv[1]);
         if(argc > 2)
-                timedate.tm_mon = atoix(argv[2]) - 1;
-        else
-                timedate.tm_mon = 0;
+                timedate.tm_mon = atoix(argv[2]);
+        else
+                timedate.tm_mon = 1;
         if(argc > 3)
                 timedate.tm_mday = atoix(argv[3]);
         else
                 timedate.tm_mday = 1;
-        printf("%04d/%02d/%02d\n", arg1, timedate.tm_mon + 1, timedate.tm_mday);
-        timedate.tm_year = arg1 - 1900;
+        printf("%04d/%02d/%02d\n", arg1, timedate.tm_mon, timedate.tm_mday);
+        timedate.tm_year = arg1-1900;
         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+1, timedate.tm_mday, timedate.tm_yday);
+        printf("  %04d/%02d/%02d yday[%d]\n", timedate.tm_year+1900, 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 - 30) << 16) |
-                                ((uint32_t)byte2bcd(pt->tm_mon) << 8) |
+        datetmp = (((uint32_t)byte2bcd(pt->tm_year) << 16) |
+                                ((uint32_t)byte2bcd(pt->tm_mon + 1) << 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)) + 30;
-        pt->tm_mon = (uint8_t)bcd2byte((uint8_t)((datetmp & (RTC_DR_MT | RTC_DR_MU)) >> 8));
+        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_mday = (uint8_t)bcd2byte((uint8_t)(datetmp & (RTC_DR_DT | RTC_DR_DU)));
         pt->tm_wday = (uint8_t)((datetmp & (RTC_DR_WDU)) >> 13);