From 3d6c971197970f76834387c5841e83b2969e13a1 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 12 Mar 2022 08:59:43 +0100 Subject: [PATCH] Use normal soft-serial function for AFHDS3 --- radio/src/pulses/pulses.cpp | 9 +++++---- .../targets/common/arm/stm32/extmodule_driver.cpp | 14 +------------- .../targets/common/arm/stm32/extmodule_driver.h | 9 ++------- radio/src/targets/simu/module_drivers.cpp | 3 +-- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp index 4cd50f240..6226fea3a 100755 --- a/radio/src/pulses/pulses.cpp +++ b/radio/src/pulses/pulses.cpp @@ -678,15 +678,16 @@ void extmoduleSendNextFrame() extmoduleSendBuffer(extmodulePulsesData.afhds3.getData(), extmodulePulsesData.afhds3.getSize()); #else - extmoduleSendNextFrameAFHDS3(extmodulePulsesData.afhds3.getData(), - extmodulePulsesData.afhds3.getSize()); + extmoduleSendNextFrameSoftSerial(extmodulePulsesData.afhds3.getData(), + extmodulePulsesData.afhds3.getSize(), + false); #endif break; #endif #if defined(SBUS) || defined(DSM2) || defined(MULTIMODULE) case PROTOCOL_CHANNELS_SBUS: - extmoduleSendNextFrameSoftSerial100kbit( + extmoduleSendNextFrameSoftSerial( extmodulePulsesData.dsm2.pulses, extmodulePulsesData.dsm2.ptr - extmodulePulsesData.dsm2.pulses, GET_SBUS_POLARITY(EXTERNAL_MODULE)); @@ -696,7 +697,7 @@ void extmoduleSendNextFrame() case PROTOCOL_CHANNELS_DSM2_DSM2: case PROTOCOL_CHANNELS_DSM2_DSMX: case PROTOCOL_CHANNELS_MULTIMODULE: - extmoduleSendNextFrameSoftSerial100kbit( + extmoduleSendNextFrameSoftSerial( extmodulePulsesData.dsm2.pulses, extmodulePulsesData.dsm2.ptr - extmodulePulsesData.dsm2.pulses); break; diff --git a/radio/src/targets/common/arm/stm32/extmodule_driver.cpp b/radio/src/targets/common/arm/stm32/extmodule_driver.cpp index 12dca7046..2c0d6fdd3 100644 --- a/radio/src/targets/common/arm/stm32/extmodule_driver.cpp +++ b/radio/src/targets/common/arm/stm32/extmodule_driver.cpp @@ -202,19 +202,7 @@ void extmoduleSerialStart() stm32_pulse_config_output(&extmoduleTimer, &ocInit); } -#if defined(AFHDS3) && !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)) -void extmoduleSendNextFrameAFHDS3(const void* pulses, uint16_t length) -{ - if (!stm32_pulse_stop_if_running(&extmoduleTimer)) - return; - - // Start DMA request and re-enable timer - stm32_pulse_start_dma_req(&extmoduleTimer, pulses, length); -} -#endif - -void extmoduleSendNextFrameSoftSerial100kbit(const void* pulses, uint16_t length, - bool polarity) +void extmoduleSendNextFrameSoftSerial(const void* pulses, uint16_t length, bool polarity) { if (!stm32_pulse_stop_if_running(&extmoduleTimer)) return; diff --git a/radio/src/targets/common/arm/stm32/extmodule_driver.h b/radio/src/targets/common/arm/stm32/extmodule_driver.h index f7324dacb..0146e0af1 100644 --- a/radio/src/targets/common/arm/stm32/extmodule_driver.h +++ b/radio/src/targets/common/arm/stm32/extmodule_driver.h @@ -34,16 +34,11 @@ void extmoduleSendNextFramePxx1(const void* pulses, uint16_t length); // Soft serial on PPM pin void extmoduleSerialStart(); -#if defined(AFHDS3) && !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)) -void extmoduleSendNextFrameAFHDS3(const void* dataPtr, uint16_t dataSize); -#endif - void extmoduleSendNextFramePpm(void* pulses, uint16_t length, uint16_t ppm_delay, bool polarity); -void extmoduleSendNextFrameSoftSerial100kbit(const void* pulses, - uint16_t length, - bool polarity = true); +void extmoduleSendNextFrameSoftSerial(const void* pulses, uint16_t length, + bool polarity = true); // Bitbang serial void extmoduleSendInvertedByte(uint8_t byte); diff --git a/radio/src/targets/simu/module_drivers.cpp b/radio/src/targets/simu/module_drivers.cpp index 112de31ee..39f7e9821 100644 --- a/radio/src/targets/simu/module_drivers.cpp +++ b/radio/src/targets/simu/module_drivers.cpp @@ -44,8 +44,7 @@ void extmodulePxx1SerialStart() {} void extmodulePxx1PulsesStart() {} void extmoduleSendInvertedByte(uint8_t) {} void extmoduleSendNextFramePxx1(void const*, unsigned short) {} -void extmoduleSendNextFrameAFHDS3(void const*, unsigned short) {} -void extmoduleSendNextFrameSoftSerial100kbit(void const*, unsigned short, bool) {} +void extmoduleSendNextFrameSoftSerial(void const*, unsigned short, bool) {} void extmoduleSendNextFramePpm(void*, unsigned short, unsigned short, bool) {} void init_trainer_ppm() {}