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

Compilation fixes

Browse source
This commit is contained in:
Bertrand Songis 2018-11-28 18:53:44 +01:00
parent ae91903d57
commit 9c096b76b3
5 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/targets/sky9x/board.h
View file

@ -261,6 +261,8 @@ void init_pxx(uint32_t port);
void disable_pxx(uint32_t port); void disable_pxx(uint32_t port);
void init_serial(uint32_t port, uint32_t baudrate, uint32_t period_half_us); void init_serial(uint32_t port, uint32_t baudrate, uint32_t period_half_us);
void disable_serial(uint32_t port); void disable_serial(uint32_t port);
void init_module_timer( uint32_t module_index, uint32_t period, uint8_t state);
void disable_module_timer( uint32_t module_index);
// SD driver // SD driver
#if defined(SIMU) #if defined(SIMU)
@ -405,8 +407,12 @@ void debugPutc(const char c);
// Telemetry driver // Telemetry driver
void telemetryPortInit(uint32_t baudrate, uint8_t mode); void telemetryPortInit(uint32_t baudrate, uint8_t mode);
uint32_t telemetryTransmitPending(); uint32_t telemetryTransmitPending();
void telemetryTransmitBuffer(uint8_t * buffer, uint32_t size); void telemetryTransmitBuffer(const uint8_t * buffer, uint32_t size);
void rxPdcUsart( void (*pChProcess)(uint8_t x) ); void rxPdcUsart( void (*pChProcess)(uint8_t x) );
inline void sportSendBuffer(const uint8_t * buffer, uint32_t size)
{
telemetryTransmitBuffer(buffer, size);
}
// Second UART driver // Second UART driver
void serial2TelemetryInit(unsigned int protocol); void serial2TelemetryInit(unsigned int protocol);

16
radio/src/targets/sky9x/pulses_driver.cpp
View file

@ -129,6 +129,22 @@ void init_no_pulses(uint32_t port)
} }
} }
void init_module_timer(uint32_t port, uint32_t period, uint8_t state)
{
if (port == EXTERNAL_MODULE) {
// TODO use period here
init_main_ppm(3000, 0);
}
}
void disable_module_timer(uint32_t port)
{
if (port == EXTERNAL_MODULE) {
disable_ppm(EXTERNAL_MODULE);
}
}
void disable_no_pulses(uint32_t port) void disable_no_pulses(uint32_t port)
{ {
if (port == EXTERNAL_MODULE) { if (port == EXTERNAL_MODULE) {

9
radio/src/targets/sky9x/telemetry_driver.cpp
View file

@ -135,12 +135,11 @@ void rxPdcUsart( void (*pChProcess)(uint8_t x) )
#endif #endif
} }
uint32_t txPdcUsart(uint8_t *buffer, uint32_t size) uint32_t txPdcUsart(const uint8_t * buffer, uint32_t size)
{ {
Usart *pUsart = SECOND_USART; Usart * pUsart = SECOND_USART;
if ( pUsart->US_TNCR == 0 ) if (pUsart->US_TNCR == 0) {
{
#ifndef SIMU #ifndef SIMU
pUsart->US_TNPR = (uint32_t)buffer ; pUsart->US_TNPR = (uint32_t)buffer ;
#endif #endif
@ -174,7 +173,7 @@ void telemetryPortInit(uint32_t baudrate, uint8_t mode)
#endif #endif
} }
void telemetryTransmitBuffer(uint8_t * buffer, uint32_t size) void telemetryTransmitBuffer(const uint8_t * buffer, uint32_t size)
{ {
txPdcUsart(buffer, size); txPdcUsart(buffer, size);
} }

1
radio/src/telemetry/telemetry.cpp
View file

@ -38,7 +38,6 @@ uint8_t telemetryProtocol = 255;
uint8_t serialInversion = 0; uint8_t serialInversion = 0;
#endif #endif
void processTelemetryData(uint8_t data) void processTelemetryData(uint8_t data)
{ {
#if defined(CROSSFIRE) #if defined(CROSSFIRE)

3
radio/src/telemetry/telemetry.h
View file

@ -97,7 +97,6 @@ void delTelemetryIndex(uint8_t index);
int availableTelemetryIndex(); int availableTelemetryIndex();
int lastUsedTelemetryIndex(); int lastUsedTelemetryIndex();
int32_t getTelemetryValue(uint8_t index, uint8_t & prec);
int32_t convertTelemetryValue(int32_t value, uint8_t unit, uint8_t prec, uint8_t destUnit, uint8_t destPrec); int32_t convertTelemetryValue(int32_t value, uint8_t unit, uint8_t prec, uint8_t destUnit, uint8_t destPrec);
void frskySportSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance); void frskySportSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance);
@ -107,7 +106,7 @@ void frskyDSetDefault(int index, uint16_t id);
#define IS_SPEED_UNIT(unit) ((unit) >= UNIT_KTS && (unit) <= UNIT_MPH) #define IS_SPEED_UNIT(unit) ((unit) >= UNIT_KTS && (unit) <= UNIT_MPH)
extern uint8_t telemetryProtocol; extern uint8_t telemetryProtocol;
#define IS_FRSKY_D_PROTOCOL() (telemetryProtocol == PROTOCOL_FRSKY_D)
#if defined (MULTIMODULE) #if defined (MULTIMODULE)
#define IS_D16_MULTI() ((g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MM_RF_PROTO_FRSKY) && (g_model.moduleData[EXTERNAL_MODULE].subType == MM_RF_FRSKY_SUBTYPE_D16 || g_model.moduleData[EXTERNAL_MODULE].subType == MM_RF_FRSKY_SUBTYPE_D16_8CH)) #define IS_D16_MULTI() ((g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MM_RF_PROTO_FRSKY) && (g_model.moduleData[EXTERNAL_MODULE].subType == MM_RF_FRSKY_SUBTYPE_D16 || g_model.moduleData[EXTERNAL_MODULE].subType == MM_RF_FRSKY_SUBTYPE_D16_8CH))
#define IS_FRSKY_SPORT_PROTOCOL() (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_SPORT || (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE && IS_D16_MULTI())) #define IS_FRSKY_SPORT_PROTOCOL() (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_SPORT || (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE && IS_D16_MULTI()))