summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--atmel-samd/Makefile18
-rw-r--r--atmel-samd/common-hal/digitalio/DigitalInOut.c16
-rw-r--r--esp8266/Makefile9
-rw-r--r--esp8266/common-hal/digitalio/DigitalInOut.c16
-rw-r--r--shared-bindings/digitalio/DigitalInOut.c239
-rw-r--r--shared-bindings/digitalio/DigitalInOut.h33
-rw-r--r--shared-bindings/digitalio/Direction.c88
-rw-r--r--shared-bindings/digitalio/Direction.h45
-rw-r--r--shared-bindings/digitalio/DriveMode.c77
-rw-r--r--shared-bindings/digitalio/DriveMode.h46
-rw-r--r--shared-bindings/digitalio/Pull.c78
-rw-r--r--shared-bindings/digitalio/Pull.h46
-rw-r--r--shared-bindings/digitalio/__init__.c13
13 files changed, 484 insertions, 240 deletions
diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile
index 92b1e305b..e7de4aede 100644
--- a/atmel-samd/Makefile
+++ b/atmel-samd/Makefile
@@ -230,7 +230,7 @@ STM_SRC_C = $(addprefix stmhal/,\
pybstdio.c \
)
-SRC_BINDINGS = \
+SRC_COMMON_HAL = \
board/__init__.c \
microcontroller/__init__.c \
microcontroller/Pin.c \
@@ -256,8 +256,16 @@ SRC_BINDINGS = \
usb_hid/__init__.c \
usb_hid/Device.c
-SRC_BINDINGS_EXPANDED = $(addprefix shared-bindings/, $(SRC_BINDINGS)) \
- $(addprefix common-hal/, $(SRC_BINDINGS))
+# These don't have corresponding files in each port but are still located in
+# shared-bindings to make it clear what the contents of the modules are.
+SRC_BINDINGS_ENUMS = \
+ digitalio/Direction.c \
+ digitalio/DriveMode.c \
+ digitalio/Pull.c
+
+SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
+ $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
+ $(addprefix common-hal/, $(SRC_COMMON_HAL))
SRC_SHARED_MODULE = \
help.c \
@@ -274,10 +282,10 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(SRC_ASF:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_BINDINGS_EXPANDED:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
-SRC_QSTR += $(SRC_C) $(SRC_BINDINGS_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(STM_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) $(STM_SRC_C)
all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2
diff --git a/atmel-samd/common-hal/digitalio/DigitalInOut.c b/atmel-samd/common-hal/digitalio/DigitalInOut.c
index 9e69288f4..3c355511d 100644
--- a/atmel-samd/common-hal/digitalio/DigitalInOut.c
+++ b/atmel-samd/common-hal/digitalio/DigitalInOut.c
@@ -56,7 +56,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self
}
void common_hal_digitalio_digitalinout_switch_to_input(
- digitalio_digitalinout_obj_t* self, enum digitalinout_pull_t pull) {
+ digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull) {
self->output = false;
common_hal_digitalio_digitalinout_set_pull(self, pull);
@@ -64,7 +64,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
void common_hal_digitalio_digitalinout_switch_to_output(
digitalio_digitalinout_obj_t* self, bool value,
- enum digitalinout_drive_mode_t drive_mode) {
+ enum digitalio_drive_mode_t drive_mode) {
struct port_config pin_conf;
port_get_config_defaults(&pin_conf);
@@ -77,9 +77,9 @@ void common_hal_digitalio_digitalinout_switch_to_output(
common_hal_digitalio_digitalinout_set_value(self, value);
}
-enum digitalinout_direction_t common_hal_digitalio_digitalinout_get_direction(
+enum digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
digitalio_digitalinout_obj_t* self) {
- return self->output? DIRECTION_OUT : DIRECTION_IN;
+ return self->output? DIRECTION_OUTPUT : DIRECTION_INPUT;
}
void common_hal_digitalio_digitalinout_set_value(
@@ -120,7 +120,7 @@ bool common_hal_digitalio_digitalinout_get_value(
void common_hal_digitalio_digitalinout_set_drive_mode(
digitalio_digitalinout_obj_t* self,
- enum digitalinout_drive_mode_t drive_mode) {
+ enum digitalio_drive_mode_t drive_mode) {
bool value = common_hal_digitalio_digitalinout_get_value(self);
self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
// True is implemented differently between modes so reset the value to make
@@ -130,7 +130,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
}
}
-enum digitalinout_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
+enum digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
digitalio_digitalinout_obj_t* self) {
if (self->open_drain) {
return DRIVE_MODE_OPEN_DRAIN;
@@ -140,7 +140,7 @@ enum digitalinout_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
}
void common_hal_digitalio_digitalinout_set_pull(
- digitalio_digitalinout_obj_t* self, enum digitalinout_pull_t pull) {
+ digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull) {
enum port_pin_pull asf_pull = PORT_PIN_PULL_NONE;
switch (pull) {
case PULL_UP:
@@ -161,7 +161,7 @@ void common_hal_digitalio_digitalinout_set_pull(
port_pin_set_config(self->pin->pin, &pin_conf);
}
-enum digitalinout_pull_t common_hal_digitalio_digitalinout_get_pull(
+enum digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
digitalio_digitalinout_obj_t* self) {
uint32_t pin = self->pin->pin;
PortGroup *const port_base = port_get_group_from_gpio_pin(pin);
diff --git a/esp8266/Makefile b/esp8266/Makefile
index 00370a519..90392cd49 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -125,9 +125,16 @@ SRC_COMMON_HAL = \
time/__init__.c \
board/__init__.c
+# These don't have corresponding files in each port but are still located in
+# shared-bindings to make it clear what the contents of the modules are.
+SRC_BINDINGS_ENUMS = \
+ digitalio/Direction.c \
+ digitalio/DriveMode.c \
+ digitalio/Pull.c
+
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
+ $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
$(addprefix common-hal/, $(SRC_COMMON_HAL))
-
SRC_SHARED_MODULE = \
bitbangio/__init__.c \
bitbangio/I2C.c \
diff --git a/esp8266/common-hal/digitalio/DigitalInOut.c b/esp8266/common-hal/digitalio/DigitalInOut.c
index 356d0f3b8..ba6589d88 100644
--- a/esp8266/common-hal/digitalio/DigitalInOut.c
+++ b/esp8266/common-hal/digitalio/DigitalInOut.c
@@ -51,7 +51,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self
}
void common_hal_digitalio_digitalinout_switch_to_input(
- digitalio_digitalinout_obj_t* self, enum digitalinout_pull_t pull) {
+ digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull) {
self->output = false;
if (self->pin->gpio_number == 16) {
@@ -67,7 +67,7 @@ void common_hal_digitalio_digitalinout_switch_to_input(
void common_hal_digitalio_digitalinout_switch_to_output(
digitalio_digitalinout_obj_t* self, bool value,
- enum digitalinout_drive_mode_t drive_mode) {
+ enum digitalio_drive_mode_t drive_mode) {
self->output = true;
self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
if (self->pin->gpio_number == 16) {
@@ -81,9 +81,9 @@ void common_hal_digitalio_digitalinout_switch_to_output(
common_hal_digitalio_digitalinout_set_value(self, value);
}
-enum digitalinout_direction_t common_hal_digitalio_digitalinout_get_direction(
+enum digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
digitalio_digitalinout_obj_t* self) {
- return self->output? DIRECTION_OUT : DIRECTION_IN;
+ return self->output? DIRECTION_OUTPUT : DIRECTION_INPUT;
}
void common_hal_digitalio_digitalinout_set_value(
@@ -128,7 +128,7 @@ bool common_hal_digitalio_digitalinout_get_value(
void common_hal_digitalio_digitalinout_set_drive_mode(
digitalio_digitalinout_obj_t* self,
- enum digitalinout_drive_mode_t drive_mode) {
+ enum digitalio_drive_mode_t drive_mode) {
bool value = common_hal_digitalio_digitalinout_get_value(self);
self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
// True is implemented differently between modes so reset the value to make
@@ -138,7 +138,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
}
}
-enum digitalinout_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
+enum digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
digitalio_digitalinout_obj_t* self) {
if (self->open_drain) {
return DRIVE_MODE_OPEN_DRAIN;
@@ -148,7 +148,7 @@ enum digitalinout_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
}
void common_hal_digitalio_digitalinout_set_pull(
- digitalio_digitalinout_obj_t* self, enum digitalinout_pull_t pull) {
+ digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull) {
if (pull == PULL_DOWN) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError,
"ESP8266 does not support pull down."));
@@ -166,7 +166,7 @@ void common_hal_digitalio_digitalinout_set_pull(
}
}
-enum digitalinout_pull_t common_hal_digitalio_digitalinout_get_pull(
+enum digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
digitalio_digitalinout_obj_t* self) {
if (self->pin->gpio_number < 16 &&
(READ_PERI_REG(self->pin->peripheral) & PERIPHS_IO_MUX_PULLUP) != 0) {
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index 6b85bc6ea..43a44ff4f 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -37,6 +37,9 @@
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/digitalio/Direction.h"
+#include "shared-bindings/digitalio/DriveMode.h"
+#include "shared-bindings/digitalio/Pull.h"
//| .. currentmodule:: digitalio
//|
@@ -101,32 +104,26 @@ STATIC mp_obj_t digitalio_digitalinout_obj___exit__(size_t n_args, const mp_obj_
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(digitalio_digitalinout_obj___exit___obj, 4, 4, digitalio_digitalinout_obj___exit__);
//|
-//| .. method:: switch_to_output(value=False, drive_mode=DriveMode.PUSH_PULL)
+//| .. method:: switch_to_output(value=False, drive_mode=digitalio.DriveMode.PUSH_PULL)
//|
//| Set the drive mode and value and then switch to writing out digital
//| values.
//|
//| :param bool value: default value to set upon switching
-//| :param DriveMode drive_mode: drive mode for the output
+//| :param ~digitalio.DriveMode drive_mode: drive mode for the output
//|
-typedef struct {
- mp_obj_base_t base;
-} digitalio_digitalinout_drive_mode_obj_t;
-extern const digitalio_digitalinout_drive_mode_obj_t digitalio_digitalinout_drive_mode_push_pull_obj;
-extern const digitalio_digitalinout_drive_mode_obj_t digitalio_digitalinout_drive_mode_open_drain_obj;
-
STATIC mp_obj_t digitalio_digitalinout_switch_to_output(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_value, ARG_drive_mode };
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_value, MP_ARG_BOOL, {.u_bool = false} },
- { MP_QSTR_drive_mode, MP_ARG_OBJ, {.u_rom_obj = &digitalio_digitalinout_drive_mode_push_pull_obj} },
+ { MP_QSTR_drive_mode, MP_ARG_OBJ, {.u_rom_obj = &digitalio_drive_mode_push_pull_obj} },
};
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
- enum digitalinout_drive_mode_t drive_mode = DRIVE_MODE_PUSH_PULL;
- if (args[ARG_drive_mode].u_rom_obj == &digitalio_digitalinout_drive_mode_open_drain_obj) {
+ enum digitalio_drive_mode_t drive_mode = DRIVE_MODE_PUSH_PULL;
+ if (args[ARG_drive_mode].u_rom_obj == &digitalio_drive_mode_open_drain_obj) {
drive_mode = DRIVE_MODE_OPEN_DRAIN;
}
// do the transfer
@@ -147,17 +144,11 @@ MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_output_obj, 1, digit
//| import board
//|
//| switch = digitalio.DigitalInOut(board.SLIDE_SWITCH)
-//| switch.switch_to_input(pull=digitalio.DigitalInOut.Pull.UP)
+//| switch.switch_to_input(pull=digitalio.Pull.UP)
//| # Or, after switch_to_input
-//| switch.pull = digitalio.DigitalInOut.Pull.UP
+//| switch.pull = digitalio.Pull.UP
//| print(switch.value)
//|
-typedef struct {
- mp_obj_base_t base;
-} digitalio_digitalinout_pull_obj_t;
-extern const digitalio_digitalinout_pull_obj_t digitalio_digitalinout_pull_up_obj;
-extern const digitalio_digitalinout_pull_obj_t digitalio_digitalinout_pull_down_obj;
-
STATIC mp_obj_t digitalio_digitalinout_switch_to_input(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_pull };
static const mp_arg_t allowed_args[] = {
@@ -167,10 +158,10 @@ STATIC mp_obj_t digitalio_digitalinout_switch_to_input(size_t n_args, const mp_o
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
- enum digitalinout_pull_t pull = PULL_NONE;
- if (args[ARG_pull].u_rom_obj == &digitalio_digitalinout_pull_up_obj) {
+ enum digitalio_pull_t pull = PULL_NONE;
+ if (args[ARG_pull].u_rom_obj == &digitalio_pull_up_obj) {
pull = PULL_UP;
- }else if (args[ARG_pull].u_rom_obj == &digitalio_digitalinout_pull_down_obj) {
+ }else if (args[ARG_pull].u_rom_obj == &digitalio_pull_down_obj) {
pull = PULL_DOWN;
}
// do the transfer
@@ -190,25 +181,25 @@ MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_input_obj, 1, digita
//|
typedef struct {
mp_obj_base_t base;
-} digitalio_digitalinout_direction_obj_t;
-extern const digitalio_digitalinout_direction_obj_t digitalio_digitalinout_direction_in_obj;
-extern const digitalio_digitalinout_direction_obj_t digitalio_digitalinout_direction_out_obj;
+} digitalio_digitalio_direction_obj_t;
+extern const digitalio_digitalio_direction_obj_t digitalio_digitalio_direction_in_obj;
+extern const digitalio_digitalio_direction_obj_t digitalio_digitalio_direction_out_obj;
STATIC mp_obj_t digitalio_digitalinout_obj_get_direction(mp_obj_t self_in) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- enum digitalinout_direction_t direction = common_hal_digitalio_digitalinout_get_direction(self);
- if (direction == DIRECTION_IN) {
- return (mp_obj_t)&digitalio_digitalinout_direction_in_obj;
+ enum digitalio_direction_t direction = common_hal_digitalio_digitalinout_get_direction(self);
+ if (direction == DIRECTION_INPUT) {
+ return (mp_obj_t)&digitalio_direction_input_obj;
}
- return (mp_obj_t)&digitalio_digitalinout_direction_out_obj;
+ return (mp_obj_t)&digitalio_direction_output_obj;
}
MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_direction_obj, digitalio_digitalinout_obj_get_direction);
STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_obj_t value) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (value == &digitalio_digitalinout_direction_in_obj) {
+ if (value == &digitalio_direction_input_obj) {
common_hal_digitalio_digitalinout_switch_to_input(self, PULL_NONE);
- } else if (value == &digitalio_digitalinout_direction_out_obj) {
+ } else if (value == &digitalio_direction_output_obj) {
common_hal_digitalio_digitalinout_switch_to_output(self, false, DRIVE_MODE_PUSH_PULL);
} else {
mp_raise_ValueError("Invalid direction.");
@@ -217,7 +208,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_ob
}
MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_direction_obj, digitalio_digitalinout_obj_set_direction);
-const mp_obj_property_t digitalio_digitalinout_direction_obj = {
+const mp_obj_property_t digitalio_digitalio_direction_obj = {
.base.type = &mp_type_property,
.proxy = {(mp_obj_t)&digitalio_digitalinout_get_direction_obj,
(mp_obj_t)&digitalio_digitalinout_set_direction_obj,
@@ -237,7 +228,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_value_obj, digitalio_digita
STATIC mp_obj_t digitalio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t value) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_IN) {
+ if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) {
mp_raise_AttributeError("Cannot set value when direction is input.");
return mp_const_none;
}
@@ -259,26 +250,26 @@ const mp_obj_property_t digitalio_digitalinout_value_obj = {
//|
STATIC mp_obj_t digitalio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_IN) {
+ if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) {
mp_raise_AttributeError("Drive mode not used when direction is input.");
return mp_const_none;
}
- enum digitalinout_drive_mode_t drive_mode = common_hal_digitalio_digitalinout_get_drive_mode(self);
+ enum digitalio_drive_mode_t drive_mode = common_hal_digitalio_digitalinout_get_drive_mode(self);
if (drive_mode == DRIVE_MODE_PUSH_PULL) {
- return (mp_obj_t)&digitalio_digitalinout_drive_mode_push_pull_obj;
+ return (mp_obj_t)&digitalio_drive_mode_push_pull_obj;
}
- return (mp_obj_t)&digitalio_digitalinout_drive_mode_open_drain_obj;
+ return (mp_obj_t)&digitalio_drive_mode_open_drain_obj;
}
MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_drive_mode_obj, digitalio_digitalinout_obj_get_drive_mode);
STATIC mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_obj_t drive_mode) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_IN) {
+ if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) {
mp_raise_AttributeError("Drive mode not used when direction is input.");
return mp_const_none;
}
- enum digitalinout_drive_mode_t c_drive_mode = DRIVE_MODE_PUSH_PULL;
- if (drive_mode == &digitalio_digitalinout_drive_mode_open_drain_obj) {
+ enum digitalio_drive_mode_t c_drive_mode = DRIVE_MODE_PUSH_PULL;
+ if (drive_mode == &digitalio_drive_mode_open_drain_obj) {
c_drive_mode = DRIVE_MODE_OPEN_DRAIN;
}
common_hal_digitalio_digitalinout_set_drive_mode(self, c_drive_mode);
@@ -286,7 +277,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_o
}
MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_drive_mode_obj, digitalio_digitalinout_obj_set_drive_mode);
-const mp_obj_property_t digitalio_digitalinout_drive_mode_obj = {
+const mp_obj_property_t digitalio_digitalio_drive_mode_obj = {
.base.type = &mp_type_property,
.proxy = {(mp_obj_t)&digitalio_digitalinout_get_drive_mode_obj,
(mp_obj_t)&digitalio_digitalinout_set_drive_mode_obj,
@@ -297,19 +288,19 @@ const mp_obj_property_t digitalio_digitalinout_drive_mode_obj = {
//|
//| Get or set the pin pull.
//|
-//| :raises AttributeError: if the direction is ~`Direction.OUT`.
+//| :raises AttributeError: if the direction is ~`digitalio.Direction.OUTPUT`.
//|
STATIC mp_obj_t digitalio_digitalinout_obj_get_pull(mp_obj_t self_in) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUT) {
+ if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUTPUT) {
mp_raise_AttributeError("Pull not used when direction is output.");
return mp_const_none;
}
- enum digitalinout_pull_t pull = common_hal_digitalio_digitalinout_get_pull(self);
+ enum digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(self);
if (pull == PULL_UP) {
- return (mp_obj_t)&digitalio_digitalinout_pull_up_obj;
+ return (mp_obj_t)&digitalio_pull_up_obj;
} else if (pull == PULL_DOWN) {
- return (mp_obj_t)&digitalio_digitalinout_pull_down_obj;
+ return (mp_obj_t)&digitalio_pull_down_obj;
}
return (mp_obj_t)&mp_const_none_obj;
}
@@ -317,14 +308,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_pull_obj, digitalio_digital
STATIC mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t pull_obj) {
digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in);
- if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUT) {
+ if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUTPUT) {
mp_raise_AttributeError("Pull not used when direction is output.");
return mp_const_none;
}
- enum digitalinout_pull_t pull = PULL_NONE;
- if (pull_obj == &digitalio_digitalinout_pull_up_obj) {
+ enum digitalio_pull_t pull = PULL_NONE;
+ if (pull_obj == &digitalio_pull_up_obj) {
pull = PULL_UP;
- } else if (pull_obj == &digitalio_digitalinout_pull_down_obj) {
+ } else if (pull_obj == &digitalio_pull_down_obj) {
pull = PULL_DOWN;
}
common_hal_digitalio_digitalinout_set_pull(self, pull);
@@ -332,148 +323,13 @@ STATIC mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t p
}
MP_DEFINE_CONST_FUN_OBJ_2(digitalio_digitalinout_set_pull_obj, digitalio_digitalinout_obj_set_pull);
-const mp_obj_property_t digitalio_digitalinout_pull_obj = {
+const mp_obj_property_t digitalio_digitalio_pull_obj = {
.base.type = &mp_type_property,
.proxy = {(mp_obj_t)&digitalio_digitalinout_get_pull_obj,
(mp_obj_t)&digitalio_digitalinout_set_pull_obj,
(mp_obj_t)&mp_const_none_obj},
};
-//| .. class:: digitalio.DigitalInOut.Direction
-//|
-//| Enum-like class to define which direction the digital values are
-//| going.
-//|
-//| .. data:: IN
-//|
-//| Read digital data in
-//|
-//| .. data:: OUT
-//|
-//| Write digital data out
-//|
-const mp_obj_type_t digitalio_digitalinout_direction_type;
-
-const digitalio_digitalinout_direction_obj_t digitalio_digitalinout_direction_in_obj = {
- { &digitalio_digitalinout_direction_type },
-};
-
-const digitalio_digitalinout_direction_obj_t digitalio_digitalinout_direction_out_obj = {
- { &digitalio_digitalinout_direction_type },
-};
-
-STATIC const mp_rom_map_elem_t digitalio_digitalinout_direction_locals_dict_table[] = {
- { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_PTR(&digitalio_digitalinout_direction_in_obj) },
- { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_PTR(&digitalio_digitalinout_direction_out_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(digitalio_digitalinout_direction_locals_dict, digitalio_digitalinout_direction_locals_dict_table);
-
-STATIC void digitalio_digitalinout_direction_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
- qstr direction = MP_QSTR_IN;
- if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&digitalio_digitalinout_direction_out_obj)) {
- direction = MP_QSTR_OUT;
- }
- mp_printf(print, "%q.%q.%q.%q", MP_QSTR_digitalio, MP_QSTR_DigitalInOut, MP_QSTR_Direction, direction);
-}
-
-const mp_obj_type_t digitalio_digitalinout_direction_type = {
- { &mp_type_type },
- .name = MP_QSTR_Direction,
- .print = digitalio_digitalinout_direction_print,
- .locals_dict = (mp_obj_t)&digitalio_digitalinout_direction_locals_dict,
-};
-
-//| .. class:: digitalio.DigitalInOut.DriveMode
-//|
-//| Enum-like class to define the drive mode used when outputting
-//| digital values.
-//|
-//| .. data:: PUSH_PULL
-//|
-//| Output both high and low digital values
-//|
-//| .. data:: OPEN_DRAIN
-//|
-//| Output low digital values but go into high z for digital high. This is
-//| useful for i2c and other protocols that share a digital line.
-//|
-const mp_obj_type_t digitalio_digitalinout_drive_mode_type;
-
-const digitalio_digitalinout_drive_mode_obj_t digitalio_digitalinout_drive_mode_push_pull_obj = {
- { &digitalio_digitalinout_drive_mode_type },
-};
-
-const digitalio_digitalinout_drive_mode_obj_t digitalio_digitalinout_drive_mode_open_drain_obj = {
- { &digitalio_digitalinout_drive_mode_type },
-};
-
-STATIC const mp_rom_map_elem_t digitalio_digitalinout_drive_mode_locals_dict_table[] = {
- { MP_ROM_QSTR(MP_QSTR_PUSH_PULL), MP_ROM_PTR(&digitalio_digitalinout_drive_mode_push_pull_obj) },
- { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_PTR(&digitalio_digitalinout_drive_mode_open_drain_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(digitalio_digitalinout_drive_mode_locals_dict, digitalio_digitalinout_drive_mode_locals_dict_table);
-
-STATIC void digitalio_digitalinout_drive_mode_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
- qstr drive_mode = MP_QSTR_PUSH_PULL;
- if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&digitalio_digitalinout_drive_mode_open_drain_obj)) {
- drive_mode = MP_QSTR_OPEN_DRAIN;
- }
- mp_printf(print, "%q.%q.%q.%q", MP_QSTR_digitalio, MP_QSTR_DigitalInOut, MP_QSTR_DriveMode, drive_mode);
-}
-
-const mp_obj_type_t digitalio_digitalinout_drive_mode_type = {
- { &mp_type_type },
- .name = MP_QSTR_DriveMode,
- .print = digitalio_digitalinout_drive_mode_print,
- .locals_dict = (mp_obj_t)&digitalio_digitalinout_drive_mode_locals_dict,
-};
-
-//| .. class:: digitalio.DigitalInOut.Pull
-//|
-//| Enum-like class to define the pull value, if any, used while reading
-//| digital values in.
-//|
-//| .. data:: UP
-//|
-//| When the input line isn't being driven the pull up can pull the state
-//| of the line high so it reads as true.
-//|
-//| .. data:: DOWN
-//|
-//| When the input line isn't being driven the pull down can pull the
-//| state of the line low so it reads as false.
-//|
-const mp_obj_type_t digitalio_digitalinout_pull_type;
-
-const digitalio_digitalinout_pull_obj_t digitalio_digitalinout_pull_up_obj = {
- { &digitalio_digitalinout_pull_type },
-};
-
-const digitalio_digitalinout_pull_obj_t digitalio_digitalinout_pull_down_obj = {
- { &digitalio_digitalinout_pull_type },
-};
-
-STATIC const mp_rom_map_elem_t digitalio_digitalinout_pull_locals_dict_table[] = {
- { MP_ROM_QSTR(MP_QSTR_UP), MP_ROM_PTR(&digitalio_digitalinout_pull_up_obj) },
- { MP_ROM_QSTR(MP_QSTR_DOWN), MP_ROM_PTR(&digitalio_digitalinout_pull_down_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(digitalio_digitalinout_pull_locals_dict, digitalio_digitalinout_pull_locals_dict_table);
-
-STATIC void digitalio_digitalinout_pull_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
- qstr pull = MP_QSTR_UP;
- if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&digitalio_digitalinout_pull_down_obj)) {
- pull = MP_QSTR_DOWN;
- }
- mp_printf(print, "%q.%q.%q.%q", MP_QSTR_digitalio, MP_QSTR_DigitalInOut, MP_QSTR_Pull, pull);
-}
-
-const mp_obj_type_t digitalio_digitalinout_pull_type = {
- { &mp_type_type },
- .name = MP_QSTR_Pull,
- .print = digitalio_digitalinout_pull_print,
- .locals_dict = (mp_obj_t)&digitalio_digitalinout_pull_locals_dict,
-};
-
STATIC const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = {
// instance methods
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&digitalio_digitalinout_deinit_obj) },
@@ -483,15 +339,10 @@ STATIC const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_switch_to_input), MP_ROM_PTR(&digitalio_digitalinout_switch_to_input_obj) },
// Properties
- { MP_ROM_QSTR(MP_QSTR_direction), MP_ROM_PTR(&digitalio_digitalinout_direction_obj) },
+ { MP_ROM_QSTR(MP_QSTR_direction), MP_ROM_PTR(&digitalio_digitalio_direction_obj) },
{ MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&digitalio_digitalinout_value_obj) },
- { MP_ROM_QSTR(MP_QSTR_drive_mode), MP_ROM_PTR(&digitalio_digitalinout_drive_mode_obj) },
- { MP_ROM_QSTR(MP_QSTR_pull), MP_ROM_PTR(&digitalio_digitalinout_pull_obj) },
-
- // Nested Enum-like Classes.
- { MP_ROM_QSTR(MP_QSTR_Direction), MP_ROM_PTR(&digitalio_digitalinout_direction_type) },
- { MP_ROM_QSTR(MP_QSTR_DriveMode), MP_ROM_PTR(&digitalio_digitalinout_drive_mode_type) },
- { MP_ROM_QSTR(MP_QSTR_Pull), MP_ROM_PTR(&digitalio_digitalinout_pull_type) },
+ { MP_ROM_QSTR(MP_QSTR_drive_mode), MP_ROM_PTR(&digitalio_digitalio_drive_mode_obj) },
+ { MP_ROM_QSTR(MP_QSTR_pull), MP_ROM_PTR(&digitalio_digitalio_pull_obj) },
};
STATIC MP_DEFINE_CONST_DICT(digitalio_digitalinout_locals_dict, digitalio_digitalinout_locals_dict_table);
diff --git a/shared-bindings/digitalio/DigitalInOut.h b/shared-bindings/digitalio/DigitalInOut.h
index db83a27a4..861e6f911 100644
--- a/shared-bindings/digitalio/DigitalInOut.h
+++ b/shared-bindings/digitalio/DigitalInOut.h
@@ -29,25 +29,12 @@
#include "common-hal/microcontroller/Pin.h"
#include "common-hal/digitalio/DigitalInOut.h"
+#include "shared-bindings/digitalio/Direction.h"
+#include "shared-bindings/digitalio/DriveMode.h"
+#include "shared-bindings/digitalio/Pull.h"
extern const mp_obj_type_t digitalio_digitalinout_type;
-enum digitalinout_direction_t {
- DIRECTION_IN,
- DIRECTION_OUT
-};
-
-enum digitalinout_pull_t {
- PULL_NONE,
- PULL_UP,
- PULL_DOWN
-};
-
-enum digitalinout_drive_mode_t {
- DRIVE_MODE_PUSH_PULL,
- DRIVE_MODE_OPEN_DRAIN
-};
-
typedef enum {
DIGITALINOUT_OK,
DIGITALINOUT_PIN_BUSY
@@ -55,14 +42,14 @@ typedef enum {
digitalinout_result_t common_hal_digitalio_digitalinout_construct(digitalio_digitalinout_obj_t* self, const mcu_pin_obj_t* pin);
void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self);
-void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t* self, enum digitalinout_pull_t pull);
-void common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t* self, bool value, enum digitalinout_drive_mode_t drive_mode);
-enum digitalinout_direction_t common_hal_digitalio_digitalinout_get_direction(digitalio_digitalinout_obj_t* self);
+void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull);
+void common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t* self, bool value, enum digitalio_drive_mode_t drive_mode);
+enum digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(digitalio_digitalinout_obj_t* self);
void common_hal_digitalio_digitalinout_set_value(digitalio_digitalinout_obj_t* self, bool value);
bool common_hal_digitalio_digitalinout_get_value(digitalio_digitalinout_obj_t* self);
-void common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t* self, enum digitalinout_drive_mode_t drive_mode);
-enum digitalinout_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitalio_digitalinout_obj_t* self);
-void common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t* self, enum digitalinout_pull_t pull);
-enum digitalinout_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalinout_obj_t* self);
+void common_hal_digitalio_digitalinout_set_drive_mode(digitalio_digitalinout_obj_t* self, enum digitalio_drive_mode_t drive_mode);
+enum digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitalio_digitalinout_obj_t* self);
+void common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull);
+enum digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalinout_obj_t* self);
#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H__
diff --git a/shared-bindings/digitalio/Direction.c b/shared-bindings/digitalio/Direction.c
new file mode 100644
index 000000000..a3433d4b0
--- /dev/null
+++ b/shared-bindings/digitalio/Direction.c
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "lib/utils/context_manager_helpers.h"
+
+#include "py/nlr.h"
+#include "py/objtype.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+//| .. currentmodule:: digitalio
+//|
+//| :class:`Direction` -- defines the direction of a digital pin
+//| =============================================================
+//|
+//| .. class:: digitalio.DigitalInOut.Direction
+//|
+//| Enum-like class to define which direction the digital values are
+//| going.
+//|
+//| .. data:: INPUT
+//|
+//| Read digital data in
+//|
+//| .. data:: OUTPUT
+//|
+//| Write digital data out
+//|
+const mp_obj_type_t digitalio_direction_type;
+
+const digitalio_direction_obj_t digitalio_direction_input_obj = {
+ { &digitalio_direction_type },
+};
+
+const digitalio_direction_obj_t digitalio_direction_output_obj = {
+ { &digitalio_direction_type },
+};
+
+STATIC const mp_rom_map_elem_t digitalio_direction_locals_dict_table[] = {
+ { MP_ROM_QSTR(MP_QSTR_INPUT), MP_ROM_PTR(&digitalio_direction_input_obj) },
+ { MP_ROM_QSTR(MP_QSTR_OUTPUT), MP_ROM_PTR(&digitalio_direction_output_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(digitalio_direction_locals_dict, digitalio_direction_locals_dict_table);
+
+STATIC void digitalio_direction_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+ qstr direction = MP_QSTR_INPUT;
+ if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&digitalio_direction_output_obj)) {
+ direction = MP_QSTR_OUTPUT;
+ }
+ mp_printf(print, "%q.%q.%q", MP_QSTR_digitalio, MP_QSTR_Direction, direction);
+}
+
+const mp_obj_type_t digitalio_direction_type = {
+ { &mp_type_type },
+ .name = MP_QSTR_Direction,
+ .print = digitalio_direction_print,
+ .locals_dict = (mp_obj_t)&digitalio_direction_locals_dict,
+};
diff --git a/shared-bindings/digitalio/Direction.h b/shared-bindings/digitalio/Direction.h
new file mode 100644
index 000000000..5b02acc02
--- /dev/null
+++ b/shared-bindings/digitalio/Direction.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H__
+#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H__
+
+#include "py/obj.h"
+
+enum digitalio_direction_t {
+ DIRECTION_INPUT,
+ DIRECTION_OUTPUT
+};
+typedef struct {
+ mp_obj_base_t base;
+} digitalio_direction_obj_t;
+
+const mp_obj_type_t digitalio_direction_type;
+
+extern const digitalio_direction_obj_t digitalio_direction_input_obj;
+extern const digitalio_direction_obj_t digitalio_direction_output_obj;
+
+#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H__
diff --git a/shared-bindings/digitalio/DriveMode.c b/shared-bindings/digitalio/DriveMode.c
new file mode 100644
index 000000000..477cd904c
--- /dev/null
+++ b/shared-bindings/digitalio/DriveMode.c
@@ -0,0 +1,77 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/digitalio/DriveMode.h"
+
+//| .. currentmodule:: digitalio
+//|
+//| :class:`DriveMode` -- defines the drive mode of a digital pin
+//| =============================================================
+//|
+//| .. class:: digitalio.DriveMode
+//|
+//| Enum-like class to define the drive mode used when outputting
+//| digital values.
+//|
+//| .. data:: PUSH_PULL
+//|
+//| Output both high and low digital values
+//|
+//| .. data:: OPEN_DRAIN
+//|
+//| Output low digital values but go into high z for digital high. This is
+//| useful for i2c and other protocols that share a digital line.
+//|
+const mp_obj_type_t digitalio_drive_mode_type;
+
+const digitalio_drive_mode_obj_t digitalio_drive_mode_push_pull_obj = {
+ { &digitalio_drive_mode_type },
+};
+
+const digitalio_drive_mode_obj_t digitalio_drive_mode_open_drain_obj = {
+ { &digitalio_drive_mode_type },
+};
+
+STATIC const mp_rom_map_elem_t digitalio_drive_mode_locals_dict_table[] = {
+ { MP_ROM_QSTR(MP_QSTR_PUSH_PULL), MP_ROM_PTR(&digitalio_drive_mode_push_pull_obj) },
+ { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_PTR(&digitalio_drive_mode_open_drain_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(digitalio_drive_mode_locals_dict, digitalio_drive_mode_locals_dict_table);
+
+STATIC void digitalio_drive_mode_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+ qstr drive_mode = MP_QSTR_PUSH_PULL;
+ if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&digitalio_drive_mode_open_drain_obj)) {
+ drive_mode = MP_QSTR_OPEN_DRAIN;
+ }
+ mp_printf(print, "%q.%q.%q", MP_QSTR_digitalio, MP_QSTR_DriveMode, drive_mode);
+}
+
+const mp_obj_type_t digitalio_drive_mode_type = {
+ { &mp_type_type },
+ .name = MP_QSTR_DriveMode,
+ .print = digitalio_drive_mode_print,
+ .locals_dict = (mp_obj_t)&digitalio_drive_mode_locals_dict,
+};
diff --git a/shared-bindings/digitalio/DriveMode.h b/shared-bindings/digitalio/DriveMode.h
new file mode 100644
index 000000000..70722fbde
--- /dev/null
+++ b/shared-bindings/digitalio/DriveMode.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H__
+#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H__
+
+#include "py/obj.h"
+
+enum digitalio_drive_mode_t {
+ DRIVE_MODE_PUSH_PULL,
+ DRIVE_MODE_OPEN_DRAIN
+};
+
+typedef struct {
+ mp_obj_base_t base;
+} digitalio_drive_mode_obj_t;
+
+const mp_obj_type_t digitalio_drive_mode_type;
+
+extern const digitalio_drive_mode_obj_t digitalio_drive_mode_push_pull_obj;
+extern const digitalio_drive_mode_obj_t digitalio_drive_mode_open_drain_obj;
+
+#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H__
diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c
new file mode 100644
index 000000000..8d03f6c05
--- /dev/null
+++ b/shared-bindings/digitalio/Pull.c
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "shared-bindings/digitalio/Pull.h"
+
+//| .. currentmodule:: digitalio
+//|
+//| :class:`Pull` -- defines the pull of a digital input pin
+//| =============================================================
+//|
+//| .. class:: digitalio.Pull
+//|
+//| Enum-like class to define the pull value, if any, used while reading
+//| digital values in.
+//|
+//| .. data:: UP
+//|
+//| When the input line isn't being driven the pull up can pull the state
+//| of the line high so it reads as true.
+//|
+//| .. data:: DOWN
+//|
+//| When the input line isn't being driven the pull down can pull the
+//| state of the line low so it reads as false.
+//|
+const mp_obj_type_t digitalio_pull_type;
+
+const digitalio_pull_obj_t digitalio_pull_up_obj = {
+ { &digitalio_pull_type },
+};
+
+const digitalio_pull_obj_t digitalio_pull_down_obj = {
+ { &digitalio_pull_type },
+};
+
+STATIC const mp_rom_map_elem_t digitalio_pull_locals_dict_table[] = {
+ { MP_ROM_QSTR(MP_QSTR_UP), MP_ROM_PTR(&digitalio_pull_up_obj) },
+ { MP_ROM_QSTR(MP_QSTR_DOWN), MP_ROM_PTR(&digitalio_pull_down_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(digitalio_pull_locals_dict, digitalio_pull_locals_dict_table);
+
+STATIC void digitalio_pull_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+ qstr pull = MP_QSTR_UP;
+ if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&digitalio_pull_down_obj)) {
+ pull = MP_QSTR_DOWN;
+ }
+ mp_printf(print, "%q.%q.%q", MP_QSTR_digitalio, MP_QSTR_Pull, pull);
+}
+
+const mp_obj_type_t digitalio_pull_type = {
+ { &mp_type_type },
+ .name = MP_QSTR_Pull,
+ .print = digitalio_pull_print,
+ .locals_dict = (mp_obj_t)&digitalio_pull_locals_dict,
+};
diff --git a/shared-bindings/digitalio/Pull.h b/shared-bindings/digitalio/Pull.h
new file mode 100644
index 000000000..e63f98ea8
--- /dev/null
+++ b/shared-bindings/digitalio/Pull.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H__
+#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H__
+
+#include "py/obj.h"
+
+enum digitalio_pull_t {
+ PULL_NONE,
+ PULL_UP,
+ PULL_DOWN
+};
+
+const mp_obj_type_t digitalio_pull_type;
+
+typedef struct {
+ mp_obj_base_t base;
+} digitalio_pull_obj_t;
+extern const digitalio_pull_obj_t digitalio_pull_up_obj;
+extern const digitalio_pull_obj_t digitalio_pull_down_obj;
+
+#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H__
diff --git a/shared-bindings/digitalio/__init__.c b/shared-bindings/digitalio/__init__.c
index 7767f236f..70c367893 100644
--- a/shared-bindings/digitalio/__init__.c
+++ b/shared-bindings/digitalio/__init__.c
@@ -32,6 +32,9 @@
#include "shared-bindings/microcontroller/Pin.h"
#include "shared-bindings/digitalio/__init__.h"
#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/digitalio/Direction.h"
+#include "shared-bindings/digitalio/DriveMode.h"
+#include "shared-bindings/digitalio/Pull.h"
#include "py/runtime.h"
@@ -50,6 +53,9 @@
//| :maxdepth: 3
//|
//| DigitalInOut
+//| Direction
+//| DriveMode
+//| Pull
//|
//| All classes change hardware state and should be deinitialized when they
//| are no longer needed if the program continues after use. To do so, either
@@ -75,7 +81,7 @@
//| import time
//|
//| led = digitalio.DigitalInOut(D13)
-//| led.direction = digitalio.DigitalInOut.Direction.OUT
+//| led.direction = digitalio.Direction.OUT
//| while True:
//| led.value = True
//| time.sleep(0.1)
@@ -86,6 +92,11 @@
STATIC const mp_rom_map_elem_t digitalio_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_digitalio) },
{ MP_ROM_QSTR(MP_QSTR_DigitalInOut), MP_ROM_PTR(&digitalio_digitalinout_type) },
+
+ // Enum-like Classes.
+ { MP_ROM_QSTR(MP_QSTR_Direction), MP_ROM_PTR(&digitalio_direction_type) },
+ { MP_ROM_QSTR(MP_QSTR_DriveMode), MP_ROM_PTR(&digitalio_drive_mode_type) },
+ { MP_ROM_QSTR(MP_QSTR_Pull), MP_ROM_PTR(&digitalio_pull_type) },
};
STATIC MP_DEFINE_CONST_DICT(digitalio_module_globals, digitalio_module_globals_table);
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-08 15:19:37 +0000