piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

X9D pulses

Browse Source
This commit is contained in:
Bertrand Songis
2019-02-09 13:19:25 +01:00
parent f17212f9b7
commit 07857cb615
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/pulses.h
+2 -5
View File
@@ -130,12 +130,9 @@ PACK(struct CrossfirePulsesData {
union InternalModulePulsesData {
#if defined(PXX1)
#if defined(INTMODULE_USART) || defined(EXTMODULE_USART)
#if defined(INTMODULE_USART)
UartPxx1Pulses pxx_uart;
#endif
#if defined(PPM_PIN_SERIAL)
SerialPxx1Pulses pxx;
#elif !defined(INTMODULE_USART) || !defined(EXTMODULE_USART)
#else
PwmPxx1Pulses pxx;
#endif
#endif
radio/src/targets/taranis/intmodule_pulses_driver.cpp
+6 -1
View File
@@ -34,7 +34,11 @@ void intmoduleStop()
void intmoduleSendNextFrame()
{
if (moduleSettings[INTERNAL_MODULE].protocol == PROTOCOL_CHANNELS_PXX1) {
if (0) {
}
#if defined(PXX1)
else if (moduleSettings[INTERNAL_MODULE].protocol == PROTOCOL_CHANNELS_PXX1) {
INTMODULE_TIMER->CCR2 = intmodulePulsesData.pxx.getLast() - 4000; // 2mS in advance
INTMODULE_DMA_STREAM->CR &= ~DMA_SxCR_EN; // Disable DMA
INTMODULE_DMA_STREAM->CR |= INTMODULE_DMA_CHANNEL | DMA_SxCR_DIR_0 | DMA_SxCR_MINC | DMA_SxCR_PSIZE_0 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PL_0 | DMA_SxCR_PL_1;
@@ -43,6 +47,7 @@ void intmoduleSendNextFrame()
INTMODULE_DMA_STREAM->NDTR = intmodulePulsesData.pxx.getSize();
INTMODULE_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA
}
#endif
#if defined(TARANIS_INTERNAL_PPM)
else if (moduleSettings[INTERNAL_MODULE].protocol == PROTOCOL_CHANNELS_PPM) {
INTMODULE_TIMER->CCR3 = GET_MODULE_PPM_DELAY(INTERNAL_MODULE) * 2;