Compilation fix
This commit is contained in:
@@ -24,25 +24,10 @@
|
|||||||
#define CROSSFIRE_CH_BITS 11
|
#define CROSSFIRE_CH_BITS 11
|
||||||
|
|
||||||
// Range for pulses (channels output) is [-1024:+1024]
|
// Range for pulses (channels output) is [-1024:+1024]
|
||||||
uint8_t createCrossfireFrame(uint8_t * frame, int16_t * pulses, LuaTelemetryPacket * telemetryPacket)
|
uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses)
|
||||||
{
|
{
|
||||||
uint8_t * buf = frame;
|
uint8_t * buf = frame;
|
||||||
*buf++ = MODULE_ADDRESS;
|
*buf++ = MODULE_ADDRESS;
|
||||||
|
|
||||||
#if defined(LUA)
|
|
||||||
if (telemetryPacket->crossfire.command) {
|
|
||||||
*buf++ = 2 + telemetryPacket->crossfire.length; // 1(ID) + telemetryPacket->crossfire.length + 1(CRC)
|
|
||||||
uint8_t * crc_start = buf;
|
|
||||||
*buf++ = telemetryPacket->crossfire.command;
|
|
||||||
for (int i=0; i<telemetryPacket->crossfire.length; i++) {
|
|
||||||
*buf++ = telemetryPacket->crossfire.data[i];
|
|
||||||
}
|
|
||||||
*buf++ = crc8(crc_start, telemetryPacket->crossfire.length + 1);
|
|
||||||
telemetryPacket->crossfire.clear();
|
|
||||||
return buf - frame;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
*buf++ = 24; // 1(ID) + 22 + 1(CRC)
|
*buf++ = 24; // 1(ID) + 22 + 1(CRC)
|
||||||
uint8_t * crc_start = buf;
|
uint8_t * crc_start = buf;
|
||||||
*buf++ = CHANNELS_ID;
|
*buf++ = CHANNELS_ID;
|
||||||
@@ -61,3 +46,19 @@ uint8_t createCrossfireFrame(uint8_t * frame, int16_t * pulses, LuaTelemetryPack
|
|||||||
*buf++ = crc8(crc_start, 23);
|
*buf++ = crc8(crc_start, 23);
|
||||||
return buf - frame;
|
return buf - frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(LUA)
|
||||||
|
uint8_t createCrossfireRequestFrame(uint8_t * frame, LuaTelemetryPacket * telemetryPacket)
|
||||||
|
{
|
||||||
|
uint8_t * buf = frame;
|
||||||
|
*buf++ = MODULE_ADDRESS;
|
||||||
|
*buf++ = 2 + telemetryPacket->crossfire.length; // 1(ID) + telemetryPacket->crossfire.length + 1(CRC)
|
||||||
|
uint8_t * crc_start = buf;
|
||||||
|
*buf++ = telemetryPacket->crossfire.command;
|
||||||
|
for (int i=0; i<telemetryPacket->crossfire.length; i++) {
|
||||||
|
*buf++ = telemetryPacket->crossfire.data[i];
|
||||||
|
}
|
||||||
|
*buf++ = crc8(crc_start, telemetryPacket->crossfire.length + 1);
|
||||||
|
return buf - frame;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -29,7 +29,11 @@ ModulePulsesData modulePulsesData[NUM_MODULES] __DMA;
|
|||||||
TrainerPulsesData trainerPulsesData __DMA;
|
TrainerPulsesData trainerPulsesData __DMA;
|
||||||
|
|
||||||
#if defined(CROSSFIRE)
|
#if defined(CROSSFIRE)
|
||||||
uint8_t createCrossfireFrame(uint8_t * frame, int16_t * pulses, LuaTelemetryPacket * telemetry);
|
uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(CROSSFIRE) && defined(LUA)
|
||||||
|
uint8_t createCrossfireRequestFrame(uint8_t * frame, LuaTelemetryPacket * telemetry);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uint8_t getRequiredProtocol(uint8_t port)
|
uint8_t getRequiredProtocol(uint8_t port)
|
||||||
@@ -181,11 +185,17 @@ void setupPulses(uint8_t port)
|
|||||||
case PROTO_CROSSFIRE:
|
case PROTO_CROSSFIRE:
|
||||||
if (telemetryProtocol == PROTOCOL_PULSES_CROSSFIRE && !init_needed) {
|
if (telemetryProtocol == PROTOCOL_PULSES_CROSSFIRE && !init_needed) {
|
||||||
uint8_t * crossfire = modulePulsesData[port].crossfire.pulses;
|
uint8_t * crossfire = modulePulsesData[port].crossfire.pulses;
|
||||||
|
uint8_t len;
|
||||||
#if defined(LUA)
|
#if defined(LUA)
|
||||||
uint8_t len = createCrossfireFrame(crossfire, &channelOutputs[g_model.moduleData[port].channelsStart], &luaOutputTelemetryPacket);
|
if (luaOutputTelemetryPacket.crossfire.command) {
|
||||||
#else
|
len = createCrossfireRequestFrame(crossfire, &luaOutputTelemetryPacket);
|
||||||
uint8_t len = createCrossfireFrame(crossfire, &channelOutputs[g_model.moduleData[port].channelsStart], NULL);
|
luaOutputTelemetryPacket.crossfire.clear();
|
||||||
|
}
|
||||||
|
else
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
|
len = createCrossfireChannelsFrame(crossfire, &channelOutputs[g_model.moduleData[port].channelsStart]);
|
||||||
|
}
|
||||||
sportSendBuffer(crossfire, len);
|
sportSendBuffer(crossfire, len);
|
||||||
}
|
}
|
||||||
scheduleNextMixerCalculation(port, CROSSFIRE_FRAME_PERIOD);
|
scheduleNextMixerCalculation(port, CROSSFIRE_FRAME_PERIOD);
|
||||||
|
|||||||
@@ -524,8 +524,6 @@ struct LuaTelemetryPacket
|
|||||||
extern Fifo<LuaTelemetryPacket, 16> * luaInputTelemetryFifo;
|
extern Fifo<LuaTelemetryPacket, 16> * luaInputTelemetryFifo;
|
||||||
extern LuaTelemetryPacket luaOutputTelemetryPacket;
|
extern LuaTelemetryPacket luaOutputTelemetryPacket;
|
||||||
void sportSendLuaPacket(LuaTelemetryPacket & packet);
|
void sportSendLuaPacket(LuaTelemetryPacket & packet);
|
||||||
#else
|
|
||||||
#define LuaTelemetryPacket void
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // _FRSKY_H_
|
#endif // _FRSKY_H_
|
||||||
|
|||||||
@@ -21,17 +21,18 @@
|
|||||||
#include "gtests.h"
|
#include "gtests.h"
|
||||||
|
|
||||||
#if defined(CROSSFIRE)
|
#if defined(CROSSFIRE)
|
||||||
TEST(Crossfire, createCrossfireFrame)
|
uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses);
|
||||||
|
TEST(Crossfire, createCrossfireChannelsFrame)
|
||||||
{
|
{
|
||||||
int16_t pulsesStart[NUM_TRAINER];
|
int16_t pulsesStart[NUM_TRAINER];
|
||||||
uint8_t crossfire[CROSSFIRE_FRAME_LEN];
|
uint8_t crossfire[CROSSFIRE_FRAME_MAXLEN];
|
||||||
|
|
||||||
memset(crossfire, 0, sizeof(crossfire));
|
memset(crossfire, 0, sizeof(crossfire));
|
||||||
for (int i=0; i<NUM_TRAINER; i++) {
|
for (int i=0; i<NUM_TRAINER; i++) {
|
||||||
pulsesStart[i] = -1024 + (2048 / NUM_TRAINER) * i;
|
pulsesStart[i] = -1024 + (2048 / NUM_TRAINER) * i;
|
||||||
}
|
}
|
||||||
|
|
||||||
createCrossfireFrame(crossfire, pulsesStart);
|
createCrossfireChannelsFrame(crossfire, pulsesStart);
|
||||||
|
|
||||||
// TODO check
|
// TODO check
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user