sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Number Bounded draw

Browse Source
This commit is contained in:
Ben V. Brown
2023-06-29 18:46:19 +10:00
parent da7dbd4b55
commit 45639e5c23
2 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/Core/Drivers/OLED.cpp
View File

@@ -432,14 +432,25 @@ void OLED::setInverseDisplay(bool inverse) {
OLED_Setup_Array[21].val = normalInverseCmd; OLED_Setup_Array[21].val = normalInverseCmd;
I2C_CLASS::I2C_RegisterWrite(DEVICEADDR_OLED, 0x80, normalInverseCmd); I2C_CLASS::I2C_RegisterWrite(DEVICEADDR_OLED, 0x80, normalInverseCmd);
} }
void OLED::printBounded(const char *str, const uint8_t x, const uint8_t y, const uint8_t w, const uint8_t h) { void OLED::printBounded(const char *str, const uint8_t x, const uint8_t y, const uint8_t w, const uint8_t h, FontStyle fontStyle) {
setCursor(x, y); setCursor(x, y);
const uint8_t *next = reinterpret_cast<const uint8_t *>(str);
FontStyle fontStyle = FontStyle::SMALL; const uint8_t *next = reinterpret_cast<const uint8_t *>(str);
if (next[0] == 0x01) { // Determine font size by newline magic marker
fontStyle = FontStyle::LARGE; if (fontStyle == FontStyle::FROM_TEXT) {
next++; fontStyle = FontStyle::SMALL;
if (next[0] == 0x01) {
fontStyle = FontStyle::LARGE;
next++;
}
} else if (fontStyle == FontStyle::FROM_HEIGHT) {
if (h > get_fontstyle_height(FontStyle::SMALL)) {
fontStyle = FontStyle::LARGE;
} else {
fontStyle = FontStyle::SMALL;
}
} }
// Now we walk and print // Now we walk and print
while (next[0]) { while (next[0]) {
uint16_t index; uint16_t index;
@@ -534,6 +545,25 @@ void OLED::drawHex(uint32_t x, FontStyle fontStyle, uint8_t digits) {
drawChar(value + 2, fontStyle); drawChar(value + 2, fontStyle);
} }
} }
void OLED::printNumberBounded(const uint16_t num, bool noLeaderZeros, const uint8_t x, const uint8_t y, const uint8_t w, const uint8_t h) {
// Print the number to the screen, bounded by the given dimension
FontStyle fontStyle = get_fontstyle_fromHeight(h);
uint8_t places = w / get_fontstyle_width(fontStyle);
if (places > 5)
places = 5;
char buffer[7] = {0, 0, 0, 0, 0, 0, 0};
uint16_t number = num;
for (int i = places; i >= 0; i--) {
buffer[i] = 2 /*Skew past null and newline*/ + number % 10;
number /= 10;
}
if (noLeaderZeros)
stripLeaderZeros(buffer, places);
printBounded(buffer, x, y, w, h, FontStyle::FROM_HEIGHT);
}
// maximum places is 5 // maximum places is 5
void OLED::printNumber(uint16_t number, uint8_t places, FontStyle fontStyle, bool noLeaderZeros) { void OLED::printNumber(uint16_t number, uint8_t places, FontStyle fontStyle, bool noLeaderZeros) {
char buffer[7] = {0}; char buffer[7] = {0};

11
source/Core/Drivers/OLED.hpp
View File

@@ -101,10 +101,13 @@ public:
static void setBrightness(uint8_t contrast); static void setBrightness(uint8_t contrast);
static void setInverseDisplay(bool inverted); static void setInverseDisplay(bool inverted);
static int16_t getCursorX() { return cursor_x; } static int16_t getCursorX() { return cursor_x; }
static void printBounded(const char *str, const uint8_t x, const uint8_t y, const uint8_t w, const uint8_t h);
static void print(const char *string, FontStyle fontStyle, static void printBounded(const char *str, const uint8_t x, const uint8_t y, const uint8_t w, const uint8_t h, FontStyle fontStyle = FontStyle::FROM_TEXT);
uint8_t length = 255); // Draw a string to the current location, with selected font; optionally - with MAX length only void printNumberBounded(const uint16_t num, bool noLeaderZeros, const uint8_t x, const uint8_t y, const uint8_t w, const uint8_t h);
static void printWholeScreen(const char *string);
static void print(const char *string, FontStyle fontStyle,
uint8_t length = 255); // Draw a string to the current location, with selected font; optionally - with MAX length only
static void printWholeScreen(const char *string);
// Set the cursor location by pixels // Set the cursor location by pixels
static void setCursor(int16_t x, int16_t y) { static void setCursor(int16_t x, int16_t y) {
cursor_x = x; cursor_x = x;