Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix FourWire and I2CDisplay argument validation #5450

Merged
merged 4 commits into from Oct 10, 2021
Merged

Fix FourWire and I2CDisplay argument validation #5450

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3317b0
check for None spi when initializing FourWire
FoamyGuy Oct 9, 2021
6c00ab7
change error message
FoamyGuy Oct 9, 2021
e8a2e4a
use mp_arg_validate_type instead of if None
FoamyGuy Oct 9, 2021
b799b2e
fix spi include in fourwire. validate i2c_bus in I2CDisplay
FoamyGuy Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion shared-bindings/displayio/FourWire.c
View file
Open in desktop
Expand Up @@ -78,7 +78,8 @@ STATIC mp_obj_t displayio_fourwire_make_new(const mp_obj_type_t *type, size_t n_
mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj);
mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj);

mp_obj_t spi = args[ARG_spi_bus].u_obj;
mp_obj_t spi = mp_arg_validate_type(args[ARG_spi_bus].u_obj, &busio_spi_type, MP_QSTR_spi_bus);

displayio_fourwire_obj_t *self = &allocate_display_bus_or_raise()->fourwire_bus;
self->base.type = &displayio_fourwire_type;

Expand Down