summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@adafruit.com>2021-02-28 22:21:08 -0500
committerGitHub <noreply@github.com>2021-02-28 22:21:08 -0500
commit538cd7eadad5a7364cd33650ecbdb735ca89d27d (patch)
tree5153cd6e84c060505c2d3bdb4fdea981b428885b
parentf4886a6f46ba4e421b739952be968703b1e7f4b6 (diff)
parent24fdda038e8beac6103254ca0b8758a86118e542 (diff)
Merge pull request #4277 from adafruit/tannewt-patch-1
Typo fix: direcion -> direction
-rw-r--r--locale/circuitpython.pot2
-rw-r--r--ports/raspberrypi/common-hal/rp2pio/StateMachine.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index bc5c4084d..b50e63b75 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -1104,7 +1104,7 @@ msgid "Init program size invalid"
msgstr ""
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
-msgid "Initial set pin direcion conflicts with initial out pin direction"
+msgid "Initial set pin direction conflicts with initial out pin direction"
msgstr ""
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
index 7d2385064..5625a1b29 100644
--- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
+++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -426,7 +426,7 @@ void common_hal_rp2pio_statemachine_construct(rp2pio_statemachine_obj_t *self,
mp_raise_ValueError(translate("Initial set pin state conflicts with initial out pin state"));
}
if ((initial_pin_direction & set_out_overlap) != (initial_set_pin_direction & set_out_overlap)) {
- mp_raise_ValueError(translate("Initial set pin direcion conflicts with initial out pin direction"));
+ mp_raise_ValueError(translate("Initial set pin direction conflicts with initial out pin direction"));
}
initial_pin_state |= initial_set_pin_state;
initial_pin_direction |= initial_set_pin_direction;