jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 19:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor bug in DisplayScrollText

Browse Source
This commit is contained in:
Ajith Vasudevan 2021-02-23 12:52:05 +05:30
parent c7f2030540
commit f16f2c1879
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tasmota/xdsp_15_tm1637.ino
View File

@ -464,6 +464,7 @@ bool CmndScrollText(void) {
XdrvMailbox.data = TM1637Data.msg; XdrvMailbox.data = TM1637Data.msg;
return false; return false;
} else { } else {
snprintf(TM1637Data.scroll_text, sizeof(TM1637Data.scroll_text), PSTR(" "));
snprintf(TM1637Data.scroll_text, sizeof(TM1637Data.scroll_text), PSTR("%s"), XdrvMailbox.data); snprintf(TM1637Data.scroll_text, sizeof(TM1637Data.scroll_text), PSTR("%s"), XdrvMailbox.data);
TM1637Data.scroll_text[XdrvMailbox.data_len] = 0; TM1637Data.scroll_text[XdrvMailbox.data_len] = 0;
TM1637Data.scroll_index = 0; TM1637Data.scroll_index = 0;
@ -480,6 +481,10 @@ bool CmndScrollText(void) {
* Command: DisplayTM1637Data.scroll_delay delay {0-15} // default = 4 * Command: DisplayTM1637Data.scroll_delay delay {0-15} // default = 4
\*********************************************************************************************/ \*********************************************************************************************/
bool CmndScrollDelay(void) { bool CmndScrollDelay(void) {
if(ArgC() == 0) {
XdrvMailbox.payload = TM1637Data.scroll_delay;
return true;
}
if(TM1637Data.scroll_delay<0) TM1637Data.scroll_delay=0; if(TM1637Data.scroll_delay<0) TM1637Data.scroll_delay=0;
TM1637Data.scroll_delay = XdrvMailbox.payload; TM1637Data.scroll_delay = XdrvMailbox.payload;
return true; return true;
@ -501,17 +506,28 @@ void scrollText(void) {
TM1637Data.scroll_index = 0; TM1637Data.scroll_index = 0;
return; return;
} }
bool clr = false;
uint8_t rawBytes[1]; uint8_t rawBytes[1];
for(uint32_t i=0, j=TM1637Data.scroll_index; i< strlen(TM1637Data.scroll_text); i++, j++) { for(uint32_t i=0, j=TM1637Data.scroll_index; i< 1 + strlen(TM1637Data.scroll_text); i++, j++) {
if(i > (TM1637Data.num_digits-1)) break; if(i > (TM1637Data.num_digits-1)) { break; }
if(TM1637Data.scroll_text[j] == 0) {clr = true;}; rawBytes[0] = tm1637display->encode(TM1637Data.scroll_text[j]);
bool dotSkipped = false;
if(TM1637Data.scroll_text[j+1] == '.') {
dotSkipped = true;
rawBytes[0] = rawBytes[0] | 128;
j++;
} else if(TM1637Data.scroll_text[j] == '^') {
rawBytes[0] = 1 | 2 | 32 | 64;
}
if(!dotSkipped && TM1637Data.scroll_text[j] == '.') {
j++;
TM1637Data.scroll_index++;
rawBytes[0] = tm1637display->encode(TM1637Data.scroll_text[j]);
}
if(TM1637Data.scroll_text[j+1] == '.') { rawBytes[0] = rawBytes[0] | 128; }
if(TM1637Data.display_type == TM1637) { if(TM1637Data.display_type == TM1637) {
char charToDisp = (clr ? ' ' : TM1637Data.scroll_text[j]);
rawBytes[0] = tm1637display->encode(charToDisp);
tm1637display->printRaw(rawBytes, 1, i); tm1637display->printRaw(rawBytes, 1, i);
} else if(TM1637Data.display_type == TM1638) { } else if(TM1637Data.display_type == TM1638) {
tm1638display->displayASCII(i, (clr ? ' ' : TM1637Data.scroll_text[j])); tm1638display->display7Seg(i, rawBytes[0]);
} }
} }
@ -676,12 +692,15 @@ bool CmndText(bool clear) {
if(i > (TM1637Data.num_digits-1)) break; if(i > (TM1637Data.num_digits-1)) break;
if(sString[j] == 0) break; if(sString[j] == 0) break;
rawBytes[0] = tm1637display->encode(sString[j]); rawBytes[0] = tm1637display->encode(sString[j]);
bool dotSkipped = false;
if(sString[j+1] == '.') { if(sString[j+1] == '.') {
dotSkipped = true;
rawBytes[0] = rawBytes[0] | 128; rawBytes[0] = rawBytes[0] | 128;
j++; j++;
} else if(sString[j] == '^') { } else if(sString[j] == '^') {
rawBytes[0] = 1 | 2 | 32 | 64; rawBytes[0] = 1 | 2 | 32 | 64;
} }
if(!dotSkipped && sString[j] == '.') rawBytes[0] = 128;
tm1637display->printRaw(rawBytes, 1, i); tm1637display->printRaw(rawBytes, 1, i);
} }
} else if(TM1637Data.display_type == TM1638) { } else if(TM1637Data.display_type == TM1638) {