mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-24 16:55:36 +03:00
Merge branch 'master' into betaflight
Conflicts: src/main/blackbox/blackbox_io.c src/main/drivers/serial_usb_vcp.c src/main/flight/imu.c src/main/mw.c src/main/target/CC3D/target.h
This commit is contained in:
commit
4b3ba927e9
50 changed files with 544 additions and 250 deletions
|
@ -36,7 +36,7 @@ typedef enum portOptions_t {
|
|||
|
||||
typedef void (*serialReceiveCallbackPtr)(uint16_t data); // used by serial drivers to return frames to app
|
||||
|
||||
typedef struct serialPort {
|
||||
typedef struct serialPort_s {
|
||||
|
||||
const struct serialPortVTable *vTable;
|
||||
|
||||
|
@ -62,7 +62,8 @@ typedef struct serialPort {
|
|||
struct serialPortVTable {
|
||||
void (*serialWrite)(serialPort_t *instance, uint8_t ch);
|
||||
|
||||
uint8_t (*serialTotalBytesWaiting)(serialPort_t *instance);
|
||||
uint8_t (*serialTotalRxWaiting)(serialPort_t *instance);
|
||||
uint8_t (*serialTotalTxFree)(serialPort_t *instance);
|
||||
|
||||
uint8_t (*serialRead)(serialPort_t *instance);
|
||||
|
||||
|
@ -79,7 +80,8 @@ struct serialPortVTable {
|
|||
};
|
||||
|
||||
void serialWrite(serialPort_t *instance, uint8_t ch);
|
||||
uint8_t serialTotalBytesWaiting(serialPort_t *instance);
|
||||
uint8_t serialRxBytesWaiting(serialPort_t *instance);
|
||||
uint8_t serialTxBytesFree(serialPort_t *instance);
|
||||
uint8_t serialRead(serialPort_t *instance);
|
||||
void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate);
|
||||
void serialSetMode(serialPort_t *instance, portMode_t mode);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue