Skip to content

Commit a504774

Browse files
committed
PimoroniBus: Clean up print function.
Use mp_printf to avoid fragmented output and converion into mp types.
1 parent 66ee734 commit a504774

File tree

1 file changed

+15
-28
lines changed

1 file changed

+15
-28
lines changed

micropython/modules/pimoroni_bus/pimoroni_bus.cpp

+15-28
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,23 @@ void PimoroniBus_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
1313
_PimoroniBus_obj_t *self = MP_OBJ_TO_PTR2(self_in, _PimoroniBus_obj_t);
1414
if(self->base.type == &SPIPins_type) {
1515
SPIPins *pins = (SPIPins *)self->pins;
16-
mp_print_str(print, "SPIBus(");
17-
mp_obj_print_helper(print, mp_obj_new_int((pins->spi == spi0) ? 0 : 1), PRINT_REPR);
18-
mp_print_str(print, ", ");
19-
mp_obj_print_helper(print, mp_obj_new_int(pins->cs), PRINT_REPR);
20-
mp_print_str(print, ", ");
21-
mp_obj_print_helper(print, mp_obj_new_int(pins->sck), PRINT_REPR);
22-
mp_print_str(print, ", ");
23-
mp_obj_print_helper(print, mp_obj_new_int(pins->mosi), PRINT_REPR);
24-
mp_print_str(print, ", ");
25-
mp_obj_print_helper(print, mp_obj_new_int(pins->miso == PIN_UNUSED ? -1 : pins->miso), PRINT_REPR);
26-
mp_print_str(print, ", ");
27-
mp_obj_print_helper(print, mp_obj_new_int(pins->dc == PIN_UNUSED ? -1 : pins->dc), PRINT_REPR);
28-
mp_print_str(print, ", ");
29-
mp_obj_print_helper(print, mp_obj_new_int(pins->bl == PIN_UNUSED ? -1 : pins->bl), PRINT_REPR);
30-
mp_print_str(print, ")");
16+
mp_printf(print, "SPIBus(%d, %d, %d, %d, %d, %d, %d)",
17+
pins->spi == spi0 ? 0 : 1,
18+
pins->cs,
19+
pins->sck,
20+
pins->mosi,
21+
pins->miso == PIN_UNUSED ? -1 : pins->miso,
22+
pins->dc == PIN_UNUSED ? -1 : pins->dc,
23+
pins->bl == PIN_UNUSED ? -1 : pins->bl);
3124
} else {
3225
ParallelPins *pins = (ParallelPins *)self->pins;
33-
mp_print_str(print, "ParallelBus(");
34-
mp_obj_print_helper(print, mp_obj_new_int(pins->cs), PRINT_REPR);
35-
mp_print_str(print, ", ");
36-
mp_obj_print_helper(print, mp_obj_new_int(pins->dc), PRINT_REPR);
37-
mp_print_str(print, ", ");
38-
mp_obj_print_helper(print, mp_obj_new_int(pins->wr_sck), PRINT_REPR);
39-
mp_print_str(print, ", ");
40-
mp_obj_print_helper(print, mp_obj_new_int(pins->rd_sck), PRINT_REPR);
41-
mp_print_str(print, ", ");
42-
mp_obj_print_helper(print, mp_obj_new_int(pins->d0), PRINT_REPR);
43-
mp_print_str(print, ", ");
44-
mp_obj_print_helper(print, mp_obj_new_int(pins->bl == PIN_UNUSED ? -1 : pins->bl), PRINT_REPR);
45-
mp_print_str(print, ")");
26+
mp_printf(print, "ParallelBus(%d, %d, %d, %d, %d, %d)",
27+
pins->cs,
28+
pins->dc,
29+
pins->wr_sck,
30+
pins->rd_sck,
31+
pins->d0,
32+
pins->bl == PIN_UNUSED ? -1 : pins->bl);
4633
}
4734
(void)kind;
4835
}

0 commit comments

Comments
 (0)