Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Cleanup OLIMEXINO softserial loopback support.

Browse source
This commit is contained in:
Dominic Clifton 2014-05-02 21:17:18 +01:00
parent ef06d438e4
commit 89b9a0492f
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.c
View file

@ -1,5 +1,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#include "platform.h" #include "platform.h"
@ -12,7 +13,7 @@
#include "drivers/timer_common.h" #include "drivers/timer_common.h"
#include "drivers/serial_common.h" #include "drivers/serial_common.h"
#include "drivers/serial_softserial.h" #include "drivers/serial_softserial.h"
#include "drivers/serial_uart.h" #include "drivers/serial_uart_common.h"
#include "drivers/accgyro_common.h" #include "drivers/accgyro_common.h"
#include "drivers/pwm_common.h" #include "drivers/pwm_common.h"
#include "drivers/adc_common.h" #include "drivers/adc_common.h"
@ -43,6 +44,8 @@
#include "build_config.h" #include "build_config.h"
//#define USE_SOFTSERIAL_FOR_MAIN_PORT
extern rcReadRawDataPtr rcReadRawFunc; extern rcReadRawDataPtr rcReadRawFunc;
extern uint32_t previousTime; extern uint32_t previousTime;
@ -174,8 +177,10 @@ int main(void)
#ifndef FY90Q #ifndef FY90Q
if (canSoftwareSerialBeUsed()) { if (canSoftwareSerialBeUsed()) {
//mcfg.softserial_baudrate = 19200; // Uncomment to override config value
#if defined(USE_SOFTSERIAL_FOR_MAIN_PORT) || (0)
masterConfig.serialConfig.softserial_baudrate = 19200;
#endif
setupSoftSerialPrimary(masterConfig.serialConfig.softserial_baudrate, masterConfig.serialConfig.softserial_1_inverted); setupSoftSerialPrimary(masterConfig.serialConfig.softserial_baudrate, masterConfig.serialConfig.softserial_1_inverted);
setupSoftSerialSecondary(masterConfig.serialConfig.softserial_2_inverted); setupSoftSerialSecondary(masterConfig.serialConfig.softserial_2_inverted);
@ -184,9 +189,14 @@ int main(void)
serialPrint(loopbackPort1, "SOFTSERIAL 1 - LOOPBACK ENABLED\r\n"); serialPrint(loopbackPort1, "SOFTSERIAL 1 - LOOPBACK ENABLED\r\n");
loopbackPort2 = (serialPort_t*)&(softSerialPorts[1]); loopbackPort2 = (serialPort_t*)&(softSerialPorts[1]);
#ifndef OLIMEXINO // PB0/D27 and PB1/D28 internally connected so this would result in a continuous stream of data
serialPrint(loopbackPort2, "SOFTSERIAL 2 - LOOPBACK ENABLED\r\n"); serialPrint(loopbackPort2, "SOFTSERIAL 2 - LOOPBACK ENABLED\r\n");
#endif #endif
//core.mainport = (serialPort_t*)&(softSerialPorts[0]); // Uncomment to switch the main port to use softserial. #endif
#ifdef USE_SOFTSERIAL_FOR_MAIN_PORT
serialPorts.mainport = (serialPort_t*)&(softSerialPorts[0]); // Uncomment to switch the main port to use softserial.
#endif
} }
#endif #endif