shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix gpio pin reading

Browse Source
This commit is contained in:
Conor Patrick 2019-05-09 14:17:50 -04:00
parent aca28fde61
commit 30cfa46186
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
targets/stm32l432/src/sense.c
View File

@ -5,9 +5,6 @@
#include "stm32l4xx_ll_gpio.h" #include "stm32l4xx_ll_gpio.h"
#include "stm32l4xx_hal_tsc.h" #include "stm32l4xx_hal_tsc.h"
int _run_sense_app = 0;
static int _has_init = 0;
#define ELECTRODE_0 TSC_GROUP2_IO1 #define ELECTRODE_0 TSC_GROUP2_IO1
#define ELECTRODE_1 TSC_GROUP2_IO2 #define ELECTRODE_1 TSC_GROUP2_IO2
@ -130,18 +127,15 @@ uint32_t tsc_read_button(uint32_t index)
int tsc_sensor_exists() int tsc_sensor_exists()
{ {
int does; int does;
LL_GPIO_InitTypeDef GPIO_InitStruct; LL_GPIO_SetPinMode(GPIOB, (1 << 1), LL_GPIO_MODE_INPUT);
GPIO_InitStruct.Pin = LL_GPIO_PIN_1; LL_GPIO_SetPinPull(GPIOB, (1 << 1), LL_GPIO_PULL_UP);
GPIO_InitStruct.Mode = LL_GPIO_MODE_INPUT;
GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_LOW;
GPIO_InitStruct.OutputType = 0;
GPIO_InitStruct.Pull = LL_GPIO_PULL_UP;
LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
does = (LL_GPIO_ReadInputPort(GPIOB) & 1) == 0; // Short delay before reading pin
asm("nop"); asm("nop"); asm("nop"); asm("nop");
GPIO_InitStruct.Pull = LL_GPIO_PULL_NO; does = (LL_GPIO_ReadInputPort(GPIOB) & (1 << 1)) == 0;
LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
LL_GPIO_SetPinPull(GPIOB, 1, LL_GPIO_PULL_NO);
return does; return does;
} }

2
targets/stm32l432/src/sense.h
View File

@ -3,8 +3,6 @@
#include <stdint.h> #include <stdint.h>
extern int _run_sense_app;
void tsc_init(); void tsc_init();
int tsc_sensor_exists(); int tsc_sensor_exists();