mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-11 07:57:22 +00:00
Cleanup
This commit is contained in:
HarukiToreda
parent
383ae7a82f
commit
ebea34520d
@ -1022,18 +1022,8 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
|
||||
display->setColor(BLACK);
|
||||
}
|
||||
|
||||
// === Text baseline ===
|
||||
const int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
|
||||
|
||||
// === Battery Vertical and Horizontal ===
|
||||
const int nubSize = 2;
|
||||
const int batteryShort = highlightHeight - nubSize - 2;
|
||||
|
||||
int batteryX = x + xOffset;
|
||||
int batteryY = y + (highlightHeight - batteryShort) / 2 + nubSize;
|
||||
|
||||
int chargePercent = powerStatus->getBatteryChargePercent();
|
||||
|
||||
bool isCharging = powerStatus->getIsCharging() == OptionalBool::OptTrue;
|
||||
uint32_t now = millis();
|
||||
if (isCharging && now - lastBlink > blinkInterval) {
|
||||
@ -1046,90 +1036,43 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
|
||||
|
||||
if (useHorizontalBattery) {
|
||||
// === Horizontal battery ===
|
||||
batteryX = 2;
|
||||
batteryY = 4;
|
||||
// Basic battery design and all related pieces
|
||||
const unsigned char batteryBitmap[] PROGMEM = {
|
||||
0b11111110, 0b00000000, 0b11110000, 0b00000111, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001,
|
||||
0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000,
|
||||
0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00011000, 0b00000001, 0b00000000, 0b00000000,
|
||||
0b00011000, 0b00000001, 0b00000000, 0b00000000, 0b00011000, 0b00000001, 0b00000000, 0b00000000, 0b00011000,
|
||||
0b00000001, 0b00000000, 0b00000000, 0b00011000, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001,
|
||||
0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000,
|
||||
0b00000000, 0b00001000, 0b11111110, 0b00000000, 0b11110000, 0b00000111};
|
||||
int batteryX = 2;
|
||||
int batteryY = 4;
|
||||
|
||||
// This is the left and right bars for the fill in
|
||||
const unsigned char batteryBitmap_sidegaps[] PROGMEM = {
|
||||
0b11111111, 0b00001111, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b11111111, 0b00001111};
|
||||
|
||||
// Lightning Bolt
|
||||
const unsigned char lightning_bolt[] PROGMEM = {
|
||||
0b11110000, 0b00000000, 0b11110000, 0b00000000, 0b01110000, 0b00000000, 0b00111000, 0b00000000, 0b00111100,
|
||||
0b00000000, 0b11111100, 0b00000000, 0b01111110, 0b00000000, 0b00111000, 0b00000000, 0b00110000, 0b00000000,
|
||||
0b00010000, 0b00000000, 0b00010000, 0b00000000, 0b00001000, 0b00000000, 0b00001000, 0b00000000};
|
||||
|
||||
display->drawXbm(batteryX, batteryY, 29, 15, batteryBitmap);
|
||||
display->drawXbm(batteryX, batteryY, 29, 15, batteryBitmap_h);
|
||||
|
||||
if (isCharging && isBoltVisible) {
|
||||
display->drawXbm(batteryX + 9, batteryY + 1, 9, 13, lightning_bolt);
|
||||
display->drawXbm(batteryX + 9, batteryY + 1, 9, 13, lightning_bolt_h);
|
||||
} else if (isCharging && !isBoltVisible) {
|
||||
display->drawXbm(batteryX + 8, batteryY, 12, 15, batteryBitmap_sidegaps);
|
||||
} else if (!isCharging) {
|
||||
display->drawXbm(batteryX + 8, batteryY, 12, 15, batteryBitmap_sidegaps);
|
||||
display->drawXbm(batteryX + 8, batteryY, 12, 15, batteryBitmap_sidegaps_h);
|
||||
} else {
|
||||
display->drawXbm(batteryX + 8, batteryY, 12, 15, batteryBitmap_sidegaps_h);
|
||||
int fillWidth = 24 * chargePercent / 100;
|
||||
int fillX = batteryX + fillWidth;
|
||||
display->fillRect(batteryX + 1, batteryY + 1, fillX, 13);
|
||||
}
|
||||
} else {
|
||||
// === Vertical battery ===
|
||||
batteryX = 1;
|
||||
batteryY = 3;
|
||||
// Basic battery design and all related pieces
|
||||
const unsigned char batteryBitmap[] PROGMEM = {
|
||||
0b00011100, // ..###..
|
||||
0b00111110, // .#####.
|
||||
0b01000001, // #.....#
|
||||
0b01000001, // #.....#
|
||||
0b00000000, // .......
|
||||
0b00000000, // .......
|
||||
0b00000000, // .......
|
||||
0b01000001, // #.....#
|
||||
0b01000001, // #.....#
|
||||
0b01000001, // #.....#
|
||||
0b00111110 // .#####.
|
||||
};
|
||||
// This is the left and right bars for the fill in
|
||||
const unsigned char batteryBitmap_sidegaps[] PROGMEM = {
|
||||
0b10000010, // #.....#
|
||||
0b10000010, // #.....#
|
||||
0b10000010, // #.....#
|
||||
};
|
||||
// Lightning Bolt
|
||||
const unsigned char lightning_bolt[] PROGMEM = {
|
||||
0b00000100, // Column 0
|
||||
0b00000110, // Column 1
|
||||
0b00011111, // Column 2
|
||||
0b00001100, // Column 3
|
||||
0b00000100 // Column 4
|
||||
};
|
||||
int batteryX = 1;
|
||||
int batteryY = 3;
|
||||
|
||||
display->drawXbm(batteryX, batteryY, 7, 11, batteryBitmap);
|
||||
display->drawXbm(batteryX, batteryY, 7, 11, batteryBitmap_v);
|
||||
|
||||
if (isCharging && isBoltVisible) {
|
||||
display->drawXbm(batteryX + 1, batteryY + 3, 5, 5, lightning_bolt);
|
||||
display->drawXbm(batteryX + 1, batteryY + 3, 5, 5, lightning_bolt_v);
|
||||
} else if (isCharging && !isBoltVisible) {
|
||||
display->drawXbm(batteryX - 1, batteryY + 4, 8, 3, batteryBitmap_sidegaps);
|
||||
} else if (!isCharging) {
|
||||
display->drawXbm(batteryX - 1, batteryY + 4, 8, 3, batteryBitmap_sidegaps);
|
||||
display->drawXbm(batteryX - 1, batteryY + 4, 8, 3, batteryBitmap_sidegaps_v);
|
||||
} else {
|
||||
display->drawXbm(batteryX - 1, batteryY + 4, 8, 3, batteryBitmap_sidegaps_v);
|
||||
int fillHeight = 8 * chargePercent / 100;
|
||||
int fillY = batteryY - fillHeight;
|
||||
display->fillRect(batteryX + 1, fillY + 10, 5, fillHeight);
|
||||
}
|
||||
}
|
||||
|
||||
// === Text baseline ===
|
||||
const int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
|
||||
|
||||
// === Battery % Text ===
|
||||
char chargeStr[4];
|
||||
snprintf(chargeStr, sizeof(chargeStr), "%d", chargePercent);
|
||||
@ -1161,7 +1104,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
|
||||
snprintf(timeStr, sizeof(timeStr), "%d:%02d%s", hour, minute, isPM ? "p" : "a");
|
||||
|
||||
int timeStrWidth = display->getStringWidth(timeStr);
|
||||
int timeX = SCREEN_WIDTH - xOffset - timeStrWidth + 4;// time to the right by 4
|
||||
int timeX = SCREEN_WIDTH - xOffset - timeStrWidth + 4; // time to the right by 4
|
||||
|
||||
// Mail icon next to time (drawn as 'M' in a tight square)
|
||||
if (hasUnreadMessage) {
|
||||
@ -3529,7 +3472,7 @@ void Screen::setFrames(FrameFocus focus)
|
||||
ui->switchToFrame(fsi.positions.fault);
|
||||
break;
|
||||
case FOCUS_TEXTMESSAGE:
|
||||
hasUnreadMessage = false; // ✅ Clear when message is *viewed*
|
||||
hasUnreadMessage = false; // ✅ Clear when message is *viewed*
|
||||
ui->switchToFrame(fsi.positions.textMessage);
|
||||
break;
|
||||
case FOCUS_MODULE:
|
||||
@ -4091,8 +4034,7 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
//Handles when message is received would jump to text message frame.
|
||||
// Handles when message is received would jump to text message frame.
|
||||
int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
|
||||
{
|
||||
if (showingNormalScreen) {
|
||||
@ -4101,13 +4043,13 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
|
||||
setFrames(FOCUS_PRESERVE); // Stay on same frame, silently add/remove frames
|
||||
} else {
|
||||
// Incoming message
|
||||
//setFrames(FOCUS_TEXTMESSAGE); // Focus on the new message
|
||||
devicestate.has_rx_text_message = true; // Needed to include the message frame
|
||||
hasUnreadMessage = true; // Enables mail icon in the header
|
||||
setFrames(FOCUS_PRESERVE); // Refresh frame list without switching view
|
||||
forceDisplay(); // Forces screen redraw (this works in your codebase)
|
||||
// setFrames(FOCUS_TEXTMESSAGE); // Focus on the new message
|
||||
devicestate.has_rx_text_message = true; // Needed to include the message frame
|
||||
hasUnreadMessage = true; // Enables mail icon in the header
|
||||
setFrames(FOCUS_PRESERVE); // Refresh frame list without switching view
|
||||
forceDisplay(); // Forces screen redraw (this works in your codebase)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -37,6 +37,37 @@ const uint8_t imgQuestion[] PROGMEM = {0xbf, 0x41, 0xc0, 0x8b, 0xdb, 0x70, 0xa1,
|
||||
const uint8_t imgSF[] PROGMEM = {0xd2, 0xb7, 0xad, 0xbb, 0x92, 0x01, 0xfd, 0xfd, 0x15, 0x85, 0xf5};
|
||||
#endif
|
||||
|
||||
// === Horizontal battery ===
|
||||
// Basic battery design and all related pieces
|
||||
const unsigned char batteryBitmap_h[] PROGMEM = {
|
||||
0b11111110, 0b00000000, 0b11110000, 0b00000111, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000,
|
||||
0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00001000,
|
||||
0b00000001, 0b00000000, 0b00000000, 0b00011000, 0b00000001, 0b00000000, 0b00000000, 0b00011000, 0b00000001, 0b00000000,
|
||||
0b00000000, 0b00011000, 0b00000001, 0b00000000, 0b00000000, 0b00011000, 0b00000001, 0b00000000, 0b00000000, 0b00011000,
|
||||
0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b00000001, 0b00000000,
|
||||
0b00000000, 0b00001000, 0b00000001, 0b00000000, 0b00000000, 0b00001000, 0b11111110, 0b00000000, 0b11110000, 0b00000111};
|
||||
|
||||
// This is the left and right bars for the fill in
|
||||
const unsigned char batteryBitmap_sidegaps_h[] PROGMEM = {
|
||||
0b11111111, 0b00001111, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b11111111, 0b00001111};
|
||||
|
||||
// Lightning Bolt
|
||||
const unsigned char lightning_bolt_h[] PROGMEM = {
|
||||
0b11110000, 0b00000000, 0b11110000, 0b00000000, 0b01110000, 0b00000000, 0b00111000, 0b00000000, 0b00111100,
|
||||
0b00000000, 0b11111100, 0b00000000, 0b01111110, 0b00000000, 0b00111000, 0b00000000, 0b00110000, 0b00000000,
|
||||
0b00010000, 0b00000000, 0b00010000, 0b00000000, 0b00001000, 0b00000000, 0b00001000, 0b00000000};
|
||||
|
||||
// === Vertical battery ===
|
||||
// Basic battery design and all related pieces
|
||||
const unsigned char batteryBitmap_v[] PROGMEM = {0b00011100, 0b00111110, 0b01000001, 0b01000001, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b01000001, 0b01000001, 0b01000001, 0b00111110};
|
||||
// This is the left and right bars for the fill in
|
||||
const unsigned char batteryBitmap_sidegaps_v[] PROGMEM = {0b10000010, 0b10000010, 0b10000010};
|
||||
// Lightning Bolt
|
||||
const unsigned char lightning_bolt_v[] PROGMEM = {0b00000100, 0b00000110, 0b00011111, 0b00001100, 0b00000100};
|
||||
|
||||
#ifndef EXCLUDE_EMOJI
|
||||
#define thumbs_height 25
|
||||
#define thumbs_width 25
|
||||
@ -216,13 +247,13 @@ static unsigned char poo[] PROGMEM = {
|
||||
#define mail_width 10
|
||||
#define mail_height 7
|
||||
static const unsigned char mail[] PROGMEM = {
|
||||
0b11111111, 0b00, // Top line
|
||||
0b10000001, 0b00, // Edges
|
||||
0b11000011, 0b00, // Diagonals start
|
||||
0b10100101, 0b00, // Inner M part
|
||||
0b10011001, 0b00, // Inner M part
|
||||
0b10000001, 0b00, // Edges
|
||||
0b11111111, 0b00 // Bottom line
|
||||
0b11111111, 0b00, // Top line
|
||||
0b10000001, 0b00, // Edges
|
||||
0b11000011, 0b00, // Diagonals start
|
||||
0b10100101, 0b00, // Inner M part
|
||||
0b10011001, 0b00, // Inner M part
|
||||
0b10000001, 0b00, // Edges
|
||||
0b11111111, 0b00 // Bottom line
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user