AP_IOMCU: added SBUS output support

This commit is contained in:
Andrew Tridgell 2018-10-29 16:51:43 +11:00
parent e46a640b2c
commit f600ebd758
5 changed files with 85 additions and 3 deletions

View File

@ -25,6 +25,8 @@
#include "hal.h"
#include <AP_HAL_ChibiOS/RCInput.h>
#include "analog.h"
#include "sbus_out.h"
extern const AP_HAL::HAL &hal;
//#pragma GCC optimize("Og")
@ -129,6 +131,10 @@ static UARTConfig uart_cfg = {
void setup(void)
{
// we need to release the JTAG reset pin to be used as a GPIO, otherwise we can't enable
// or disable SBUS out
AFIO->MAPR = AFIO_MAPR_SWJ_CFG_NOJNTRST;
hal.rcin->init();
hal.rcout->init();
@ -157,6 +163,7 @@ void AP_IOMCU_FW::init()
}
adc_init();
sbus_out_init();
}
@ -175,8 +182,18 @@ void AP_IOMCU_FW::update()
pwm_out_update();
}
// run remaining functions at 1kHz
uint32_t now = AP_HAL::millis();
// output SBUS if enabled
if ((reg_setup.features & P_SETUP_FEATURES_SBUS1_OUT) &&
reg_status.flag_safety_off &&
now - sbus_last_ms >= sbus_interval_ms) {
// output a new SBUS frame
sbus_last_ms = now;
sbus_out_write(reg_servo.pwm, IOMCU_MAX_CHANNELS);
}
// run remaining functions at 1kHz
if (now != last_loop_ms) {
last_loop_ms = now;
heater_update();
@ -290,7 +307,12 @@ void AP_IOMCU_FW::process_io_packet()
*/
void AP_IOMCU_FW::page_status_update(void)
{
reg_status.vrssi = adc_sample_vrssi();
if ((reg_setup.features & P_SETUP_FEATURES_SBUS1_OUT) == 0) {
// we can only get VRSSI when sbus is disabled
reg_status.vrssi = adc_sample_vrssi();
} else {
reg_status.vrssi = 0;
}
reg_status.vservo = adc_sample_vservo();
}
@ -381,6 +403,8 @@ bool AP_IOMCU_FW::handle_code_write()
update_default_rate = true;
break;
case PAGE_REG_SETUP_SBUS_RATE:
reg_setup.sbus_rate = rx_io_packet.regs[0];
sbus_interval_ms = MAX(1000U / reg_setup.sbus_rate,3);
break;
case PAGE_REG_SETUP_FEATURES:
reg_setup.features = rx_io_packet.regs[0];
@ -389,6 +413,12 @@ bool AP_IOMCU_FW::handle_code_write()
reg_setup.features &= ~(P_SETUP_FEATURES_PWM_RSSI |
P_SETUP_FEATURES_ADC_RSSI |
P_SETUP_FEATURES_SBUS2_OUT);
// enable SBUS output at specified rate
sbus_interval_ms = MAX(1000U / reg_setup.sbus_rate,3);
palClearLine(HAL_GPIO_PIN_SBUS_OUT_EN);
} else {
palSetLine(HAL_GPIO_PIN_SBUS_OUT_EN);
}
break;
case PAGE_REG_SETUP_HEATER_DUTY_CYCLE:

View File

@ -80,6 +80,10 @@ private:
uint16_t sbus_rate_hz;
} rate;
// sbus rate handling
uint32_t sbus_last_ms;
uint32_t sbus_interval_ms;
uint8_t last_page;
uint8_t last_offset;
uint32_t fmu_data_received_time;

View File

@ -0,0 +1,44 @@
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
SBUS output support
*/
#include "ch.h"
#include "hal.h"
#include "sbus_out.h"
#include <AP_SBusOut/AP_SBusOut.h>
static const SerialConfig uart3_cfg = {
100000, // speed
USART_CR1_PCE | USART_CR1_M, // cr1, enable even parity
0, // cr2
0, // cr3
nullptr, // irq_cb
nullptr, // ctx
};
void sbus_out_init(void)
{
sdStart(&SD3, &uart3_cfg);
}
void sbus_out_write(uint16_t *channels, uint8_t nchannels)
{
uint8_t buffer[25];
AP_SBusOut::sbus_format_frame(channels, nchannels, buffer);
chnWrite(&SD3, buffer, sizeof(buffer));
}

View File

@ -0,0 +1,3 @@
void sbus_out_init(void);
void sbus_out_write(uint16_t *channels, uint8_t nchannels);

View File

@ -12,7 +12,8 @@ def build(bld):
'AP_HAL_Empty',
'AP_Math',
'AP_RCProtocol',
'AP_BoardConfig'
'AP_BoardConfig',
'AP_SBusOut'
],
exclude_src=[
'libraries/AP_HAL_ChibiOS/Storage.cpp'