PXX synchro using Hearbeat (#6482)

* [PXX] Latency using heartbeat sync optimized for X7 (stable @ 12ms)
* [PXX] Latency using heartbeat sync optimized for XLite Pro (stable @ 9ms)
This commit is contained in:
Bertrand Songis
2019-06-08 10:44:31 +02:00
committed by GitHub
parent 56a31f20d3
commit aff6c3fd1d
37 changed files with 383 additions and 189 deletions
+8 -1
View File
@@ -272,7 +272,14 @@ void setupPulsesInternalModule(uint8_t protocol)
#if defined(PXX2)
case PROTOCOL_CHANNELS_PXX2:
intmodulePulsesData.pxx2.setupFrame(INTERNAL_MODULE);
scheduleNextMixerCalculation(INTERNAL_MODULE, moduleState[INTERNAL_MODULE].mode == MODULE_MODE_SPECTRUM_ANALYSER || moduleState[INTERNAL_MODULE].mode == MODULE_MODE_POWER_METER ? PXX2_TOOLS_PERIOD : PXX2_PERIOD);
if (moduleState[INTERNAL_MODULE].mode == MODULE_MODE_SPECTRUM_ANALYSER || moduleState[INTERNAL_MODULE].mode == MODULE_MODE_POWER_METER) {
scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_TOOLS_PERIOD);
}
#if !defined(INTMDULE_HEARTBEAT)
else {
scheduleNextMixerCalculation(INTERNAL_MODULE, PXX2_PERIOD);
}
#endif
break;
#endif
+5 -1
View File
@@ -58,8 +58,12 @@ template <class T, int SIZE>
class PulsesBuffer: public DataBuffer<T, SIZE> {
public:
T getLast() {
return *(DataBuffer<T, SIZE>::ptr - 1);
return *(DataBuffer<T, SIZE>::ptr - 1);
};
void setLast(T value) {
*(DataBuffer<T, SIZE>::ptr - 1) = value;
}
};
#endif
+8
View File
@@ -23,6 +23,14 @@
#include "pxx.h"
struct HeartbeatCapture {
uint32_t timestamp;
uint32_t count;
uint8_t valid;
};
extern volatile HeartbeatCapture heartbeatCapture;
class Pxx1CrcMixin {
protected:
void initCrc()
+6
View File
@@ -60,6 +60,12 @@ void Pxx2Pulses::addChannels(uint8_t module)
for (int8_t i = 0; i < count; i++, channel++) {
int value = channelOutputs[channel] + 2*PPM_CH_CENTER(channel) - 2*PPM_CENTER;
pulseValue = limit(1, (value * 512 / 682) + 1024, 2046);
#if defined(DEBUG_LATENCY_RF_ONLY)
if (latencyToggleSwitch)
pulseValue = 1;
else
pulseValue = 2046;
#endif
if (i & 1)
addPulsesValues(pulseValueLow, pulseValue);
else