diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:24:49 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:24:49 +1000 |
| commit | 48a9d334b7a5b462b32c17a5fde07159deb4c280 (patch) | |
| tree | 0f7032657b98730750a74ba6d09d01f2de119d4d /boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c | |
| parent | 17c940423ba2159b20965ea6d004386bc392aa68 (diff) | |
| download | uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.tar.gz uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.tar.bz2 uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.zip | |
Replace all inline definitions with GFXINLINE
Diffstat (limited to 'boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c')
| -rw-r--r-- | boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c index 73df79e8..4fb5cebb 100644 --- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c +++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c @@ -1,16 +1,18 @@ #include "gfx.h" #include "stm32f7xx_hal.h" -#if !GFX_USE_OS_CHIBIOS -systemticks_t gfxSystemTicks(void) -{ - return HAL_GetTick(); -} - -systemticks_t gfxMillisecondsToTicks(delaytime_t ms) -{ - return ms; -} +#if GFX_USE_OS_CHIBIOS + #define HAL_GPIO_Init(port, ptr) palSetGroupMode(port, (ptr)->Pin, 0, (ptr)->Mode|((ptr)->Speed<<3)|((ptr)->Pull<<5)|((ptr)->Alternate<<7)) +#else + systemticks_t gfxSystemTicks(void) + { + return HAL_GetTick(); + } + + systemticks_t gfxMillisecondsToTicks(delaytime_t ms) + { + return ms; + } #endif static void SystemClock_Config(void); |