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

Merge remote-tracking branch 'betaflight/master' into bfdev-fix-softserial-f7

Browse source
This commit is contained in:
jflyper 2017-05-07 12:12:10 +09:00
commit 2b1308a556
1458 changed files with 1172160 additions and 14322 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/drivers/serial_softserial.c
View file

@ -34,16 +34,16 @@
#include "common/utils.h"
#include "config/config_master.h"
#include "nvic.h"
#include "system.h"
#include "io.h"
#include "drivers/nvic.h"
#include "drivers/system.h"
#include "drivers/io.h"
#include "timer.h"
#include "serial.h"
#include "serial_softserial.h"
#include "fc/config.h" //!!TODO remove this dependency
#define RX_TOTAL_BITS 10
#define TX_TOTAL_BITS 10
@ -264,7 +264,7 @@ serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallb
softSerial->timerHardware = timerTx;
softSerial->txIO = txIO;
softSerial->rxIO = txIO;
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(portIndex) + RESOURCE_SOFT_OFFSET);
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(portIndex + RESOURCE_SOFT_OFFSET));
} else {
if (mode & MODE_RX) {
// Need a pin & a timer on RX
@ -273,7 +273,7 @@ serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallb
softSerial->rxIO = rxIO;
softSerial->timerHardware = timerRx;
IOInit(rxIO, OWNER_SERIAL_RX, RESOURCE_INDEX(portIndex) + RESOURCE_SOFT_OFFSET);
IOInit(rxIO, OWNER_SERIAL_RX, RESOURCE_INDEX(portIndex + RESOURCE_SOFT_OFFSET));
}
if (mode & MODE_TX) {
@ -292,7 +292,7 @@ serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallb
// Duplex
softSerial->exTimerHardware = timerTx;
}
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(portIndex) + RESOURCE_SOFT_OFFSET);
IOInit(txIO, OWNER_SERIAL_TX, RESOURCE_INDEX(portIndex + RESOURCE_SOFT_OFFSET));
}
}