Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Code Issues Wiki Activity

First cut of configurable serial port functionality.

Browse source 
Currently port usage is hard-coded to the default port layout, cli
commands are coming in a future commit.

This decouples all code from the global 'serialPorts' structure which
has been removed.  Any code that needs to use a serial port can use
findOpenSerialPort() and openSerialPort() and maintain it's own
reference to the port.

Ports can switch between functions.  e.g. by default
cli/msp/telemetry/gps
passthrough all use USART1.  Each port maintains it's current function.
see begin/endSerialPortFunction.

There are only certain combinations of serial port functions that are
supported, these are listed in serialPortFunctionScenario_e.

This commit also adds a few 'static' keywords to variables that should
have been.

There a a few other minor fixes and tweaks to various bits of code that
this uncovered too.
This commit is contained in:
Dominic Clifton 2014-05-08 21:46:09 +01:00
parent 533a1f9e48
commit 1777d8feda
33 changed files with 787 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/serial_msp.c
View file

@ -39,6 +39,8 @@
#include "serial_msp.h"
static serialPort_t *mspPort;
extern uint16_t cycleTime; // FIXME dependency on mw.c
extern uint16_t rssi; // FIXME dependency on mw.c
extern int16_t debug[4]; // FIXME dependency on mw.c
@ -162,16 +164,16 @@ void serialize32(uint32_t a)
{
static uint8_t t;
t = a;
serialWrite(serialPorts.mainport, t);
serialWrite(mspPort, t);
checksum ^= t;
t = a >> 8;
serialWrite(serialPorts.mainport, t);
serialWrite(mspPort, t);
checksum ^= t;
t = a >> 16;
serialWrite(serialPorts.mainport, t);
serialWrite(mspPort, t);
checksum ^= t;
t = a >> 24;
serialWrite(serialPorts.mainport, t);
serialWrite(mspPort, t);
checksum ^= t;
}
@ -179,16 +181,16 @@ void serialize16(int16_t a)
{
static uint8_t t;
t = a;
serialWrite(serialPorts.mainport, t);
serialWrite(mspPort, t);
checksum ^= t;
t = a >> 8 & 0xff;
serialWrite(serialPorts.mainport, t);
serialWrite(mspPort, t);
checksum ^= t;
}
void serialize8(uint8_t a)
{
serialWrite(serialPorts.mainport, a);
serialWrite(mspPort, a);
checksum ^= a;
}
@ -275,7 +277,7 @@ reset:
}
}
void mspInit(void)
void mspInit(serialConfig_t *serialConfig)
{
int idx;
@ -313,6 +315,11 @@ void mspInit(void)
if (feature(FEATURE_TELEMETRY && masterConfig.telemetryConfig.telemetry_switch))
availableBoxes[idx++] = BOXTELEMETRY;
numberBoxItems = idx;
mspPort = findOpenSerialPort(FUNCTION_MSP);
if (!mspPort) {
mspPort = openSerialPort(FUNCTION_MSP, NULL, serialConfig->msp_baudrate, MODE_RXTX, SERIAL_NOT_INVERTED);
}
}
static void evaluateCommand(void)
@ -713,8 +720,8 @@ void mspProcess(void)
HEADER_CMD,
} c_state = IDLE;
while (serialTotalBytesWaiting(serialPorts.mainport)) {
c = serialRead(serialPorts.mainport);
while (serialTotalBytesWaiting(mspPort)) {
c = serialRead(mspPort);
if (c_state == IDLE) {
c_state = (c == '$') ? HEADER_START : IDLE;