merge from master #143

Merged
Livox-SDK merged 5 commits from master into cancle_heartbeat_timeout 2021-09-06 04:56:29 +02:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 05cc408e54 - Show all commits
+1 -1
View File
@@ -643,7 +643,7 @@ typedef struct {
uint8_t month; uint8_t month;
uint8_t day; uint8_t day;
uint8_t hour; uint8_t hour;
uint32_t mircrosecond; uint32_t microsecond;
} LidarSetUtcSyncTimeRequest; } LidarSetUtcSyncTimeRequest;
/** /**
@@ -209,7 +209,7 @@ bool ParseRmcTime(const char* rmc, uint16_t rmc_len, LidarSetUtcSyncTimeRequest*
} }
utc_time_req->hour = hour; utc_time_req->hour = hour;
utc_time_req->mircrosecond = (minute * 60 * 1000 + second * 1000) * 1000; utc_time_req->microsecond = (minute * 60 * 1000 + second * 1000) * 1000;
return true; return true;
} }