@@ -6094,13 +6094,23 @@ uint16_t mode_2Dscrollingtext(void) {
60946094 if (!strlen (text)) { // fallback if empty segment name: display date and time
60956095 sprintf_P (text, PSTR (" %s %d, %d %d:%02d%s" ), monthShortStr (month (localTime)), day (localTime), year (localTime), AmPmHour, minute (localTime), sec);
60966096 } else {
6097+ if (text[0 ] == ' #' ) for (auto &c : text) c = std::toupper (c);
60976098 if (!strncmp_P (text,PSTR (" #DATE" ),5 )) sprintf_P (text, zero?PSTR (" %02d.%02d.%04d" ):PSTR (" %d.%d.%d" ), day (localTime), month (localTime), year (localTime));
60986099 else if (!strncmp_P (text,PSTR (" #DDMM" ),5 )) sprintf_P (text, zero?PSTR (" %02d.%02d" ) :PSTR (" %d.%d" ), day (localTime), month (localTime));
60996100 else if (!strncmp_P (text,PSTR (" #MMDD" ),5 )) sprintf_P (text, zero?PSTR (" %02d/%02d" ) :PSTR (" %d/%d" ), month (localTime), day (localTime));
61006101 else if (!strncmp_P (text,PSTR (" #TIME" ),5 )) sprintf_P (text, zero?PSTR (" %02d:%02d%s" ) :PSTR (" %2d:%02d%s" ), AmPmHour, minute (localTime), sec);
61016102 else if (!strncmp_P (text,PSTR (" #HHMM" ),5 )) sprintf_P (text, zero?PSTR (" %02d:%02d" ) :PSTR (" %d:%02d" ), AmPmHour, minute (localTime));
6102- else if (!strncmp_P (text,PSTR (" #HH" ),3 )) sprintf_P (text, zero?PSTR (" %02d" ) :PSTR (" %d" ), AmPmHour);
6103- else if (!strncmp_P (text,PSTR (" #MM" ),3 )) sprintf_P (text, zero?PSTR (" %02d" ) :PSTR (" %d" ), minute (localTime));
6103+ else if (!strncmp_P (text,PSTR (" #HH" ),3 )) sprintf (text, zero? (" %02d" ) : (" %d" ), AmPmHour);
6104+ else if (!strncmp_P (text,PSTR (" #MM" ),3 )) sprintf (text, zero? (" %02d" ) : (" %d" ), minute (localTime));
6105+ else if (!strncmp_P (text,PSTR (" #SS" ),3 )) sprintf (text, (" %02d" ) , second (localTime));
6106+ else if (!strncmp_P (text,PSTR (" #DD" ),3 )) sprintf (text, zero? (" %02d" ) : (" %d" ), day (localTime));
6107+ else if (!strncmp_P (text,PSTR (" #DAY" ),4 )) sprintf (text, (" %s" ) , dayShortStr (day (localTime)));
6108+ else if (!strncmp_P (text,PSTR (" #DDDD" ),5 )) sprintf (text, (" %s" ) , dayStr (day (localTime)));
6109+ else if (!strncmp_P (text,PSTR (" #MO" ),3 )) sprintf (text, zero? (" %02d" ) : (" %d" ), month (localTime));
6110+ else if (!strncmp_P (text,PSTR (" #MON" ),4 )) sprintf (text, (" %s" ) , monthShortStr (month (localTime)));
6111+ else if (!strncmp_P (text,PSTR (" #MMMM" ),5 )) sprintf (text, (" %s" ) , monthStr (month (localTime)));
6112+ else if (!strncmp_P (text,PSTR (" #YY" ),3 )) sprintf (text, (" %02d" ) , year (localTime)%100 );
6113+ else if (!strncmp_P (text,PSTR (" #YYYY" ),5 )) sprintf_P (text, zero?PSTR (" %04d" ) : (" %d" ), year (localTime));
61046114 }
61056115
61066116 const int numberOfLetters = strlen (text);
0 commit comments