jaro/ESPScroller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned added max loops esc, clear esc

Browse Source
This commit is contained in:
Jaro
2021-11-30 21:23:33 +01:00
parent e88638c146
commit 762ed25669
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Scroller.cpp
View File

@@ -24,17 +24,17 @@ eDict_t Escapes[] = {
{"\u001b[1m","bold",eDict_t::CONTROL, BOLD},
{"\u001b[4m","underline",eDict_t::CONTROL, UNDERLINE},
{"\u001b[7m","reversed",eDict_t::CONTROL, REVERSED},
{"\u001b[2J","clear",eDict_t::CONTROL, CLEAR_ALL},
{"\u001b[97;%dm","loops",eDict_t::CONTOL_WITH_PARAM, LOOPS},
{"\u001b[98;%dm","speed",eDict_t::CONTOL_WITH_PARAM, SPEED},
{"\u001b[99;%dm","timeout",eDict_t::CONTOL_WITH_PARAM, TIMEOUT},
};
SimpleMap<String, eDict_t*>* escMap;
Scroller::Scroller(int max_loops)
Scroller::Scroller()
{
_max_loops = max_loops;
_act_setting = _setting;
_act_setting = _setting;
}
void Scroller::init()
@@ -81,6 +81,8 @@ bool Scroller::decodeEscape2Setting(String es)
if (e->tt == eDict_t::CONTROL) {
switch (e->control) {
case CLEAR_ALL:
DeleteLines();
case RESET_ALL:
_act_setting = _setting;
break;
@@ -93,7 +95,6 @@ bool Scroller::decodeEscape2Setting(String es)
case REVERSED:
_act_setting.reversed = true;
break;
}
}
if (e->tt == eDict_t::CONTOL_WITH_PARAM)
@@ -107,6 +108,9 @@ bool Scroller::decodeEscape2Setting(String es)
case TIMEOUT:
_act_setting.timeout = param;
break;
case LOOPS:
_act_setting.loops = param;
break;
}
}
if (e->tt == eDict_t::COLOR) _act_setting.color = e->color;
@@ -157,6 +161,7 @@ bool Scroller::ReplaceLine(int number,String line)
void Scroller::DeleteLines()
{
_nlines = 0;
_lp = 0;
}
void Scroller::Show(int _x,int _y,String line)
@@ -166,7 +171,9 @@ void Scroller::Show(int _x,int _y,String line)
for (int l=0;l < line.length();l++) {
if (line.charAt(l) == '\u001b') {
int ee = line.indexOf('m',l);
int ee;
for (ee = l+2; (line.charAt(ee) >= '0' && line.charAt(ee) <= '9') || line.charAt(ee) == ';'; ee++ )
;
decodeEscape2Setting(line.substring(l,ee+1));
l = ee;
continue;
@@ -192,7 +199,9 @@ String Scroller::LineUnescaped(String line)
String rawLine = "";
for (int l=0;l < line.length();l++) {
if (line.charAt(l) == '\u001b') {
int ee = line.indexOf('m',l);
int ee;
for (ee = l+2; (line.charAt(ee) >= '0' && line.charAt(ee) <= '9') || line.charAt(ee) == ';'; ee++ )
;
l = ee;
continue;
}
@@ -276,7 +285,7 @@ void Scroller::loop(ulong tick)
_delayTicks = 50;
}
if (TimesScrolled() == _max_loops) {
if (TimesScrolled() == _act_setting.loops) {
Serial.println("MAX LOOP");
TurnOff();
return;