word wrap long input and fix compiler warnings

This commit is contained in:
Thomas Göttgens 2022-10-06 18:40:31 +02:00
parent d44cce2928
commit 1d09beb8a7
3 changed files with 3 additions and 2 deletions

View File

@ -17,7 +17,7 @@ uint8_t read_from_14004(uint8_t reg, uint8_t *data, uint8_t length)
Wire.write(reg); Wire.write(reg);
Wire.endTransmission(); // stop transmitting Wire.endTransmission(); // stop transmitting
delay(20); delay(20);
Wire.requestFrom(CARDKB_ADDR, length); Wire.requestFrom(CARDKB_ADDR, (int)length);
int i = 0; int i = 0;
while ( Wire.available() ) // slave may send less than requested while ( Wire.available() ) // slave may send less than requested
{ {

View File

@ -385,7 +385,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
char buffer[9]; char buffer[9];
sprintf(buffer, "%d left", Constants_DATA_PAYLOAD_LEN - this->freetext.length()); sprintf(buffer, "%d left", Constants_DATA_PAYLOAD_LEN - this->freetext.length());
display->drawString(x + display->getWidth() - display->getStringWidth(buffer), y + 0, buffer); display->drawString(x + display->getWidth() - display->getStringWidth(buffer), y + 0, buffer);
display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor)); display->drawStringMaxWidth(0 + x, 0 + y + FONT_HEIGHT_SMALL, x + display->getWidth(), cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor));
} else { } else {
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(FONT_SMALL); display->setFont(FONT_SMALL);

View File

@ -23,6 +23,7 @@ build_flags =
-DTFT_BL=32 -DTFT_BL=32
-DSPI_FREQUENCY=40000000 -DSPI_FREQUENCY=40000000
-DSPI_READ_FREQUENCY=16000000 -DSPI_READ_FREQUENCY=16000000
-DDISABLE_ALL_LIBRARY_WARNINGS
lib_ignore = lib_ignore =
m5stack-core m5stack-core
lib_deps = lib_deps =