djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text fixes

Browse Source
This commit is contained in:
Hierophect 2019-09-11 14:09:57 -04:00
parent d888922db6
commit 6e007f4e8c
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ports/stm32f4/common-hal/digitalio/DigitalInOut.c
View File

@ -43,7 +43,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
self->pin = pin; self->pin = pin;
GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitTypeDef GPIO_InitStruct = {0};
GPIO_InitStruct.Pin = 1<<self->pin->number; GPIO_InitStruct.Pin = pin_mask(self->pin->number);
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@ -69,7 +69,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) { digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitTypeDef GPIO_InitStruct = {0};
GPIO_InitStruct.Pin = 1<<self->pin->number; GPIO_InitStruct.Pin = pin_mask(self->pin->number);
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@ -89,27 +89,27 @@ void common_hal_digitalio_digitalinout_switch_to_output(
digitalio_direction_t common_hal_digitalio_digitalinout_get_direction( digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
digitalio_digitalinout_obj_t *self) { digitalio_digitalinout_obj_t *self) {
return (LL_GPIO_GetPinMode(pin_port(self->pin->number), 1<<self->pin->number) return (LL_GPIO_GetPinMode(pin_port(self->pin->number), pin_mask(self->pin->number))
== LL_GPIO_MODE_INPUT) ? DIRECTION_INPUT : DIRECTION_OUTPUT; == LL_GPIO_MODE_INPUT) ? DIRECTION_INPUT : DIRECTION_OUTPUT;
} }
void common_hal_digitalio_digitalinout_set_value( void common_hal_digitalio_digitalinout_set_value(
digitalio_digitalinout_obj_t *self, bool value) { digitalio_digitalinout_obj_t *self, bool value) {
HAL_GPIO_WritePin(pin_port(self->pin->number), 1<<self->pin->number, value); HAL_GPIO_WritePin(pin_port(self->pin->number), pin_mask(self->pin->number), value);
} }
bool common_hal_digitalio_digitalinout_get_value( bool common_hal_digitalio_digitalinout_get_value(
digitalio_digitalinout_obj_t *self) { digitalio_digitalinout_obj_t *self) {
return (LL_GPIO_GetPinMode(pin_port(self->pin->number), 1<<self->pin->number) == LL_GPIO_MODE_INPUT) return (LL_GPIO_GetPinMode(pin_port(self->pin->number), pin_mask(self->pin->number)) == LL_GPIO_MODE_INPUT)
? HAL_GPIO_ReadPin(pin_port(self->pin->number), 1<<self->pin->number) ? HAL_GPIO_ReadPin(pin_port(self->pin->number), pin_mask(self->pin->number))
: LL_GPIO_IsOutputPinSet(pin_port(self->pin->number), 1<<self->pin->number); : LL_GPIO_IsOutputPinSet(pin_port(self->pin->number), pin_mask(self->pin->number));
} }
void common_hal_digitalio_digitalinout_set_drive_mode( void common_hal_digitalio_digitalinout_set_drive_mode(
digitalio_digitalinout_obj_t *self, digitalio_digitalinout_obj_t *self,
digitalio_drive_mode_t drive_mode) { digitalio_drive_mode_t drive_mode) {
GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitTypeDef GPIO_InitStruct = {0};
GPIO_InitStruct.Pin = 1<<self->pin->number; GPIO_InitStruct.Pin = pin_mask(self->pin->number);
GPIO_InitStruct.Mode = (drive_mode == DRIVE_MODE_OPEN_DRAIN ? GPIO_InitStruct.Mode = (drive_mode == DRIVE_MODE_OPEN_DRAIN ?
GPIO_MODE_OUTPUT_OD : GPIO_MODE_OUTPUT_PP); GPIO_MODE_OUTPUT_OD : GPIO_MODE_OUTPUT_PP);
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
@ -120,7 +120,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode( digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
digitalio_digitalinout_obj_t *self) { digitalio_digitalinout_obj_t *self) {
return LL_GPIO_GetPinOutputType(pin_port(self->pin->number), 1<<self->pin->number) return LL_GPIO_GetPinOutputType(pin_port(self->pin->number), pin_mask(self->pin->number))
== LL_GPIO_OUTPUT_OPENDRAIN ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL; == LL_GPIO_OUTPUT_OPENDRAIN ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
} }
@ -129,13 +129,13 @@ void common_hal_digitalio_digitalinout_set_pull(
switch (pull) { switch (pull) {
case PULL_UP: case PULL_UP:
LL_GPIO_SetPinPull(pin_port(self->pin->number), 1<<self->pin->number,LL_GPIO_PULL_UP); LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_UP);
break; break;
case PULL_DOWN: case PULL_DOWN:
LL_GPIO_SetPinPull(pin_port(self->pin->number), 1<<self->pin->number,LL_GPIO_PULL_DOWN); LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_DOWN);
break; break;
case PULL_NONE: case PULL_NONE:
LL_GPIO_SetPinPull(pin_port(self->pin->number), 1<<self->pin->number,LL_GPIO_PULL_NO); LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_NO);
break; break;
default: default:
break; break;
@ -146,7 +146,7 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
digitalio_digitalinout_obj_t *self) { digitalio_digitalinout_obj_t *self) {
switch (LL_GPIO_GetPinPull(pin_port(self->pin->number), 1<<self->pin->number)) { switch (LL_GPIO_GetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number))) {
case LL_GPIO_PULL_UP: case LL_GPIO_PULL_UP:
return PULL_UP; return PULL_UP;
case LL_GPIO_PULL_DOWN: case LL_GPIO_PULL_DOWN:

1
ports/stm32f4/common-hal/microcontroller/Pin.c
View File

@ -86,7 +86,6 @@ GPIO_TypeDef * pin_port(uint8_t pin_port) {
return ports[pin_port]; return ports[pin_port];
} }
//TODO: replace with macro?
uint16_t pin_mask(uint8_t pin_number) { uint16_t pin_mask(uint8_t pin_number) {
return 1<<pin_number; return 1<<pin_number;
} }