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 'origin/bfdev-osd-cms-separation-poc' into bfdev-osd-cms-separation-poc

Browse source
This commit is contained in:
jflyper 2016-10-20 23:27:08 +09:00
commit b2a682b2ea
6 changed files with 254 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,10 @@ 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