Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 14:25:11 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2019-02-08 14:59:08 +01:00
parent debc43ab34
commit 0da578cad5
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/pulses/crossfire.cpp
View file

@ -50,20 +50,18 @@ uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses)
void setupPulsesCrossfire(uint8_t module) void setupPulsesCrossfire(uint8_t module)
{ {
if (telemetryProtocol == PROTOCOL_TELEMETRY_CROSSFIRE) { if (telemetryProtocol == PROTOCOL_TELEMETRY_CROSSFIRE) {
uint8_t * crossfire = modulePulsesData[module].crossfire.pulses; uint8_t * pulses = modulePulsesData[module].crossfire.pulses;
uint8_t len;
#if defined(LUA) #if defined(LUA)
if (outputTelemetryBufferTrigger != 0x00 && outputTelemetryBufferSize > 0) { if (outputTelemetryBufferTrigger != 0x00 && outputTelemetryBufferSize > 0) {
memcpy(crossfire, outputTelemetryBuffer, outputTelemetryBufferSize); memcpy(pulses, outputTelemetryBuffer, outputTelemetryBufferSize);
len = outputTelemetryBufferSize; modulePulsesData[module].crossfire.length = outputTelemetryBufferSize;
outputTelemetryBufferTrigger = 0x00; outputTelemetryBufferTrigger = 0x00;
outputTelemetryBufferSize = 0; outputTelemetryBufferSize = 0;
} }
else else
#endif #endif
{ {
len = createCrossfireChannelsFrame(crossfire, &channelOutputs[g_model.moduleData[module].channelsStart]); modulePulsesData[module].crossfire.length = createCrossfireChannelsFrame(pulses, &channelOutputs[g_model.moduleData[module].channelsStart]);
} }
sportSendBuffer(crossfire, len);
} }
} }

1
radio/src/pulses/pulses.h
View file

@ -122,6 +122,7 @@ PACK(struct Dsm2TimerPulsesData {
#define CROSSFIRE_FRAME_MAXLEN 64 #define CROSSFIRE_FRAME_MAXLEN 64
PACK(struct CrossfirePulsesData { PACK(struct CrossfirePulsesData {
uint8_t pulses[CROSSFIRE_FRAME_MAXLEN]; uint8_t pulses[CROSSFIRE_FRAME_MAXLEN];
uint8_t length;
}); });
union ModulePulsesData { union ModulePulsesData {

4
radio/src/targets/taranis/board.h
View file

@ -179,11 +179,11 @@ uint32_t isBootloaderStart(const uint8_t * buffer);
#else #else
#define IS_UART_MODULE(port) (false) #define IS_UART_MODULE(port) (false)
#endif #endif
void init_no_pulses(uint8_t module);
void disable_no_pulses(uint8_t module);
void init_ppm(uint8_t module); void init_ppm(uint8_t module);
void disable_ppm(uint8_t module); void disable_ppm(uint8_t module);
void intmoduleSendNextFrame(); void intmoduleSendNextFrame();
void extmoduleSendNextFrame();
void init_pxx2(uint8_t module); void init_pxx2(uint8_t module);
void disable_pxx2(uint8_t module); void disable_pxx2(uint8_t module);
void init_pxx(uint8_t module); void init_pxx(uint8_t module);

3
radio/src/targets/taranis/extmodule_driver.cpp
View file

@ -273,6 +273,9 @@ void extmoduleSendNextFrame()
EXTMODULE_TIMER_DMA_STREAM->NDTR = modulePulsesData[EXTERNAL_MODULE].dsm2.ptr - modulePulsesData[EXTERNAL_MODULE].dsm2.pulses; EXTMODULE_TIMER_DMA_STREAM->NDTR = modulePulsesData[EXTERNAL_MODULE].dsm2.ptr - modulePulsesData[EXTERNAL_MODULE].dsm2.pulses;
EXTMODULE_TIMER_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA EXTMODULE_TIMER_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA
} }
else if (moduleSettings[EXTERNAL_MODULE].protocol == PROTOCOL_CHANNELS_CROSSFIRE) {
sportSendBuffer(modulePulsesData[EXTERNAL_MODULE].crossfire.pulses, modulePulsesData[EXTERNAL_MODULE].crossfire.length);
}
else { else {
EXTMODULE_TIMER->DIER |= TIM_DIER_CC2IE; EXTMODULE_TIMER->DIER |= TIM_DIER_CC2IE;
} }

8
radio/src/tasks.cpp
View file

@ -83,12 +83,10 @@ void sendSynchronousPulses()
for (uint8_t module = 0; module < NUM_MODULES; module++) { for (uint8_t module = 0; module < NUM_MODULES; module++) {
uint8_t protocol = moduleSettings[module].protocol; uint8_t protocol = moduleSettings[module].protocol;
if (isProtocolSynchronous(protocol) && setupPulses(module)) { if (isProtocolSynchronous(protocol) && setupPulses(module)) {
if (module == INTERNAL_MODULE) { if (module == INTERNAL_MODULE)
intmoduleSendNextFrame(); intmoduleSendNextFrame();
} else
else { extmoduleSendNextFrame();
// TODO
}
} }
} }
} }