Skip to content

Commit

Permalink
address conficts
Browse files Browse the repository at this point in the history
  • Loading branch information
timchinowsky committed Oct 24, 2024
1 parent c315aa7 commit 4e4a688
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ports/raspberrypi/bindings/rp2pio/StateMachine.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,9 @@ static mp_obj_t rp2pio_statemachine_obj_get_pending_write(mp_obj_t self_in) {
}
MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_pending_write_obj, rp2pio_statemachine_obj_get_pending_write);

MP_PROPERTY_GETTER(rp2pio_statemachine_pending_obj,
(mp_obj_t)&rp2pio_statemachine_get_pending_write_obj);

MP_PROPERTY_GETTER(rp2pio_statemachine_pending_write_obj,
(mp_obj_t)&rp2pio_statemachine_get_pending_write_obj);

Expand Down

0 comments on commit 4e4a688

Please sign in to comment.