Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

Touch ups

Browse source
This commit is contained in:
jflyper 2016-10-20 23:49:24 +09:00
parent b2a682b2ea
commit 7f2ebbd2fa
6 changed files with 9 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/msp/msp_serial.h
View file

@ -60,10 +60,5 @@ void mspSerialInit(mspProcessCommandFnPtr mspProcessCommandFn);
void mspSerialProcess(mspEvaluateNonMspData_e evaluateNonMspData);
void mspSerialAllocatePorts(void);
void mspSerialReleasePortIfAllocated(struct serialPort_s *serialPort);
<<<<<<< HEAD:src/main/msp/msp_serial.h
void mspSerialPushInit(mspPushCommandFnPtr mspPushCommandFn);
void mspSerialPush(uint8_t, uint8_t *, int);
=======
void mspSerialPush(int, uint8_t *, int);
>>>>>>> origin/bfdev-osd-cms-separation-poc:src/main/io/serial_msp.h