From 78b3cd00c36d6bd0af540341c9071be5e4c7523e Mon Sep 17 00:00:00 2001 From: "Jeffrey M. Friesen" Date: Mon, 22 Nov 2021 14:18:15 -0800 Subject: [PATCH] fixed GPIO mapping for phase filters on SC --- hwconf/hw_stormcore_100d.h | 4 ++-- hwconf/hw_stormcore_60d.h | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hwconf/hw_stormcore_100d.h b/hwconf/hw_stormcore_100d.h index 3cd5d5c8..cd5f4123 100644 --- a/hwconf/hw_stormcore_100d.h +++ b/hwconf/hw_stormcore_100d.h @@ -74,9 +74,9 @@ #ifdef HW_VER_IS_100D_V2 #define HW_HAS_PHASE_FILTERS #define PHASE_FILTER_GPIO GPIOE -#define PHASE_FILTER_PIN 1 +#define PHASE_FILTER_PIN 4 #define PHASE_FILTER_GPIO_M2 GPIOE -#define PHASE_FILTER_PIN_M2 4 +#define PHASE_FILTER_PIN_M2 1 #define PHASE_FILTER_ON() palSetPad(PHASE_FILTER_GPIO, PHASE_FILTER_PIN) #define PHASE_FILTER_OFF() palClearPad(PHASE_FILTER_GPIO, PHASE_FILTER_PIN) #define PHASE_FILTER_ON_M2() palSetPad(PHASE_FILTER_GPIO_M2, PHASE_FILTER_PIN_M2) diff --git a/hwconf/hw_stormcore_60d.h b/hwconf/hw_stormcore_60d.h index e50836cb..f4425d31 100644 --- a/hwconf/hw_stormcore_60d.h +++ b/hwconf/hw_stormcore_60d.h @@ -73,15 +73,15 @@ #define SMART_SWITCH_MSECS_PRESSED_OFF 2000 #if defined (HW_VER_IS_60D_PLUS) || defined (HW_VER_IS_60D_XS) -//#define HW_HAS_PHASE_FILTERS -#define PHASE_FILTER_GPIO GPIOE -#define PHASE_FILTER_PIN 1 -#define PHASE_FILTER_GPIO_M2 GPIOE -#define PHASE_FILTER_PIN_M2 4 -#define PHASE_FILTER_ON() palSetPad(PHASE_FILTER_GPIO, PHASE_FILTER_PIN) -#define PHASE_FILTER_OFF() palClearPad(PHASE_FILTER_GPIO, PHASE_FILTER_PIN) -#define PHASE_FILTER_ON_M2() palSetPad(PHASE_FILTER_GPIO_M2, PHASE_FILTER_PIN_M2) -#define PHASE_FILTER_OFF_M2() palClearPad(PHASE_FILTER_GPIO_M2, PHASE_FILTER_PIN_M2) +#define HW_HAS_PHASE_FILTERS +#define PHASE_FILTER_GPIO GPIOE +#define PHASE_FILTER_PIN 4 +#define PHASE_FILTER_GPIO_M2 GPIOE +#define PHASE_FILTER_PIN_M2 1 +#define PHASE_FILTER_ON() palSetPad(PHASE_FILTER_GPIO, PHASE_FILTER_PIN) +#define PHASE_FILTER_OFF() palClearPad(PHASE_FILTER_GPIO, PHASE_FILTER_PIN) +#define PHASE_FILTER_ON_M2() palSetPad(PHASE_FILTER_GPIO_M2, PHASE_FILTER_PIN_M2) +#define PHASE_FILTER_OFF_M2() palClearPad(PHASE_FILTER_GPIO_M2, PHASE_FILTER_PIN_M2) #endif