From d85ade45d876006a45729f6ada06be48bdc38386 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 27 Aug 2019 09:17:32 +0200 Subject: [PATCH] VC++ compilation fix --- radio/src/pulses/pulses.cpp | 12 ++++++++++++ radio/src/pulses/pulses.h | 13 ++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp index dc534624f..cec72d8a0 100755 --- a/radio/src/pulses/pulses.cpp +++ b/radio/src/pulses/pulses.cpp @@ -28,6 +28,18 @@ InternalModulePulsesData intmodulePulsesData __DMA; ExternalModulePulsesData extmodulePulsesData __DMA; TrainerPulsesData trainerPulsesData __DMA; +void ModuleState::startBind(BindInformation * destination, ModuleCallback bindCallback) +{ + bindInformation = destination; + callback = bindCallback; + mode = MODULE_MODE_BIND; +#if defined(SIMU) + bindInformation->candidateReceiversCount = 2; + strcpy(bindInformation->candidateReceiversNames[0], "SimuRX1"); + strcpy(bindInformation->candidateReceiversNames[1], "SimuRX2"); +#endif +} + uint8_t getModuleType(uint8_t module) { uint8_t type = g_model.moduleData[module].type; diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h index 4606b3d26..87208e7b9 100644 --- a/radio/src/pulses/pulses.h +++ b/radio/src/pulses/pulses.h @@ -161,17 +161,8 @@ PACK(struct ModuleState { }; ModuleCallback callback; - void startBind(BindInformation * destination, ModuleCallback bindCallback = nullptr) - { - bindInformation = destination; - callback = bindCallback; - mode = MODULE_MODE_BIND; -#if defined(SIMU) - bindInformation->candidateReceiversCount = 2; - strcpy(bindInformation->candidateReceiversNames[0], "SimuRX1"); - strcpy(bindInformation->candidateReceiversNames[1], "SimuRX2"); -#endif - } + void startBind(BindInformation * destination, ModuleCallback bindCallback = nullptr); + void readModuleInformation(ModuleInformation * destination, int8_t first, int8_t last) { moduleInformation = destination;