Skip to content

Commit

Permalink
amend git conflict with develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
tobozo authored Jul 27, 2024
1 parent f629140 commit 59e9fc9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/lgfx/v1/platforms/esp32/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,7 @@ namespace lgfx
if (fifo_reg == &reg[i]) { continue; }
reg[i] = _reg_store[i];
}
updateDev(dev);
}

void setPins(i2c_dev_t* dev, gpio_num_t scl, gpio_num_t sda)
Expand Down

0 comments on commit 59e9fc9

Please sign in to comment.