zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0704 backuuuuuuuuuuuuuuuuup

master
z 5 years ago
parent
a227d3652d
commit
b23fb46d79
2 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ArduCopter/Parameters.cpp
  2. 22
      libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat

6
ArduCopter/Parameters.cpp
Unescape View File

@ -1629,11 +1629,11 @@ const char* Copter::get_sysid_board_id(void)
static char buf[50]; static char buf[50];
// snprintf(buf, sizeof(buf), "Version: v3.5.6 ,Board ID: ZRZK.19QT3.%d",(int)g.sysid_board_id); // 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; 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 ,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 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2);
AP::logger().Write_Message(buf); AP::logger().Write_Message(buf);
return buf; return buf;
} }

22
libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat
Unescape View File

@ -160,20 +160,20 @@ PD0 UART4_RX UART4 NODMA
PD1 UART4_TX UART4 NODMA PD1 UART4_TX UART4 NODMA
# # USART6 is telem3 # # 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 PG9 USART6_RX USART6 NODMA
# we leave PG14 as an input to prevent it acting as a pullup # we leave PG14 as an input to prevent it acting as a pullup
# on the IOMCU SBUS input # on the IOMCU SBUS input
PG14 USART6_TX USART6 NODMA # PG14 USART6_TX USART6 NODMA
# PG15 USART6_CTS USART6 PG15 USART6_CTS USART6
# PG8 USART6_RTS 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 # UART7 is debug
PF6 UART7_RX UART7 NODMA PF6 UART7_RX UART7 NODMA

Write Preview
Loading…
Cancel
Save