[Crossfire] Upstream link development started
This commit is contained in:
@@ -24,24 +24,39 @@
|
||||
#define CROSSFIRE_CH_BITS 11
|
||||
|
||||
// Range for pulses (channels output) is [-1024:+1024]
|
||||
void createCrossfireFrame(uint8_t * frame, int16_t * pulses)
|
||||
uint8_t createCrossfireFrame(uint8_t * frame, int16_t * pulses, LuaTelemetryPacket * telemetryPacket)
|
||||
{
|
||||
uint8_t * buf = frame;
|
||||
*buf++ = BROADCAST_ADDRESS;
|
||||
*buf++ = 24; // 1(ID) + 22 + 1(CRC)
|
||||
*buf++ = CHANNELS_ID;
|
||||
*buf++ = MODULE_ADDRESS;
|
||||
|
||||
uint32_t bits = 0;
|
||||
uint8_t bitsavailable = 0;
|
||||
for (int i=0; i<CROSSFIRE_CHANNELS_COUNT; i++) {
|
||||
uint32_t val = limit(0, CROSSFIRE_CH_CENTER + (((pulses[i]) * 4) / 5), 2*CROSSFIRE_CH_CENTER);
|
||||
bits |= val << bitsavailable;
|
||||
bitsavailable += CROSSFIRE_CH_BITS;
|
||||
while (bitsavailable >= 8) {
|
||||
*buf++ = bits;
|
||||
bits >>= 8;
|
||||
bitsavailable -= 8;
|
||||
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();
|
||||
}
|
||||
*buf = crc8(&frame[2], 23);
|
||||
else {
|
||||
*buf++ = 24; // 1(ID) + 22 + 1(CRC)
|
||||
uint8_t * crc_start = buf;
|
||||
*buf++ = CHANNELS_ID;
|
||||
uint32_t bits = 0;
|
||||
uint8_t bitsavailable = 0;
|
||||
for (int i=0; i<CROSSFIRE_CHANNELS_COUNT; i++) {
|
||||
uint32_t val = limit(0, CROSSFIRE_CH_CENTER + (((pulses[i]) * 4) / 5), 2*CROSSFIRE_CH_CENTER);
|
||||
bits |= val << bitsavailable;
|
||||
bitsavailable += CROSSFIRE_CH_BITS;
|
||||
while (bitsavailable >= 8) {
|
||||
*buf++ = bits;
|
||||
bits >>= 8;
|
||||
bitsavailable -= 8;
|
||||
}
|
||||
}
|
||||
*buf++ = crc8(crc_start, 23);
|
||||
}
|
||||
|
||||
return buf - frame;
|
||||
}
|
||||
|
||||
@@ -28,6 +28,10 @@ uint8_t moduleFlag[NUM_MODULES] = { 0 };
|
||||
ModulePulsesData modulePulsesData[NUM_MODULES] __DMA;
|
||||
TrainerPulsesData trainerPulsesData __DMA;
|
||||
|
||||
#if defined(CROSSFIRE)
|
||||
uint8_t createCrossfireFrame(uint8_t * frame, int16_t * pulses, LuaTelemetryPacket * telemetry);
|
||||
#endif
|
||||
|
||||
uint8_t getRequiredProtocol(uint8_t port)
|
||||
{
|
||||
uint8_t required_protocol;
|
||||
@@ -177,8 +181,8 @@ void setupPulses(uint8_t port)
|
||||
case PROTO_CROSSFIRE:
|
||||
if (telemetryProtocol == PROTOCOL_PULSES_CROSSFIRE && !init_needed) {
|
||||
uint8_t * crossfire = modulePulsesData[port].crossfire.pulses;
|
||||
createCrossfireFrame(crossfire, &channelOutputs[g_model.moduleData[port].channelsStart]);
|
||||
sportSendBuffer(crossfire, CROSSFIRE_FRAME_LEN);
|
||||
uint8_t len = createCrossfireFrame(crossfire, &channelOutputs[g_model.moduleData[port].channelsStart], &luaOutputTelemetryPacket);
|
||||
sportSendBuffer(crossfire, len);
|
||||
}
|
||||
scheduleNextMixerCalculation(port, CROSSFIRE_FRAME_PERIOD);
|
||||
break;
|
||||
|
||||
@@ -100,10 +100,10 @@ PACK(struct Dsm2TimerPulsesData {
|
||||
|
||||
#define CROSSFIRE_BAUDRATE 400000
|
||||
#define CROSSFIRE_FRAME_PERIOD 4 // 4ms
|
||||
#define CROSSFIRE_FRAME_LEN (3+22+1)
|
||||
#define CROSSFIRE_FRAME_MAXLEN 64
|
||||
#define CROSSFIRE_CHANNELS_COUNT 16
|
||||
PACK(struct CrossfirePulsesData {
|
||||
uint8_t pulses[CROSSFIRE_FRAME_LEN];
|
||||
uint8_t pulses[CROSSFIRE_FRAME_MAXLEN];
|
||||
});
|
||||
|
||||
union ModulePulsesData {
|
||||
@@ -146,8 +146,6 @@ void sendByteDsm2(uint8_t b);
|
||||
void putDsm2Flush();
|
||||
void putDsm2SerialBit(uint8_t bit);
|
||||
|
||||
void createCrossfireFrame(uint8_t * frame, int16_t * pulses);
|
||||
|
||||
#if defined(HUBSAN)
|
||||
void Hubsan_Init();
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user