lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alternating IP address and device name on 4 Line Display.

Browse Source
This commit is contained in:
Blaz Kristan 2021-06-13 18:05:30 +02:00
parent 8aa8ae239a
commit 8517cc8211
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
View File

@ -231,6 +231,8 @@ class FourLineDisplayUsermod : public Usermod {
* or if forceRedraw). * or if forceRedraw).
*/ */
void redraw(bool forceRedraw) { void redraw(bool forceRedraw) {
static bool showName = false;
if (type==NONE) return; if (type==NONE) return;
if (overlayUntil > 0) { if (overlayUntil > 0) {
if (millis() >= overlayUntil) { if (millis() >= overlayUntil) {
@ -274,6 +276,15 @@ class FourLineDisplayUsermod : public Usermod {
} else if (displayTurnedOff && clockMode) { } else if (displayTurnedOff && clockMode) {
showTime(); showTime();
} else if ((millis() - lastRedraw)/1000%3 == 0) { } else if ((millis() - lastRedraw)/1000%3 == 0) {
// alternate IP address and server name
String serverName = serverDescription;
if (serverName != String("WLED")) {
showName = !showName;
for (uint8_t i=serverName.length(); i<getCols()-1; i++) serverName += ' ';
//drawGlyph(0, lineHeight, 68, u8x8_font_open_iconic_embedded_1x1); // wifi icon
if (showName) drawString(1, lineHeight, serverName.c_str());
else drawString(1, lineHeight, ((WiFi.localIP()).toString()).c_str());
}
// change 4th line every 3s // change 4th line every 3s
switch (lineFourType) { switch (lineFourType) {
case FLD_LINE_4_BRIGHTNESS: case FLD_LINE_4_BRIGHTNESS:
@ -322,7 +333,7 @@ class FourLineDisplayUsermod : public Usermod {
// Do the actual drawing // Do the actual drawing
// First row with Wifi name // First row with Wifi name
drawGlyph(0, 0, 80, u8x8_font_open_iconic_embedded_1x1); // wifi icon drawGlyph(0, 0, 80, u8x8_font_open_iconic_embedded_1x1); // home icon
String ssidString = knownSsid.substring(0, getCols() > 1 ? getCols() - 2 : 0); String ssidString = knownSsid.substring(0, getCols() > 1 ? getCols() - 2 : 0);
drawString(1, 0, ssidString.c_str()); drawString(1, 0, ssidString.c_str());
// Print `~` char to indicate that SSID is longer, than our display // Print `~` char to indicate that SSID is longer, than our display
@ -331,7 +342,7 @@ class FourLineDisplayUsermod : public Usermod {
} }
// Second row with IP or Psssword // Second row with IP or Psssword
drawGlyph(0, lineHeight, 68, u8x8_font_open_iconic_embedded_1x1); // home icon drawGlyph(0, lineHeight, 68, u8x8_font_open_iconic_embedded_1x1); // wifi icon
// Print password in AP mode and if led is OFF. // Print password in AP mode and if led is OFF.
if (apActive && bri == 0) { if (apActive && bri == 0) {
drawString(1, lineHeight, apPass); drawString(1, lineHeight, apPass);

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2106072 #define VERSION 2106131
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG