Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
8f086faf8a
6 changed files with 16 additions and 0 deletions
|
@ -17,6 +17,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define HAL_USE_I2C TRUE
|
#define HAL_USE_I2C TRUE
|
||||||
|
#define HAL_USE_PWM TRUE
|
||||||
|
#define HAL_USE_PAL TRUE
|
||||||
|
#define HAL_USE_GPT TRUE
|
||||||
|
|
||||||
#include_next <halconf.h>
|
#include_next <halconf.h>
|
||||||
|
|
|
@ -20,3 +20,8 @@
|
||||||
|
|
||||||
#undef STM32_I2C_USE_I2C1
|
#undef STM32_I2C_USE_I2C1
|
||||||
#define STM32_I2C_USE_I2C1 TRUE
|
#define STM32_I2C_USE_I2C1 TRUE
|
||||||
|
|
||||||
|
#undef STM32_PWM_USE_TIM1
|
||||||
|
#define STM32_PWM_USE_TIM1 TRUE
|
||||||
|
#undef STM32_GPT_USE_TIM4
|
||||||
|
#define STM32_GPT_USE_TIM4 TRUE
|
|
@ -17,6 +17,9 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define HAL_USE_I2C TRUE
|
#define HAL_USE_I2C TRUE
|
||||||
|
#define HAL_USE_PWM TRUE
|
||||||
|
#define HAL_USE_PAL TRUE
|
||||||
|
#define HAL_USE_GPT TRUE
|
||||||
|
|
||||||
#include_next <halconf.h>
|
#include_next <halconf.h>
|
||||||
|
|
|
@ -20,3 +20,8 @@
|
||||||
|
|
||||||
#undef STM32_I2C_USE_I2C1
|
#undef STM32_I2C_USE_I2C1
|
||||||
#define STM32_I2C_USE_I2C1 TRUE
|
#define STM32_I2C_USE_I2C1 TRUE
|
||||||
|
|
||||||
|
#undef STM32_PWM_USE_TIM1
|
||||||
|
#define STM32_PWM_USE_TIM1 TRUE
|
||||||
|
#undef STM32_GPT_USE_TIM4
|
||||||
|
#define STM32_GPT_USE_TIM4 TRUE
|
Loading…
Reference in a new issue