Skip to content

Fix deprecated type and erroneous function calls #68

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix deprecated type and erroneous function calls #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7816b0d
Fix calling min() with different type arguments.
cfoucher-laas Sep 10, 2022
eabd80b
Fix use of deprecated boolean type.
cfoucher-laas Sep 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Adafruit_MCPSRAM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Adafruit_MCPSRAM {
void csLow();

private:
boolean hwSPI; ///< true if using hardware SPI
bool hwSPI; ///< true if using hardware SPI
#ifdef HAVE_PORTREG
PortReg *mosiport, *clkport, *csport, *misoport;
PortMask mosipinmask, clkpinmask, cspinmask, misopinmask;
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/Adafruit_ACeP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void Adafruit_ACEP::deGhost() {
uint32_t remaining = (600UL * 448UL / 2);
while (remaining) {
uint8_t block[256];
uint32_t numbytes = min(remaining, sizeof(block));
uint32_t numbytes = min(remaining, (uint32_t)sizeof(block));
memset(block, 0x77, numbytes);
EPD_data(block, numbytes);
remaining -= numbytes;
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/Adafruit_UC8151D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ void Adafruit_UC8151D::displayPartial(uint16_t x1, uint16_t y1, uint16_t x2,
uint32_t offset = 0;
uint8_t mcp_buf[16];
while (remaining) {
uint8_t to_xfer = min(sizeof(mcp_buf), remaining);
uint8_t to_xfer = min((uint32_t)sizeof(mcp_buf), remaining);

sram.read(buffer2_addr + offset, mcp_buf, to_xfer);
sram.write(buffer1_addr + offset, mcp_buf, to_xfer);
Expand Down