address conficts

timchinowsky · timchinowsky · commit 4e4a6884f547 · 2024-10-24T16:20:29.000-07:00
diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -638,6 +638,9 @@ static mp_obj_t rp2pio_statemachine_obj_get_pending_write(mp_obj_t self_in) {`
`638`	`638`	`}`
`639`	`639`	`MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_pending_write_obj, rp2pio_statemachine_obj_get_pending_write);`
`640`	`640`
	`641`	`+MP_PROPERTY_GETTER(rp2pio_statemachine_pending_obj,`
	`642`	`+ (mp_obj_t)&rp2pio_statemachine_get_pending_write_obj);`
	`643`	`+`
`641`	`644`	`MP_PROPERTY_GETTER(rp2pio_statemachine_pending_write_obj,`
`642`	`645`	`(mp_obj_t)&rp2pio_statemachine_get_pending_write_obj);`
`643`	`646`