diff options
author | Craig Link <craigl@zillowgroup.com> | 2021-03-18 20:07:00 +0300 |
---|---|---|
committer | Craig Link <craigl@zillowgroup.com> | 2021-03-18 20:07:00 +0300 |
commit | c784b2456782afe1afd551ddc60eb53213e5d46f (patch) | |
tree | 8cb7fe9a0929b4a7e18f2e451a6e98fceecca847 /src/platforms.h | |
parent | ba1e3583c8768e25ba28b36e0141a09ed6b54fca (diff) | |
parent | 2cb3ca46c78c7dcf17007975427c2318721b0961 (diff) |
fix merge conflict
Diffstat (limited to 'src/platforms.h')
-rw-r--r-- | src/platforms.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platforms.h b/src/platforms.h index 8953ceff..5351e2c1 100644 --- a/src/platforms.h +++ b/src/platforms.h @@ -24,7 +24,7 @@ #elif defined(__SAM3X8E__) // Include sam/due headers #include "platforms/arm/sam/fastled_arm_sam.h" -#elif defined(STM32F10X_MD) || defined(__STM32F1__) +#elif defined(STM32F10X_MD) || defined(__STM32F1__) || defined(STM32F2XX) #include "platforms/arm/stm32/fastled_arm_stm32.h" #elif defined(__SAMD21G18A__) || defined(__SAMD21J18A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) #include "platforms/arm/d21/fastled_arm_d21.h" |