Compilation options updated

This commit is contained in:
Bertrand Songis
2019-05-15 15:56:52 +02:00
parent 5b54df8140
commit 4bdd76a214
15 changed files with 77 additions and 38 deletions
+1 -1
View File
@@ -88,7 +88,7 @@ inline bool isExtraModule(uint8_t)
}
#endif
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
inline bool isModulePPM(uint8_t idx)
{
return (idx == INTERNAL_MODULE && g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_PPM) ||
+1 -1
View File
@@ -65,7 +65,7 @@ void setupPulsesPPMTrainer()
setupPulsesPPM<trainer_pulse_duration_t>(&trainerPulsesData.ppm, g_model.trainerData.channelsStart, g_model.trainerData.channelsCount, g_model.trainerData.frameLength);
}
#if defined(PCBTARANIS) && defined(TARANIS_INTERNAL_PPM)
#if defined(PCBTARANIS) && defined(INTERNAL_MODULE_PPM)
void setupPulsesPPMInternalModule()
{
setupPulsesPPM(&intmodulePulsesData.ppm, g_model.moduleData[INTERNAL_MODULE].channelsStart, g_model.moduleData[INTERNAL_MODULE].channelsCount, g_model.moduleData[INTERNAL_MODULE].ppm.frameLength);
+1 -1
View File
@@ -267,7 +267,7 @@ void setupPulsesInternalModule(uint8_t protocol)
break;
#endif
#if defined(PCBTARANIS) && defined(TARANIS_INTERNAL_PPM)
#if defined(PCBTARANIS) && defined(INTERNAL_MODULE_PPM)
case PROTOCOL_CHANNELS_PPM:
setupPulsesPPM(&extmodulePulsesData.ppm, g_model.moduleData[INTERNAL_MODULE].channelsStart, g_model.moduleData[INTERNAL_MODULE].channelsCount, g_model.moduleData[INTERNAL_MODULE].ppm.frameLength);
scheduleNextMixerCalculation(INTERNAL_MODULE, PPM_PERIOD(INTERNAL_MODULE));
+1 -1
View File
@@ -256,7 +256,7 @@ union InternalModulePulsesData {
Pxx2Pulses pxx2;
#endif
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
PpmPulsesData<pulse_duration_t> ppm;
#endif
} __ALIGNED(4);