rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'multiwii/upstream' into softserial 

Conflicts:
	src/drv_softserial.c
This commit is contained in:
Dominic Clifton 2013-08-28 19:01:22 +01:00
parent 4d00f51ddc 77a241bd5f
commit e29c0ccea6
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
baseflight.uvproj
View File

@ -652,6 +652,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\src\drv_timer.c</FilePath> <FilePath>.\src\drv_timer.c</FilePath>
</File> </File>
<File>
<FileName>drv_softserial.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\drv_softserial.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -1478,6 +1483,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\src\drv_timer.c</FilePath> <FilePath>.\src\drv_timer.c</FilePath>
</File> </File>
<File>
<FileName>drv_softserial.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\drv_softserial.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -2488,6 +2498,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\src\drv_timer.c</FilePath> <FilePath>.\src\drv_timer.c</FilePath>
</File> </File>
<File>
<FileName>drv_softserial.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\drv_softserial.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>

1
src/drv_softserial.c
View File

@ -7,7 +7,6 @@ enum serialBitStatus {
#define MAX_SOFTSERIAL_PORTS 2 #define MAX_SOFTSERIAL_PORTS 2
softSerial_t softSerialPorts[MAX_SOFTSERIAL_PORTS]; softSerial_t softSerialPorts[MAX_SOFTSERIAL_PORTS];
softSerial_t* lookupSoftSerial(uint8_t reference) softSerial_t* lookupSoftSerial(uint8_t reference)
{ {
assert_param(reference >= 0 && reference <= MAX_SOFTSERIAL_PORTS); assert_param(reference >= 0 && reference <= MAX_SOFTSERIAL_PORTS);