Просмотр исходного кода

修复北大荒自检时间戳错误问题

zhunk 2 лет назад
Родитель
Сommit
4cf29ca9a1
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      Application_CBD/applications/dtu_uart2.c
  2. 1 1
      Application_CBD/applications/hmi.c

+ 1 - 1
Application_CBD/applications/dtu_uart2.c

@@ -525,7 +525,7 @@ char *makeJson_selfCheck_(uint8_t sta)  //sta==0 应答,sta==1结果
         memset(device_status.qianming,0,sizeof(device_status.qianming));
         memset(device_status.qianming,0,sizeof(device_status.qianming));
         memset(device_status.photolink,0,sizeof(device_status.photolink));
         memset(device_status.photolink,0,sizeof(device_status.photolink));
     }
     }
-    cJSON_AddItemToObject(pRoot, "ts", cJSON_CreateNumber(tv.tv_sec));
+    cJSON_AddItemToObject(pRoot, "ts", cJSON_CreateNumber(tv.tv_sec-8*3600));
     char * t = cJSON_PrintUnformatted(pRoot);
     char * t = cJSON_PrintUnformatted(pRoot);
     if(NULL == t)
     if(NULL == t)
     {
     {

+ 1 - 1
Application_CBD/applications/hmi.c

@@ -1559,7 +1559,7 @@ static void Ctr_Mortor_entry(void* parameter)
         {
         {
             struct timeval tv;
             struct timeval tv;
             gettimeofday(&tv, NULL);
             gettimeofday(&tv, NULL);
-            device_status.photo_stamp = tv.tv_sec;
+            device_status.photo_stamp = tv.tv_sec-8*3600;
             ctr_led(ON);
             ctr_led(ON);
             //打开补光灯
             //打开补光灯
             if(photo_led_sec==300&&device_status.version_type==48)
             if(photo_led_sec==300&&device_status.version_type==48)