pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-07 12:09:31 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Run Trunk Format and Translate Comments FR->EN

Browse Source
This commit is contained in:
Tom Fifield 2025-04-20 18:49:18 +10:00
parent 19a19c9bcf
commit 436c2d0cb0
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/graphics/Screen.cpp
View File

@ -237,7 +237,7 @@ static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
#endif #endif
#if HAS_ETHERNET #if HAS_ETHERNET
static void drawEthernetFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) static void drawEthernetFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
display->setFont(FONT_SMALL); display->setFont(FONT_SMALL);
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
@ -248,31 +248,30 @@ static void drawEthernetFrame(OLEDDisplay *display, OLEDDisplayUiState *state, i
} }
display->setColor(WHITE); display->setColor(WHITE);
// Position verticale ajustée - commence plus haut // Adjust vertical position verticale ajustée - starts higher
int16_t y_offset = y + 2; // Réduit l'espace au-dessus int16_t y_offset = y + 2; // Reduces space at top
// Alignement à gauche (x + petit offset) // Left Alignement (x + small offset)
int16_t x_offset = x + 2; int16_t x_offset = x + 2;
// Affichage non centré, aligné à gauche // Display is not centered, align left
display->drawString(x_offset, y_offset, "Ethernet Config:"); display->drawString(x_offset, y_offset, "Ethernet Config:");
y_offset += FONT_HEIGHT_SMALL + 2; // Espacement légèrement réduit y_offset += FONT_HEIGHT_SMALL + 2; // Slightly reduced spacing
display->drawString(x_offset, y_offset, "IP: " + Ethernet.localIP().toString()); display->drawString(x_offset, y_offset, "IP: " + Ethernet.localIP().toString());
y_offset += FONT_HEIGHT_SMALL; y_offset += FONT_HEIGHT_SMALL;
display->drawString(x_offset, y_offset, "Mask: " + Ethernet.subnetMask().toString()); display->drawString(x_offset, y_offset, "Mask: " + Ethernet.subnetMask().toString());
y_offset += FONT_HEIGHT_SMALL; y_offset += FONT_HEIGHT_SMALL;
display->drawString(x_offset, y_offset, "GW: " + Ethernet.gatewayIP().toString()); display->drawString(x_offset, y_offset, "GW: " + Ethernet.gatewayIP().toString());
//y_offset += FONT_HEIGHT_SMALL; // y_offset += FONT_HEIGHT_SMALL;
//display->drawString(x_offset, y_offset, "DNS: " + Ethernet.dnsServerIP().toString()); // display->drawString(x_offset, y_offset, "DNS: " + Ethernet.dnsServerIP().toString());
} }
#endif #endif
void Screen::drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message) void Screen::drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message)
{ {
uint16_t x_offset = display->width() / 2; uint16_t x_offset = display->width() / 2;
@ -2222,7 +2221,7 @@ void Screen::setFrames(FrameFocus focus)
normalFrames[numframes++] = &Screen::drawDebugInfoWiFiTrampoline; normalFrames[numframes++] = &Screen::drawDebugInfoWiFiTrampoline;
} }
#endif #endif
#if HAS_ETHERNET #if HAS_ETHERNET
if (Ethernet.hardwareStatus() != EthernetNoHardware) { if (Ethernet.hardwareStatus() != EthernetNoHardware) {
normalFrames[numframes++] = drawEthernetFrame; normalFrames[numframes++] = drawEthernetFrame;