From 19a58558e569c635084b5cfb9ec9c324dbfc4bfb Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 20 Nov 2021 09:45:54 +0100 Subject: [PATCH] Use void* for pulses --- radio/src/targets/horus/extmodule_driver.cpp | 8 ++++---- radio/src/targets/horus/extmodule_driver.h | 6 +++--- radio/src/targets/taranis/extmodule_driver.cpp | 8 ++++---- radio/src/targets/taranis/extmodule_driver.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/radio/src/targets/horus/extmodule_driver.cpp b/radio/src/targets/horus/extmodule_driver.cpp index 5d88cefa6..5f3c2f1c9 100644 --- a/radio/src/targets/horus/extmodule_driver.cpp +++ b/radio/src/targets/horus/extmodule_driver.cpp @@ -208,7 +208,7 @@ void extmoduleSerialStart() NVIC_SetPriority(EXTMODULE_TIMER_DMA_STREAM_IRQn, 7); } -static void extmoduleSendNextFramePpm(uint32_t* pulses, uint16_t length, +static void extmoduleSendNextFramePpm(void* pulses, uint16_t length, uint16_t trailing_pulse) { #if defined(PCBX10) || PCBREV >= 13 @@ -243,7 +243,7 @@ static void extmoduleSendNextFramePpm(uint32_t* pulses, uint16_t length, } #if defined(PXX1) -void extmoduleSendNextFramePxx1(const uint32_t* pulses, uint16_t length) +void extmoduleSendNextFramePxx1(const void* pulses, uint16_t length) { if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN) return; @@ -264,7 +264,7 @@ void extmoduleSendNextFramePxx1(const uint32_t* pulses, uint16_t length) #endif #if defined(AFHDS3) && !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)) -void extmoduleSendNextFrameAFHDS3(const uint16_t* dataPtr, uint16_t dataSize) +void extmoduleSendNextFrameAFHDS3(const void* dataPtr, uint16_t dataSize) { if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN) return; @@ -283,7 +283,7 @@ void extmoduleSendNextFrameAFHDS3(const uint16_t* dataPtr, uint16_t dataSize) } #endif -void extmoduleSendNextFrameSoftSerial100kbit(const uint32_t* pulses, uint16_t length) +void extmoduleSendNextFrameSoftSerial100kbit(const void* pulses, uint16_t length) { if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN) return; diff --git a/radio/src/targets/horus/extmodule_driver.h b/radio/src/targets/horus/extmodule_driver.h index 6739c51fa..0420d19c9 100644 --- a/radio/src/targets/horus/extmodule_driver.h +++ b/radio/src/targets/horus/extmodule_driver.h @@ -28,17 +28,17 @@ void extmodulePpmStart(); #if defined(PXX1) void extmodulePxx1PulsesStart(); -void extmoduleSendNextFramePxx1(const uint32_t* pulses, uint16_t length); +void extmoduleSendNextFramePxx1(const void* pulses, uint16_t length); #endif // Soft serial on PPM pin void extmoduleSerialStart(); #if defined(AFHDS3) && !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)) -void extmoduleSendNextFrameAFHDS3(const uint16_t* dataPtr, uint16_t dataSize); +void extmoduleSendNextFrameAFHDS3(const void* dataPtr, uint16_t dataSize); #endif -void extmoduleSendNextFrameSoftSerial100kbit(const uint32_t* pulses, uint16_t length); +void extmoduleSendNextFrameSoftSerial100kbit(const void* pulses, uint16_t length); // Bitbang serial void extmoduleSendInvertedByte(uint8_t byte); diff --git a/radio/src/targets/taranis/extmodule_driver.cpp b/radio/src/targets/taranis/extmodule_driver.cpp index f8adcd1a5..de4acc273 100644 --- a/radio/src/targets/taranis/extmodule_driver.cpp +++ b/radio/src/targets/taranis/extmodule_driver.cpp @@ -162,7 +162,7 @@ void extmodulePxx1SerialStart() } #endif -static void extmoduleSendNextFramePpm(uint16_t* pulses, uint16_t length, +static void extmoduleSendNextFramePpm(const void* pulses, uint16_t length, uint16_t trailing_pulse) { EXTMODULE_TIMER->CCR1 = GET_MODULE_PPM_DELAY(EXTERNAL_MODULE) * 2; @@ -184,7 +184,7 @@ static void extmoduleSendNextFramePpm(uint16_t* pulses, uint16_t length, } #if defined(PXX1) -void extmoduleSendNextFramePxx1(const uint16_t* pulses, uint16_t length) +void extmoduleSendNextFramePxx1(const void* pulses, uint16_t length) { if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN) return; @@ -206,7 +206,7 @@ void extmoduleSendNextFramePxx1(const uint16_t* pulses, uint16_t length) #endif #if defined(AFHDS3) && !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)) -void extmoduleSendNextFrameAFHDS3(const uint16_t* dataPtr, uint16_t dataSize) +void extmoduleSendNextFrameAFHDS3(const void* dataPtr, uint16_t dataSize) { if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN) return; @@ -225,7 +225,7 @@ void extmoduleSendNextFrameAFHDS3(const uint16_t* dataPtr, uint16_t dataSize) } #endif -void extmoduleSendNextFrameSoftSerial100kbit(const uint16_t* pulses, uint16_t length) +void extmoduleSendNextFrameSoftSerial100kbit(const void* pulses, uint16_t length) { if (EXTMODULE_TIMER_DMA_STREAM->CR & DMA_SxCR_EN) return; diff --git a/radio/src/targets/taranis/extmodule_driver.h b/radio/src/targets/taranis/extmodule_driver.h index 8f83f2d9b..0420d19c9 100644 --- a/radio/src/targets/taranis/extmodule_driver.h +++ b/radio/src/targets/taranis/extmodule_driver.h @@ -28,17 +28,17 @@ void extmodulePpmStart(); #if defined(PXX1) void extmodulePxx1PulsesStart(); -void extmoduleSendNextFramePxx1(const uint16_t* pulses, uint16_t length); +void extmoduleSendNextFramePxx1(const void* pulses, uint16_t length); #endif // Soft serial on PPM pin void extmoduleSerialStart(); #if defined(AFHDS3) && !(defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)) -void extmoduleSendNextFrameAFHDS3(const uint16_t* dataPtr, uint16_t dataSize); +void extmoduleSendNextFrameAFHDS3(const void* dataPtr, uint16_t dataSize); #endif -void extmoduleSendNextFrameSoftSerial100kbit(const uint16_t* pulses, uint16_t length); +void extmoduleSendNextFrameSoftSerial100kbit(const void* pulses, uint16_t length); // Bitbang serial void extmoduleSendInvertedByte(uint8_t byte);