diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp index 0aba8c2238..418e8ad91f 100644 --- a/ArduCopter/Parameters.cpp +++ b/ArduCopter/Parameters.cpp @@ -1629,11 +1629,11 @@ const char* Copter::get_sysid_board_id(void) static char buf[50]; // snprintf(buf, sizeof(buf), "Version: v3.5.6 ,Board ID: ZRZK.19QT3.%d",(int)g.sysid_board_id); - int32_t nameValue1 =(int32_t) g.sysid_board_name_1st; + // int32_t nameValue1 =(int32_t) g.sysid_board_name_1st; int32_t nameValue2 = (int32_t)g.sysid_board_name_2nd; - // snprintf(buf, sizeof(buf), "Version: zr-v4.0.1 ,Board ID: ZRZK.20QT2.%d",(int)nameValue2); - snprintf(buf, sizeof(buf), "Version: zr-v4.0.3 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2); + snprintf(buf, sizeof(buf), "Version: zr-v4.0.3 ,Board ID: ZRZK.20QT2.%d",(int)nameValue2); + // snprintf(buf, sizeof(buf), "Version: zr-v4.0.3 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2); AP::logger().Write_Message(buf); return buf; } diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat index 82f5ea5b02..0f989d96a7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat @@ -160,20 +160,20 @@ PD0 UART4_RX UART4 NODMA PD1 UART4_TX UART4 NODMA # # USART6 is telem3 -# PG9 USART6_RX USART6 NODMA -# # we leave PG14 as an input to prevent it acting as a pullup -# # on the IOMCU SBUS input -# # PG14 USART6_TX USART6 NODMA -# PG15 USART6_CTS USART6 -# PG8 USART6_RTS USART6 - -# USART6 is telem3 for cube PG9 USART6_RX USART6 NODMA # we leave PG14 as an input to prevent it acting as a pullup # on the IOMCU SBUS input -PG14 USART6_TX USART6 NODMA -# PG15 USART6_CTS USART6 -# PG8 USART6_RTS USART6 +# PG14 USART6_TX USART6 NODMA +PG15 USART6_CTS USART6 +PG8 USART6_RTS USART6 + +# # USART6 is telem3 for cube +# PG9 USART6_RX USART6 NODMA +# # we leave PG14 as an input to prevent it acting as a pullup +# # on the IOMCU SBUS input +# PG14 USART6_TX USART6 NODMA +# # PG15 USART6_CTS USART6 +# # PG8 USART6_RTS USART6 # UART7 is debug PF6 UART7_RX UART7 NODMA