diff options
| author | Hosted Weblate <hosted@weblate.org> | 2021-03-01 04:21:22 +0100 |
|---|---|---|
| committer | Hosted Weblate <hosted@weblate.org> | 2021-03-01 04:21:22 +0100 |
| commit | ebecb28a33005432df0b671fa47ecb784beec61b (patch) | |
| tree | 741f2d7c688ea628540e6172f3265a66aeed40ef | |
| parent | 07b3a7f6d7fbb0c5ec039e2bd64c4cc45e161a19 (diff) | |
| parent | 538cd7eadad5a7364cd33650ecbdb735ca89d27d (diff) | |
Merge remote-tracking branch 'origin/main' into main
| -rw-r--r-- | locale/circuitpython.pot | 2 | ||||
| -rw-r--r-- | ports/raspberrypi/common-hal/rp2pio/StateMachine.c | 2 |
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; |