From 450ba425588a620fefa142cb88dfefa2997f888b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 20 Sep 2017 09:16:11 +0200 Subject: [PATCH] External module not working on X10 --- radio/src/gui/480x272/model_curves.cpp | 4 ++-- radio/src/targets/horus/hal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/480x272/model_curves.cpp b/radio/src/gui/480x272/model_curves.cpp index 29ba0b76d..a918585bf 100644 --- a/radio/src/gui/480x272/model_curves.cpp +++ b/radio/src/gui/480x272/model_curves.cpp @@ -140,8 +140,8 @@ bool menuModelCurveOne(event_t event) newPoints[0] = points[0]; newPoints[4+count] = points[4+crv.points]; for (int i=1; i<4+count; i++) - newPoints[i] = calcRESXto100(applyCustomCurve(calc100toRESX(-100 + (i*200) / (4+count)), s_curveChan)); - if (moveCurve(s_curveChan, checkIncDec_Ret*(crv.type==CURVE_TYPE_CUSTOM?2:1))) { + newPoints[i] = calcRESXto100(applyCustomCurve(-RESX + (i * 2 * RESX) / (4 + count), s_curveChan)); + if (moveCurve(s_curveChan, checkIncDec_Ret*(crv.type==CURVE_TYPE_CUSTOM ? 2 :1))) { for (int i = 0; i < 5 + count; i++) { points[i] = newPoints[i]; if (crv.type == CURVE_TYPE_CUSTOM && i != 0 && i != 4 + count) diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index 1623f5cd4..c86b44fa0 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -534,7 +534,7 @@ // External Module #define EXTMODULE_PWR_GPIO GPIOB #define EXTMODULE_PWR_GPIO_PIN GPIO_Pin_3 // PB.03 -#if PCBREV >= 13 +#if defined(PCBX10) || PCBREV >= 13 #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA2) #define EXTMODULE_RCC_APB1Periph 0 #define EXTMODULE_RCC_APB2Periph RCC_APB2Periph_TIM1