From ae503531603eecc051f892ed5e8565ca518ff76d Mon Sep 17 00:00:00 2001 From: zbr Date: Thu, 7 Jan 2021 09:57:34 +0800 Subject: [PATCH] =?UTF-8?q?GPS=E6=97=A5=E6=9C=9F=EF=BC=8C1=EF=BC=8C2?= =?UTF-8?q?=E6=9C=88=E5=B9=B4=E4=BB=BD=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArduCopter/version.h | 2 +- copy.sh | 2 +- libraries/AP_GPS/GPS_Backend.cpp | 10 +++++----- zr-v4.sh | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ArduCopter/version.h b/ArduCopter/version.h index 9b38784bbd..f13c2dca45 100644 --- a/ArduCopter/version.h +++ b/ArduCopter/version.h @@ -6,7 +6,7 @@ #include "ap_version.h" -#define THISFIRMWARE "ZRUAV v4.0.8-RC7" //"ArduCopter V4.0.0" +#define THISFIRMWARE "ZRUAV v4.0.8-RC8" //"ArduCopter V4.0.0" // the following line is parsed by the autotest scripts #define FIRMWARE_VERSION 4,0,8,FIRMWARE_VERSION_TYPE_OFFICIAL diff --git a/copy.sh b/copy.sh index d59c52794d..447190e817 100755 --- a/copy.sh +++ b/copy.sh @@ -1,2 +1,2 @@ -sudo cp ./build/zr-v4/bin/arducopter.apj /mnt/f/_01-work/100\=data/固件/zr-v4/wsl/hexa-zrv4-v4.0.8-rc7-test.px4 +sudo cp ./build/zr-v4/bin/arducopter.apj /mnt/f/_01-work/100\=data/固件/zr-v4/wsl/qusd-zrv4-v4.0.8-rc8.px4 diff --git a/libraries/AP_GPS/GPS_Backend.cpp b/libraries/AP_GPS/GPS_Backend.cpp index fe9770f566..13a432590d 100644 --- a/libraries/AP_GPS/GPS_Backend.cpp +++ b/libraries/AP_GPS/GPS_Backend.cpp @@ -90,11 +90,11 @@ void AP_GPS_Backend::make_gps_time(uint32_t bcd_date, uint32_t bcd_milliseconds) min = v % 100; v /= 100; hour = v % 100; - int8_t rmon = mon - 2; - if (0 >= rmon) { - rmon += 12; - year -= 1; - } + // int8_t rmon = mon - 2; + // if (0 >= rmon) { + // rmon += 12; + // year -= 1; + // } time_t rawtime; struct tm* timeinfo; diff --git a/zr-v4.sh b/zr-v4.sh index d19b47f6cb..22edc39615 100755 --- a/zr-v4.sh +++ b/zr-v4.sh @@ -1,2 +1,3 @@ ./waf configure --board zr-v4 -./waf --targets bin/arducopter --upload +./waf copter +cp ./build/zr-v4/bin/arducopter.apj /mnt/f/_01-work/100\=data/固件/zr-v4/wsl/qusd-zrv4-v4.0.8-rc8.px4