From a736c9eacc7edacc9b5e214feade788dc4937a92 Mon Sep 17 00:00:00 2001 From: z Date: Mon, 29 Jun 2020 15:42:55 +0800 Subject: [PATCH] battgo test --- libraries/AP_BattMonitor/AP_BattMonitor_Serial_BattGo.cpp | 4 ++++ libraries/AP_SerialManager/AP_SerialManager.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Serial_BattGo.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Serial_BattGo.cpp index b816218c13..eead3bba55 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Serial_BattGo.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Serial_BattGo.cpp @@ -70,6 +70,10 @@ bool AP_BattMonitor_Serial_BattGo::get_reading() //TODO need to Refactor void AP_BattMonitor_Serial_BattGo::requestBattData(uint8_t data) { + if (uart == nullptr) + { + return ; + } //发送data主要 0x40 0x42 0x44 地址0x21 及计算crc 均不会出现0x55,故不做0x55处理 uint8_t send_data[13]; send_data[0] = 0x55; diff --git a/libraries/AP_SerialManager/AP_SerialManager.cpp b/libraries/AP_SerialManager/AP_SerialManager.cpp index c135508b41..b1e2486147 100644 --- a/libraries/AP_SerialManager/AP_SerialManager.cpp +++ b/libraries/AP_SerialManager/AP_SerialManager.cpp @@ -456,6 +456,14 @@ void AP_SerialManager::init() AP_SERIALMANAGER_SLCAN_BUFSIZE_TX); break; + case SerialProtocol_Battery: + state[i].baud = AP_SERIALMANAGER_ALEXMOS_BAUD / 1000; // update baud param in case user looks at it + state[i].uart->begin(map_baudrate(state[i].baud), + AP_SERIALMANAGER_SLCAN_BUFSIZE_RX, + AP_SERIALMANAGER_SLCAN_BUFSIZE_TX); + break; + + #ifndef HAL_BUILD_AP_PERIPH case SerialProtocol_RCIN: AP::RC().add_uart(state[i].uart);