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

Compilation fix

Browse source
This commit is contained in:
Bertrand Songis 2016-09-11 23:21:42 +02:00
parent 8a31c1d555
commit 0f217b3507
5 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/cli.cpp
View file

@ -713,18 +713,16 @@ int cliGps(const char ** argv)
{
int baudrate = 0;
#if defined(DEBUG)
if (argv[1][0] == '$') {
// send command to GPS
gpsSendFrame(argv[1]);
}
#if defined(DEBUG)
else if (!strcmp(argv[1], "trace")) {
gpsTraceEnabled = !gpsTraceEnabled;
}
else
#endif
if (toInt(argv, 1, &baudrate) > 0 && baudrate > 0) {
else if (toInt(argv, 1, &baudrate) > 0 && baudrate > 0) {
gpsInit(baudrate);
serialPrint("GPS baudrate set to %d", baudrate);
}

3
radio/src/gps.cpp
View file

@ -322,7 +322,6 @@ void gpsWakeup()
}
}
#if defined(DEBUG)
char hex(uint8_t b) {
return b > 9 ? b + 'A' - 10 : b + '0';
}
@ -344,5 +343,3 @@ void gpsSendFrame(const char * frame)
gpsSendByte('\n');
TRACE("*%02x", parity);
}
#endif // #if defined(DEBUG)

2
radio/src/gps.h
View file

@ -40,8 +40,6 @@ struct gpsdata_t
extern gpsdata_t gpsData;
void gpsWakeup();
#if defined(DEBUG)
void gpsSendFrame(const char * frame);
#endif
#endif // _GPS_H_

4
radio/src/targets/horus/board.h
View file

@ -403,9 +403,9 @@ void hapticOn(uint32_t pwmPercent);
void gpsInit(uint32_t baudrate);
uint8_t gpsGetByte(uint8_t * byte);
#if defined(DEBUG)
extern uint8_t gpsTraceEnabled;
void gpsSendByte(uint8_t byte);
extern uint8_t gpsTraceEnabled;
#endif
void gpsSendByte(uint8_t byte);
// Second serial port driver
#define SERIAL2

7
radio/src/targets/horus/gps_driver.cpp
View file

@ -62,6 +62,8 @@ void gpsInit(uint32_t baudrate)
#if defined(DEBUG)
uint8_t gpsTraceEnabled = false;
#endif
Fifo<uint8_t, 64> gpsTxFifo;
void gpsSendByte(uint8_t byte)
@ -71,12 +73,8 @@ void gpsSendByte(uint8_t byte)
USART_ITConfig(GPS_USART, USART_IT_TXE, ENABLE);
}
#endif // #if defined(DEBUG)
extern "C" void GPS_USART_IRQHandler(void)
{
#if defined(DEBUG)
// Send
if (USART_GetITStatus(GPS_USART, USART_IT_TXE) != RESET) {
uint8_t txchar;
@ -88,7 +86,6 @@ extern "C" void GPS_USART_IRQHandler(void)
USART_ITConfig(GPS_USART, USART_IT_TXE, DISABLE);
}
}
#endif
// Receive
uint32_t status = GPS_USART->SR;