diff options
| author | Krzysztof Blazewicz <krzysztof.blazewicz@uxeon.com> | 2016-09-06 17:56:41 +0200 |
|---|---|---|
| committer | Krzysztof Blazewicz <krzysztof.blazewicz@uxeon.com> | 2016-09-09 10:38:08 +0200 |
| commit | 06a1194300fd65723a60bf8cc6702d60659089fa (patch) | |
| tree | 3c4996a6b5e40a3035596f435de1dabbecec1882 /stmhal/accel.c | |
| parent | d89de18f4035996ba2e1f244d6c4e1e2c8f0cc98 (diff) | |
stmhal/{accel,lcd}: use GPIO_{set,clear}_pin
different HAL versions implement GPIO differently (BSRR vs BSRRH+BSRRL),
this way both drivers are portable between different HAL's
Diffstat (limited to 'stmhal/accel.c')
| -rw-r--r-- | stmhal/accel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/stmhal/accel.c b/stmhal/accel.c index 34e9d8e0e..e75f1c994 100644 --- a/stmhal/accel.c +++ b/stmhal/accel.c @@ -27,8 +27,7 @@ #include <stdio.h> #include <string.h> -#include STM32_HAL_H - +#include "py/mphal.h" #include "py/nlr.h" #include "py/runtime.h" #include "pin.h" @@ -61,7 +60,7 @@ void accel_init(void) { GPIO_InitTypeDef GPIO_InitStructure; // PB5 is connected to AVDD; pull high to enable MMA accel device - MICROPY_HW_MMA_AVDD_PIN.gpio->BSRRH = MICROPY_HW_MMA_AVDD_PIN.pin_mask; // turn off AVDD + GPIO_clear_pin(MICROPY_HW_MMA_AVDD_PIN.gpio, MICROPY_HW_MMA_AVDD_PIN.pin_mask); // turn off AVDD GPIO_InitStructure.Pin = MICROPY_HW_MMA_AVDD_PIN.pin_mask; GPIO_InitStructure.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStructure.Speed = GPIO_SPEED_LOW; @@ -82,9 +81,9 @@ STATIC void accel_start(void) { i2c_init(&I2CHandle1); // turn off AVDD, wait 30ms, turn on AVDD, wait 30ms again - MICROPY_HW_MMA_AVDD_PIN.gpio->BSRRH = MICROPY_HW_MMA_AVDD_PIN.pin_mask; // turn off + GPIO_clear_pin(MICROPY_HW_MMA_AVDD_PIN.gpio, MICROPY_HW_MMA_AVDD_PIN.pin_mask); // turn off HAL_Delay(30); - MICROPY_HW_MMA_AVDD_PIN.gpio->BSRRL = MICROPY_HW_MMA_AVDD_PIN.pin_mask; // turn on + GPIO_set_pin(MICROPY_HW_MMA_AVDD_PIN.gpio, MICROPY_HW_MMA_AVDD_PIN.pin_mask); // turn on HAL_Delay(30); HAL_StatusTypeDef status; |