Move all serial internal module functions into proper drivers
This commit is contained in:
+126
-16
@@ -24,6 +24,8 @@
|
||||
#include "pulses/pxx2.h"
|
||||
#include "io/frsky_firmware_update.h"
|
||||
#include "libopenui/src/libopenui_file.h"
|
||||
#include "mixer_scheduler.h"
|
||||
#include "heartbeat_driver.h"
|
||||
|
||||
#if defined(INTMODULE_USART)
|
||||
#include "intmodule_serial_driver.h"
|
||||
@@ -124,7 +126,7 @@ void Pxx2Pulses::addPulsesValues(uint16_t low, uint16_t high)
|
||||
Pxx2Transport::addByte(high >> 4u); // High byte of channel
|
||||
}
|
||||
|
||||
void Pxx2Pulses::addChannels(uint8_t module)
|
||||
void Pxx2Pulses::addChannels(uint8_t module, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
uint16_t pulseValue = 0;
|
||||
uint16_t pulseValueLow = 0;
|
||||
@@ -133,7 +135,7 @@ void Pxx2Pulses::addChannels(uint8_t module)
|
||||
uint8_t count = sentModuleChannels(module);
|
||||
|
||||
for (int8_t i = 0; i < count; i++, channel++) {
|
||||
int value = channelOutputs[channel] + 2*PPM_CH_CENTER(channel) - 2*PPM_CENTER;
|
||||
int value = channels[i] + 2*PPM_CH_CENTER(channel) - 2*PPM_CENTER;
|
||||
pulseValue = limit(1, (value * 512 / 682) + 1024, 2046);
|
||||
#if defined(DEBUG_LATENCY_RF_ONLY)
|
||||
if (latencyToggleSwitch)
|
||||
@@ -183,7 +185,7 @@ void Pxx2Pulses::addFailsafe(uint8_t module)
|
||||
}
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupChannelsFrame(uint8_t module)
|
||||
void Pxx2Pulses::setupChannelsFrame(uint8_t module, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_CHANNELS);
|
||||
|
||||
@@ -197,7 +199,7 @@ void Pxx2Pulses::setupChannelsFrame(uint8_t module)
|
||||
if (flag0 & PXX2_CHANNELS_FLAG0_FAILSAFE)
|
||||
addFailsafe(module);
|
||||
else
|
||||
addChannels(module);
|
||||
addChannels(module, channels, nChannels);
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupTelemetryFrame(uint8_t module)
|
||||
@@ -209,7 +211,7 @@ void Pxx2Pulses::setupTelemetryFrame(uint8_t module)
|
||||
}
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupHardwareInfoFrame(uint8_t module)
|
||||
void Pxx2Pulses::setupHardwareInfoFrame(uint8_t module, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
ModuleInformation * destination = moduleState[module].moduleInformation;
|
||||
|
||||
@@ -222,12 +224,12 @@ void Pxx2Pulses::setupHardwareInfoFrame(uint8_t module)
|
||||
}
|
||||
else {
|
||||
moduleState[module].mode = MODULE_MODE_NORMAL;
|
||||
setupChannelsFrame(module);
|
||||
setupChannelsFrame(module, channels, nChannels);
|
||||
}
|
||||
}
|
||||
else {
|
||||
destination->timeout--;
|
||||
setupChannelsFrame(module);
|
||||
setupChannelsFrame(module, channels, nChannels);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,7 +252,7 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
|
||||
}
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupModuleSettingsFrame(uint8_t module)
|
||||
void Pxx2Pulses::setupModuleSettingsFrame(uint8_t module, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
ModuleSettings * destination = moduleState[module].moduleSettings;
|
||||
|
||||
@@ -270,11 +272,11 @@ void Pxx2Pulses::setupModuleSettingsFrame(uint8_t module)
|
||||
destination->timeout = get_tmr10ms() + 200/*next try in 2s*/;
|
||||
}
|
||||
else {
|
||||
setupChannelsFrame(module);
|
||||
setupChannelsFrame(module, channels, nChannels);
|
||||
}
|
||||
}
|
||||
|
||||
void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
|
||||
void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
if (get_tmr10ms() > reusableBuffer.hardwareAndSettings.receiverSettings.timeout) {
|
||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
|
||||
@@ -305,7 +307,7 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
|
||||
reusableBuffer.hardwareAndSettings.receiverSettings.timeout = get_tmr10ms() + 200/*next try in 2s*/;
|
||||
}
|
||||
else {
|
||||
setupChannelsFrame(module);
|
||||
setupChannelsFrame(module, channels, nChannels);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -456,7 +458,7 @@ void Pxx2Pulses::setupAuthenticationFrame(uint8_t module, uint8_t mode, const ui
|
||||
endFrame();
|
||||
}
|
||||
|
||||
bool Pxx2Pulses::setupFrame(uint8_t module)
|
||||
bool Pxx2Pulses::setupFrame(uint8_t module, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
if (moduleState[module].mode == MODULE_MODE_OTA_UPDATE)
|
||||
return false;
|
||||
@@ -470,13 +472,13 @@ bool Pxx2Pulses::setupFrame(uint8_t module)
|
||||
|
||||
switch (moduleState[module].mode) {
|
||||
case MODULE_MODE_GET_HARDWARE_INFO:
|
||||
setupHardwareInfoFrame(module);
|
||||
setupHardwareInfoFrame(module, channels, nChannels);
|
||||
break;
|
||||
case MODULE_MODE_MODULE_SETTINGS:
|
||||
setupModuleSettingsFrame(module);
|
||||
setupModuleSettingsFrame(module, channels, nChannels);
|
||||
break;
|
||||
case MODULE_MODE_RECEIVER_SETTINGS:
|
||||
setupReceiverSettingsFrame(module);
|
||||
setupReceiverSettingsFrame(module, channels, nChannels);
|
||||
break;
|
||||
case MODULE_MODE_REGISTER:
|
||||
setupRegisterFrame(module);
|
||||
@@ -509,7 +511,7 @@ bool Pxx2Pulses::setupFrame(uint8_t module)
|
||||
outputTelemetryBuffer.reset();
|
||||
}
|
||||
else {
|
||||
setupChannelsFrame(module);
|
||||
setupChannelsFrame(module, channels, nChannels);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -644,3 +646,111 @@ void Pxx2OtaUpdate::flashFirmware(const char * filename, ProgressHandler progres
|
||||
|
||||
resumePulses();
|
||||
}
|
||||
|
||||
static void* pxx2Init(uint8_t module)
|
||||
{
|
||||
if (module == INTERNAL_MODULE) {
|
||||
intmoduleFifo.clear();
|
||||
IntmoduleSerialDriver.init(&pxx2SerialInitParams);
|
||||
resetAccessAuthenticationCount();
|
||||
|
||||
#if defined(INTMODULE_HEARTBEAT)
|
||||
// use backup trigger (1 ms later)
|
||||
init_intmodule_heartbeat();
|
||||
#endif
|
||||
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_PERIOD);
|
||||
} else {
|
||||
#if defined(EXTMODULE_USART)
|
||||
extmoduleInvertedSerialStart(PXX2_HIGHSPEED_BAUDRATE);
|
||||
mixerSchedulerSetPeriod(EXTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
|
||||
#else
|
||||
return nullptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
return (void*)(uint32_t)module;
|
||||
}
|
||||
|
||||
static void pxx2DeInit(void* context)
|
||||
{
|
||||
uint32_t module = (uint32_t)context;
|
||||
|
||||
if (module == INTERNAL_MODULE) {
|
||||
IntmoduleSerialDriver.deinit();
|
||||
#if defined(INTMODULE_HEARTBEAT)
|
||||
stop_intmodule_heartbeat();
|
||||
#endif
|
||||
mixerSchedulerSetPeriod(INTERNAL_MODULE, 0);
|
||||
} else {
|
||||
mixerSchedulerSetPeriod(EXTERNAL_MODULE, 0);
|
||||
extmoduleStop();
|
||||
}
|
||||
}
|
||||
|
||||
static void* pxx2InitLowSpeed(uint8_t module)
|
||||
{
|
||||
if (module == EXTERNAL_MODULE) {
|
||||
extmoduleInvertedSerialStart(PXX2_LOWSPEED_BAUDRATE);
|
||||
mixerSchedulerSetPeriod(EXTERNAL_MODULE, PXX2_NO_HEARTBEAT_PERIOD);
|
||||
return (void*)EXTERNAL_MODULE;
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
static bool pxx2InternalSendNextFrame = true;
|
||||
|
||||
static void pxx2SetupPulses(void* context, int16_t* channels, uint8_t nChannels)
|
||||
{
|
||||
uint32_t module = (uint32_t)context;
|
||||
|
||||
if (module == INTERNAL_MODULE) {
|
||||
|
||||
pxx2InternalSendNextFrame = intmodulePulsesData.pxx2.setupFrame(
|
||||
INTERNAL_MODULE, channels, nChannels);
|
||||
|
||||
if (moduleState[INTERNAL_MODULE].mode == MODULE_MODE_SPECTRUM_ANALYSER ||
|
||||
moduleState[INTERNAL_MODULE].mode == MODULE_MODE_POWER_METER) {
|
||||
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_TOOLS_PERIOD);
|
||||
} else {
|
||||
mixerSchedulerSetPeriod(INTERNAL_MODULE, PXX2_PERIOD);
|
||||
}
|
||||
} else {
|
||||
extmodulePulsesData.pxx2.setupFrame(EXTERNAL_MODULE, channels, nChannels);
|
||||
}
|
||||
}
|
||||
|
||||
static void pxx2SendPulses(void* context)
|
||||
{
|
||||
uint32_t module = (uint32_t)context;
|
||||
|
||||
if (module == INTERNAL_MODULE) {
|
||||
if (pxx2InternalSendNextFrame) {
|
||||
IntmoduleSerialDriver.sendBuffer(intmodulePulsesData.pxx2.getData(),
|
||||
intmodulePulsesData.pxx2.getSize());
|
||||
}
|
||||
} else {
|
||||
#if defined(EXTMODULE_USART)
|
||||
extmoduleSendBuffer(extmodulePulsesData.pxx2.getData(),
|
||||
extmodulePulsesData.pxx2.getSize());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#include "hal/module_driver.h"
|
||||
|
||||
const etx_module_driver_t Pxx2ModuleDriver = {
|
||||
.protocol = PROTOCOL_CHANNELS_PXX2_HIGHSPEED,
|
||||
.init = pxx2Init,
|
||||
.deinit = pxx2DeInit,
|
||||
.setupPulses = pxx2SetupPulses,
|
||||
.sendPulses = pxx2SendPulses,
|
||||
};
|
||||
|
||||
const etx_module_driver_t Pxx2LowSpeedModuleDriver = {
|
||||
.protocol = PROTOCOL_CHANNELS_PXX2_LOWSPEED,
|
||||
.init = pxx2InitLowSpeed,
|
||||
.deinit = pxx2DeInit,
|
||||
.setupPulses = pxx2SetupPulses,
|
||||
.sendPulses = pxx2SendPulses,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user