Update digitalio api for other ports

tannewt · tannewt · commit fd0420d43209 · 2020-05-20T09:23:42.000-07:00
diff --git a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
@@ -73,7 +73,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
     common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
 
-void common_hal_digitalio_digitalinout_switch_to_output(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_digitalinout_obj_t* self, bool value,
         digitalio_drive_mode_t drive_mode) {
     const uint8_t pin = self->pin->number;
@@ -86,6 +86,7 @@ void common_hal_digitalio_digitalinout_switch_to_output(
 
     // Direction is set in set_value. We don't need to do it here.
     common_hal_digitalio_digitalinout_set_value(self, value);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
@@ -128,7 +129,7 @@ bool common_hal_digitalio_digitalinout_get_value(
     }
 }
 
-void common_hal_digitalio_digitalinout_set_drive_mode(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
         digitalio_digitalinout_obj_t* self,
         digitalio_drive_mode_t drive_mode) {
     bool value = common_hal_digitalio_digitalinout_get_value(self);
@@ -138,6 +139,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
     if (value) {
         common_hal_digitalio_digitalinout_set_value(self, value);
     }
+    return DIGITALINOUT_OK;
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
diff --git a/ports/cxd56/common-hal/digitalio/DigitalInOut.c b/ports/cxd56/common-hal/digitalio/DigitalInOut.c
@@ -70,7 +70,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_ob
     board_gpio_config(self->pin->number, 0, true, true, pull);
 }
 
-void common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode) {
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode) {
     self->input = false;
     self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
     board_gpio_write(self->pin->number, -1);
@@ -80,6 +80,7 @@ void common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_o
         board_gpio_write(self->pin->number, 0);
     }
     common_hal_digitalio_digitalinout_set_value(self, value);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(digitalio_digitalinout_obj_t *self) {
@@ -104,7 +105,7 @@ bool common_hal_digitalio_digitalinout_get_value(digitalio_digitalinout_obj_t *s
     return board_gpio_read(self->pin->number);
 }
 
-void common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode) {
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode) {
     if (drive_mode == DRIVE_MODE_PUSH_PULL) {
         board_gpio_write(self->pin->number, -1);
         board_gpio_config(self->pin->number, 0, false, true, PIN_FLOAT);
@@ -115,6 +116,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj
         board_gpio_write(self->pin->number, 0);
         self->open_drain = true;
     }
+    return DIGITALINOUT_OK;
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitalio_digitalinout_obj_t *self) {
diff --git a/ports/litex/common-hal/digitalio/DigitalInOut.c b/ports/litex/common-hal/digitalio/DigitalInOut.c
@@ -64,12 +64,13 @@ void common_hal_digitalio_digitalinout_switch_to_input(
     touch_oe_write(touch_oe_read() & ~(1 << self->pin->number));
 }
 
-void common_hal_digitalio_digitalinout_switch_to_output(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_digitalinout_obj_t *self, bool value,
         digitalio_drive_mode_t drive_mode) {
     (void)drive_mode;
     common_hal_digitalio_digitalinout_set_value(self, value);
     touch_oe_write(touch_oe_read() | (1 << self->pin->number));
+    return DIGITALINOUT_OK;
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
@@ -92,11 +93,12 @@ bool common_hal_digitalio_digitalinout_get_value(
     return !!(touch_i_read() & (1 << self->pin->number));
 }
 
-void common_hal_digitalio_digitalinout_set_drive_mode(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
         digitalio_digitalinout_obj_t *self,
         digitalio_drive_mode_t drive_mode) {
     (void)self;
     (void)drive_mode;
+    return DIGITALINOUT_OK;
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
diff --git a/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c b/ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c
@@ -97,7 +97,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
     common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
 
-void common_hal_digitalio_digitalinout_switch_to_output(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_digitalinout_obj_t* self, bool value,
         digitalio_drive_mode_t drive_mode) {
     self->output = true;
@@ -108,6 +108,7 @@ void common_hal_digitalio_digitalinout_switch_to_output(
 
     const gpio_pin_config_t config = { kGPIO_DigitalOutput, value, kGPIO_NoIntmode };
     GPIO_PinInit(self->pin->gpio, self->pin->number, &config);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
@@ -125,7 +126,7 @@ bool common_hal_digitalio_digitalinout_get_value(
     return GPIO_PinRead(self->pin->gpio, self->pin->number);
 }
 
-void common_hal_digitalio_digitalinout_set_drive_mode(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
         digitalio_digitalinout_obj_t* self,
         digitalio_drive_mode_t drive_mode) {
     bool value = common_hal_digitalio_digitalinout_get_value(self);
@@ -138,6 +139,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
     if (value) {
         common_hal_digitalio_digitalinout_set_value(self, value);
     }
+    return DIGITALINOUT_OK;
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.c b/ports/nrf/common-hal/digitalio/DigitalInOut.c
@@ -65,12 +65,13 @@ void common_hal_digitalio_digitalinout_switch_to_input(
     common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
 
-void common_hal_digitalio_digitalinout_switch_to_output(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_digitalinout_obj_t *self, bool value,
         digitalio_drive_mode_t drive_mode) {
 
     common_hal_digitalio_digitalinout_set_drive_mode(self, drive_mode);
     common_hal_digitalio_digitalinout_set_value(self, value);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
@@ -92,7 +93,7 @@ bool common_hal_digitalio_digitalinout_get_value(
         : nrf_gpio_pin_out_read(self->pin->number);
 }
 
-void common_hal_digitalio_digitalinout_set_drive_mode(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
         digitalio_digitalinout_obj_t *self,
         digitalio_drive_mode_t drive_mode) {
     nrf_gpio_cfg(self->pin->number,
@@ -101,6 +102,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
                  NRF_GPIO_PIN_NOPULL,
                  drive_mode == DRIVE_MODE_OPEN_DRAIN ? NRF_GPIO_PIN_H0D1 : NRF_GPIO_PIN_H0H1,
                  NRF_GPIO_PIN_NOSENSE);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
diff --git a/ports/stm/common-hal/digitalio/DigitalInOut.c b/ports/stm/common-hal/digitalio/DigitalInOut.c
@@ -29,7 +29,7 @@
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-// The HAL is sparse on obtaining register information, so we use the LLs here. 
+// The HAL is sparse on obtaining register information, so we use the LLs here.
 #if (CPY_STM32H7)
 #include "stm32h7xx_ll_gpio.h"
 #elif (CPY_STM32F7)
@@ -85,12 +85,13 @@ void common_hal_digitalio_digitalinout_switch_to_input(
     common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
 
-void common_hal_digitalio_digitalinout_switch_to_output(
+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_digitalinout_obj_t *self, bool value,
         digitalio_drive_mode_t drive_mode) {
 
     common_hal_digitalio_digitalinout_set_drive_mode(self, drive_mode);
     common_hal_digitalio_digitalinout_set_value(self, value);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
@@ -112,7 +113,7 @@ bool common_hal_digitalio_digitalinout_get_value(
         : LL_GPIO_IsOutputPinSet(pin_port(self->pin->port), pin_mask(self->pin->number));
 }
 
-void common_hal_digitalio_digitalinout_set_drive_mode(
+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
         digitalio_digitalinout_obj_t *self,
         digitalio_drive_mode_t drive_mode) {
     GPIO_InitTypeDef GPIO_InitStruct = {0};
@@ -122,6 +123,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
     HAL_GPIO_Init(pin_port(self->pin->port), &GPIO_InitStruct);
+    return DIGITALINOUT_OK;
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(`
`73`	`73`	`common_hal_digitalio_digitalinout_set_pull(self, pull);`
`74`	`74`	`}`
`75`	`75`
`76`		`-void common_hal_digitalio_digitalinout_switch_to_output(`
	`76`	`+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(`
`77`	`77`	`digitalio_digitalinout_obj_t* self, bool value,`
`78`	`78`	`digitalio_drive_mode_t drive_mode) {`
`79`	`79`	`const uint8_t pin = self->pin->number;`
`@@ -86,6 +86,7 @@ void common_hal_digitalio_digitalinout_switch_to_output(`
`86`	`86`
`87`	`87`	`// Direction is set in set_value. We don't need to do it here.`
`88`	`88`	`common_hal_digitalio_digitalinout_set_value(self, value);`
	`89`	`+ return DIGITALINOUT_OK;`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(`
`@@ -128,7 +129,7 @@ bool common_hal_digitalio_digitalinout_get_value(`
`128`	`129`	`}`
`129`	`130`	`}`
`130`	`131`
`131`		`-void common_hal_digitalio_digitalinout_set_drive_mode(`
	`132`	`+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(`
`132`	`133`	`digitalio_digitalinout_obj_t* self,`
`133`	`134`	`digitalio_drive_mode_t drive_mode) {`
`134`	`135`	`bool value = common_hal_digitalio_digitalinout_get_value(self);`
`@@ -138,6 +139,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(`
`138`	`139`	`if (value) {`
`139`	`140`	`common_hal_digitalio_digitalinout_set_value(self, value);`
`140`	`141`	`}`
	`142`	`+ return DIGITALINOUT_OK;`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_ob`
`70`	`70`	`board_gpio_config(self->pin->number, 0, true, true, pull);`
`71`	`71`	`}`
`72`	`72`
`73`		`-void common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode) {`
	`73`	`+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode) {`
`74`	`74`	`self->input = false;`
`75`	`75`	`self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;`
`76`	`76`	`board_gpio_write(self->pin->number, -1);`
`@@ -80,6 +80,7 @@ void common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_o`
`80`	`80`	`board_gpio_write(self->pin->number, 0);`
`81`	`81`	`}`
`82`	`82`	`common_hal_digitalio_digitalinout_set_value(self, value);`
	`83`	`+ return DIGITALINOUT_OK;`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(digitalio_digitalinout_obj_t *self) {`
`@@ -104,7 +105,7 @@ bool common_hal_digitalio_digitalinout_get_value(digitalio_digitalinout_obj_t *s`
`104`	`105`	`return board_gpio_read(self->pin->number);`
`105`	`106`	`}`
`106`	`107`
`107`		`-void common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode) {`
	`108`	`+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode) {`
`108`	`109`	`if (drive_mode == DRIVE_MODE_PUSH_PULL) {`
`109`	`110`	`board_gpio_write(self->pin->number, -1);`
`110`	`111`	`board_gpio_config(self->pin->number, 0, false, true, PIN_FLOAT);`
`@@ -115,6 +116,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj`
`115`	`116`	`board_gpio_write(self->pin->number, 0);`
`116`	`117`	`self->open_drain = true;`
`117`	`118`	`}`
	`119`	`+ return DIGITALINOUT_OK;`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitalio_digitalinout_obj_t *self) {`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,13 @@ void common_hal_digitalio_digitalinout_switch_to_input(`
`64`	`64`	`touch_oe_write(touch_oe_read() & ~(1 << self->pin->number));`
`65`	`65`	`}`
`66`	`66`
`67`		`-void common_hal_digitalio_digitalinout_switch_to_output(`
	`67`	`+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(`
`68`	`68`	`digitalio_digitalinout_obj_t *self, bool value,`
`69`	`69`	`digitalio_drive_mode_t drive_mode) {`
`70`	`70`	`(void)drive_mode;`
`71`	`71`	`common_hal_digitalio_digitalinout_set_value(self, value);`
`72`	`72`	`touch_oe_write(touch_oe_read() \| (1 << self->pin->number));`
	`73`	`+ return DIGITALINOUT_OK;`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(`
`@@ -92,11 +93,12 @@ bool common_hal_digitalio_digitalinout_get_value(`
`92`	`93`	`return !!(touch_i_read() & (1 << self->pin->number));`
`93`	`94`	`}`
`94`	`95`
`95`		`-void common_hal_digitalio_digitalinout_set_drive_mode(`
	`96`	`+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(`
`96`	`97`	`digitalio_digitalinout_obj_t *self,`
`97`	`98`	`digitalio_drive_mode_t drive_mode) {`
`98`	`99`	`(void)self;`
`99`	`100`	`(void)drive_mode;`
	`101`	`+ return DIGITALINOUT_OK;`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(`
`97`	`97`	`common_hal_digitalio_digitalinout_set_pull(self, pull);`
`98`	`98`	`}`
`99`	`99`
`100`		`-void common_hal_digitalio_digitalinout_switch_to_output(`
	`100`	`+digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(`
`101`	`101`	`digitalio_digitalinout_obj_t* self, bool value,`
`102`	`102`	`digitalio_drive_mode_t drive_mode) {`
`103`	`103`	`self->output = true;`
`@@ -108,6 +108,7 @@ void common_hal_digitalio_digitalinout_switch_to_output(`
`108`	`108`
`109`	`109`	`const gpio_pin_config_t config = { kGPIO_DigitalOutput, value, kGPIO_NoIntmode };`
`110`	`110`	`GPIO_PinInit(self->pin->gpio, self->pin->number, &config);`
	`111`	`+ return DIGITALINOUT_OK;`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(`
`@@ -125,7 +126,7 @@ bool common_hal_digitalio_digitalinout_get_value(`
`125`	`126`	`return GPIO_PinRead(self->pin->gpio, self->pin->number);`
`126`	`127`	`}`
`127`	`128`
`128`		`-void common_hal_digitalio_digitalinout_set_drive_mode(`
	`129`	`+digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(`
`129`	`130`	`digitalio_digitalinout_obj_t* self,`
`130`	`131`	`digitalio_drive_mode_t drive_mode) {`
`131`	`132`	`bool value = common_hal_digitalio_digitalinout_get_value(self);`
`@@ -138,6 +139,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(`
`138`	`139`	`if (value) {`
`139`	`140`	`common_hal_digitalio_digitalinout_set_value(self, value);`
`140`	`141`	`}`
	`142`	`+ return DIGITALINOUT_OK;`
`141`	`143`	`}`
`142`	`144`
`143`	`145`	`digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(`