feat(radio): Discover SBUS trainer availability (#4266)
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com> Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
raphaelcoeffic
Peter Feerick
parent
b22fa28db9
commit
fa12b27438
@@ -106,8 +106,12 @@ static bool _init_timer_driver(etx_module_driver_t* d, const etx_module_port_t*
|
||||
}
|
||||
|
||||
static bool _match_port(const etx_module_port_t* p, uint8_t type, uint8_t port,
|
||||
uint8_t polarity, bool softserial_fallback)
|
||||
uint8_t polarity, uint8_t direction, bool softserial_fallback)
|
||||
{
|
||||
if ((p->dir_flags & direction) != direction) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (p->type == type && p->port == port) {
|
||||
// either polarity matches or can be set
|
||||
if (polarity != ETX_Pol_Inverted ||
|
||||
@@ -134,6 +138,7 @@ static bool _match_port(const etx_module_port_t* p, uint8_t type, uint8_t port,
|
||||
|
||||
static const etx_module_port_t* _find_port(uint8_t module, uint8_t type,
|
||||
uint8_t port, uint8_t polarity,
|
||||
uint8_t direction,
|
||||
bool softserial_fallback)
|
||||
{
|
||||
if (module >= MAX_MODULES || module >= _n_modules || !_modules[module])
|
||||
@@ -145,7 +150,7 @@ static const etx_module_port_t* _find_port(uint8_t module, uint8_t type,
|
||||
|
||||
while(n_ports > 0) {
|
||||
|
||||
if (_match_port(p, type, port, polarity, softserial_fallback)) {
|
||||
if (_match_port(p, type, port, polarity, direction, softserial_fallback)) {
|
||||
found_port = p;
|
||||
break;
|
||||
}
|
||||
@@ -173,9 +178,10 @@ const etx_module_t* modulePortGetModuleDescription(uint8_t module)
|
||||
}
|
||||
|
||||
const etx_module_port_t* modulePortFind(uint8_t module, uint8_t type,
|
||||
uint8_t port, uint8_t polarity)
|
||||
uint8_t port, uint8_t polarity,
|
||||
uint8_t direction)
|
||||
{
|
||||
return _find_port(module, type, port, polarity, false);
|
||||
return _find_port(module, type, port, polarity, direction, false);
|
||||
}
|
||||
|
||||
void modulePortSetPower(uint8_t module, uint8_t enable)
|
||||
@@ -204,6 +210,7 @@ etx_module_state_t* modulePortInitSerial(uint8_t module, uint8_t port,
|
||||
{
|
||||
const etx_module_port_t* found_port = _find_port(module, ETX_MOD_TYPE_SERIAL,
|
||||
port, params->polarity,
|
||||
params->direction,
|
||||
softserial_fallback);
|
||||
if (!found_port) return nullptr;
|
||||
|
||||
@@ -236,8 +243,8 @@ etx_module_state_t* modulePortInitSerial(uint8_t module, uint8_t port,
|
||||
etx_module_state_t* modulePortInitTimer(uint8_t module, uint8_t port,
|
||||
const etx_timer_config_t* cfg)
|
||||
{
|
||||
const etx_module_port_t* found_port = _find_port(module, ETX_MOD_TYPE_TIMER,
|
||||
port, ETX_Pol_Normal, false);
|
||||
const etx_module_port_t* found_port = _find_port(
|
||||
module, ETX_MOD_TYPE_TIMER, port, ETX_Pol_Normal, ETX_MOD_DIR_TX, false);
|
||||
if (!found_port) return nullptr;
|
||||
|
||||
auto state = &(_module_states[module]);
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
//
|
||||
|
||||
// flags
|
||||
#define ETX_MOD_DIR_TX (1 << 0)
|
||||
#define ETX_MOD_DIR_RX (1 << 1)
|
||||
#define ETX_MOD_DIR_RX (1 << 0)
|
||||
#define ETX_MOD_DIR_TX (1 << 1)
|
||||
#define ETX_MOD_DIR_TX_RX (ETX_MOD_DIR_TX | ETX_MOD_DIR_RX)
|
||||
#define ETX_MOD_FULL_DUPLEX (1 << 2)
|
||||
|
||||
@@ -117,7 +117,8 @@ void modulePortConfigExtra(const etx_module_port_t* port);
|
||||
const etx_module_t* modulePortGetModuleDescription(uint8_t module);
|
||||
|
||||
const etx_module_port_t* modulePortFind(uint8_t module, uint8_t type,
|
||||
uint8_t port, uint8_t polarity);
|
||||
uint8_t port, uint8_t polarity,
|
||||
uint8_t direction);
|
||||
|
||||
void modulePortSetPower(uint8_t module, uint8_t enabled);
|
||||
|
||||
|
||||
@@ -22,33 +22,23 @@
|
||||
#pragma once
|
||||
|
||||
// Startup init
|
||||
void init_trainer();
|
||||
void board_trainer_init();
|
||||
|
||||
// DSC port available?
|
||||
bool trainer_dsc_available();
|
||||
|
||||
// Output mode
|
||||
void init_trainer_ppm();
|
||||
void stop_trainer_ppm();
|
||||
void trainer_init_dsc_out();
|
||||
|
||||
// Input mode
|
||||
void init_trainer_capture();
|
||||
void stop_trainer_capture();
|
||||
void trainer_init_dsc_in();
|
||||
|
||||
// Stop input/output
|
||||
void trainer_stop_dsc();
|
||||
|
||||
// Cable inserted?
|
||||
bool is_trainer_dsc_connected();
|
||||
|
||||
// Active signal received
|
||||
extern uint8_t trainerInputValidityTimer;
|
||||
inline bool is_trainer_connected()
|
||||
{
|
||||
return (trainerInputValidityTimer != 0);
|
||||
}
|
||||
|
||||
#if defined(TRAINER_MODULE_CPPM)
|
||||
void init_trainer_module_cppm();
|
||||
void stop_trainer_module_cppm();
|
||||
#endif
|
||||
|
||||
#if defined(TRAINER_MODULE_SBUS)
|
||||
void init_trainer_module_sbus();
|
||||
void stop_trainer_module_sbus();
|
||||
int trainerModuleSbusGetByte(uint8_t* byte);
|
||||
#endif
|
||||
// Start/stop CPPM from module bay
|
||||
void trainer_init_module_cppm();
|
||||
void trainer_stop_module_cppm();
|
||||
|
||||
Reference in New Issue
Block a user