Compilation fixes

This commit is contained in:
Bertrand Songis
2019-04-23 08:26:38 +02:00
parent 469f6f860e
commit fa6db9e330
8 changed files with 38 additions and 55 deletions
-5
View File
@@ -174,11 +174,6 @@ void processCrossfireTelemetryFrame()
}
}
bool isCrossfireOutputBufferAvailable()
{
return outputTelemetryBufferSize == 0;
}
void processCrossfireTelemetryData(uint8_t data)
{
if (telemetryRxBufferCount == 0 && data != RADIO_ADDRESS) {
-1
View File
@@ -78,7 +78,6 @@ enum CrossfireSensorIndexes {
void processCrossfireTelemetryData(uint8_t data);
void crossfireSetDefault(int index, uint8_t id, uint8_t subId);
bool isCrossfireOutputBufferAvailable();
#if SPORT_MAX_BAUDRATE < 400000
const uint32_t CROSSFIRE_BAUDRATES[] = {
+3 -3
View File
@@ -158,14 +158,14 @@ static void processMultiTelemetryPaket(const uint8_t *packet)
// Just an ack to our command, ignore for now
break;
#if defined(MULTI_SPORT) && defined(LUA)
case FrskySportPolling:
#if defined(LUA)
if (len >= 1 && outputTelemetryBuffer.size > 0 && data[0] == outputTelemetryBuffer.trigger) {
if (len >= 1 && outputTelemetryBuffer.destination == TELEMETRY_ENDPOINT_SPORT && data[0] == outputTelemetryBuffer.sport.physicalId) {
TRACE("MP Sending sport data out.");
sportSendBuffer(outputTelemetryBuffer.data, outputTelemetryBuffer.size);
}
#endif
break;
#endif
default:
TRACE("[MP] Unkown multi packet type 0x%02X, len %d", type, len);
+2 -4
View File
@@ -266,8 +266,7 @@ void telemetryInit(uint8_t protocol)
// The DIY Multi module always speaks 100000 baud regardless of the telemetry protocol in use
telemetryPortInit(MULTIMODULE_BAUDRATE, TELEMETRY_SERIAL_8E2);
#if defined(LUA)
outputTelemetryBuffer.size = 0;
outputTelemetryBuffer.trigger = 0x7E;
outputTelemetryBuffer.reset();
#endif
}
else if (protocol == PROTOCOL_TELEMETRY_SPEKTRUM) {
@@ -280,8 +279,7 @@ void telemetryInit(uint8_t protocol)
else if (protocol == PROTOCOL_TELEMETRY_CROSSFIRE) {
telemetryPortInit(CROSSFIRE_BAUDRATE, TELEMETRY_SERIAL_DEFAULT);
#if defined(LUA)
outputTelemetryBufferSize = 0;
outputTelemetryBufferTrigger = 0;
outputTelemetryBuffer.reset();
#endif
telemetryPortSetDirectionOutput();
}