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

Fixing bad merge

Browse Source
This commit is contained in:
gamblor21 2022-01-23 14:57:06 -06:00
parent 21c8ac9d4c
commit af93817552
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared-module/displayio/__init__.c
View File

@ -229,11 +229,11 @@ void reset_displays(void) {
if (((uint32_t)is31fb->is31fl3741->i2c) < ((uint32_t)&displays) || if (((uint32_t)is31fb->is31fl3741->i2c) < ((uint32_t)&displays) ||
((uint32_t)is31fb->is31fl3741->i2c) > ((uint32_t)&displays + CIRCUITPY_DISPLAY_LIMIT)) { ((uint32_t)is31fb->is31fl3741->i2c) > ((uint32_t)&displays + CIRCUITPY_DISPLAY_LIMIT)) {
#if BOARD_I2C #if CIRCUITPY_BOARD_I2C
// We don't need to move original_i2c if it is the board.I2C object because it is // We don't need to move original_i2c if it is the board.I2C object because it is
// statically allocated already. (Doing so would also make it impossible to reference in // statically allocated already. (Doing so would also make it impossible to reference in
// a subsequent VM run.) // a subsequent VM run.)
if (is31fb->is31fl3741->i2c == common_hal_board_get_i2c()) { if (common_hal_board_is_i2c(is31fb->is31fl3741->i2c)) {
continue; continue;
} }
#endif #endif