Merge remote-tracking branch 'multiwii/upstream' into softserial
Conflicts: src/drv_softserial.c
This commit is contained in:
commit
e29c0ccea6
|
@ -652,6 +652,11 @@
|
|||
<FileType>1</FileType>
|
||||
<FilePath>.\src\drv_timer.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>drv_softserial.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>.\src\drv_softserial.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
@ -1478,6 +1483,11 @@
|
|||
<FileType>1</FileType>
|
||||
<FilePath>.\src\drv_timer.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>drv_softserial.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>.\src\drv_softserial.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
@ -2488,6 +2498,11 @@
|
|||
<FileType>1</FileType>
|
||||
<FilePath>.\src\drv_timer.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>drv_softserial.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>.\src\drv_softserial.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
|
@ -7,7 +7,6 @@ enum serialBitStatus {
|
|||
#define MAX_SOFTSERIAL_PORTS 2
|
||||
softSerial_t softSerialPorts[MAX_SOFTSERIAL_PORTS];
|
||||
|
||||
|
||||
softSerial_t* lookupSoftSerial(uint8_t reference)
|
||||
{
|
||||
assert_param(reference >= 0 && reference <= MAX_SOFTSERIAL_PORTS);
|
||||
|
|
Loading…
Reference in New Issue