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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Hosted Weblate 2021-03-01 04:21:22 +01:00
commit ebecb28a33
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locale/circuitpython.pot
View File

@ -1104,7 +1104,7 @@ msgid "Init program size invalid"
msgstr "" msgstr ""
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: 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 "" msgstr ""
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c

2
ports/raspberrypi/common-hal/rp2pio/StateMachine.c
View File

@ -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")); 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)) { 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_state |= initial_set_pin_state;
initial_pin_direction |= initial_set_pin_direction; initial_pin_direction |= initial_set_pin_direction;