fix: Trainer jack initialisation and driver cleanup (#3811)

This commit is contained in:
3djc
2023-08-09 21:08:42 +10:00
committed by GitHub
parent f7037a92b0
commit ae8e1fff8a
16 changed files with 57 additions and 48 deletions
@@ -271,7 +271,7 @@ void stop_trainer_capture()
#endif // TRAINER_GPIO
bool is_trainer_connected()
bool is_trainer_dsc_connected()
{
#if defined(TRAINER_DETECT_GPIO_PIN)
bool set = LL_GPIO_IsInputPinSet(TRAINER_DETECT_GPIO, TRAINER_DETECT_GPIO_PIN);
+1 -1
View File
@@ -49,7 +49,7 @@ void stop_trainer_ppm() {}
void init_trainer_capture() {}
void stop_trainer_capture() {}
bool is_trainer_connected() { return false; }
bool is_trainer_dsc_connected() { return false; }
void init_trainer_module_cppm() {}
void stop_trainer_module_cppm() {}
+3 -3
View File
@@ -241,10 +241,10 @@ void OpenTxSimulator::setTrim(unsigned int idx, int value)
void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, int16_t value)
{
static unsigned dim = DIM(ppmInput);
static unsigned dim = DIM(trainerInput);
//setTrainerTimeout(100);
if (inputNumber < dim)
ppmInput[inputNumber] = qMin(qMax((int16_t)-512, value), (int16_t)512);
trainerInput[inputNumber] = qMin(qMax((int16_t)-512, value), (int16_t)512);
}
void OpenTxSimulator::setInputValue(int type, uint8_t index, int16_t value)
@@ -411,7 +411,7 @@ void OpenTxSimulator::lcdFlushed()
void OpenTxSimulator::setTrainerTimeout(uint16_t ms)
{
ppmInputValidityTimer = ms;
trainerInputValidityTimer = ms;
}
void OpenTxSimulator::sendTelemetry(const QByteArray data)
+2
View File
@@ -20,6 +20,7 @@
*/
#include "hal/adc_driver.h"
#include "hal/trainer_driver.h"
#include "hal/switch_driver.h"
#include "hal/module_port.h"
@@ -137,6 +138,7 @@ void boardInit()
}
#endif
init_trainer();
// Sets 'hardwareOption.pcbrev' as well
pwrInit();
boardInitModulePorts();