mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-19 06:15:16 +03:00
Fixed issue #15, new uart building under gcc toolchain, thanks!
git-svn-id: https://afrodevices.googlecode.com/svn/trunk/baseflight@383 7c89a4a9-59b9-e629-4cfe-3a2d53b20e61
This commit is contained in:
parent
cbb580f753
commit
1441d46323
3 changed files with 3 additions and 7 deletions
|
@ -38,9 +38,6 @@ typedef struct {
|
||||||
portmode_t mode;
|
portmode_t mode;
|
||||||
} serialPort_t;
|
} serialPort_t;
|
||||||
|
|
||||||
extern serialPort_t serialPort1;
|
|
||||||
extern serialPort_t serialPort2;
|
|
||||||
|
|
||||||
serialPort_t *uartOpen(USART_TypeDef *USARTx, uartReceiveCallbackPtr callback, uint32_t baudRate, portmode_t mode);
|
serialPort_t *uartOpen(USART_TypeDef *USARTx, uartReceiveCallbackPtr callback, uint32_t baudRate, portmode_t mode);
|
||||||
void uartChangeBaud(serialPort_t *s, uint32_t baudRate);
|
void uartChangeBaud(serialPort_t *s, uint32_t baudRate);
|
||||||
bool isUartAvailable(serialPort_t *s);
|
bool isUartAvailable(serialPort_t *s);
|
||||||
|
|
|
@ -13,7 +13,7 @@ extern uint16_t spektrumReadRawRC(uint8_t chan);
|
||||||
// gcc/GNU version
|
// gcc/GNU version
|
||||||
static void _putc(void *p, char c)
|
static void _putc(void *p, char c)
|
||||||
{
|
{
|
||||||
uartWrite(c);
|
uartWrite(core.mainport, c);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
// keil/armcc version
|
// keil/armcc version
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "board.h"
|
#include "board.h"
|
||||||
|
#include "mw.h"
|
||||||
#ifdef USE_LAME_PRINTF
|
#ifdef USE_LAME_PRINTF
|
||||||
#define PRINTF_LONG_SUPPORT
|
#define PRINTF_LONG_SUPPORT
|
||||||
|
|
||||||
|
@ -227,7 +228,7 @@ void tfp_printf(char *fmt, ...)
|
||||||
va_start(va, fmt);
|
va_start(va, fmt);
|
||||||
tfp_format(stdout_putp, stdout_putf, fmt, va);
|
tfp_format(stdout_putp, stdout_putf, fmt, va);
|
||||||
va_end(va);
|
va_end(va);
|
||||||
while (!isUartTransmitEmpty());
|
while (!isUartTransmitEmpty(core.mainport));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void putcp(void *p, char c)
|
static void putcp(void *p, char c)
|
||||||
|
@ -235,8 +236,6 @@ static void putcp(void *p, char c)
|
||||||
*(*((char **) p))++ = c;
|
*(*((char **) p))++ = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void tfp_sprintf(char *s, char *fmt, ...)
|
void tfp_sprintf(char *s, char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list va;
|
va_list va;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue