Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-10 09:17:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixing colon for tm1637 display if inverted set true (#5072)

Browse source
This commit is contained in:
Pavlo Dudnytskyi 2023-07-12 22:24:49 +02:00 committed by GitHub
parent 119bbba254
commit e4a640844c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
esphome/components/tm1637/tm1637.cpp
View file

@ -300,6 +300,7 @@ uint8_t TM1637Display::read_byte_() {
uint8_t TM1637Display::print(uint8_t start_pos, const char *str) { uint8_t TM1637Display::print(uint8_t start_pos, const char *str) {
// ESP_LOGV(TAG, "Print at %d: %s", start_pos, str); // ESP_LOGV(TAG, "Print at %d: %s", start_pos, str);
uint8_t pos = start_pos; uint8_t pos = start_pos;
bool use_dot = false;
for (; *str != '\0'; str++) { for (; *str != '\0'; str++) {
uint8_t data = TM1637_UNKNOWN_CHAR; uint8_t data = TM1637_UNKNOWN_CHAR;
if (*str >= ' ' && *str <= '~') if (*str >= ' ' && *str <= '~')
@ -312,14 +313,14 @@ uint8_t TM1637Display::print(uint8_t start_pos, const char *str) {
// XABCDEFG, but TM1637 is // XGFEDCBA // XABCDEFG, but TM1637 is // XGFEDCBA
if (this->inverted_) { if (this->inverted_) {
// XABCDEFG > XGCBAFED // XABCDEFG > XGCBAFED
data = ((data & 0x80) ? 0x80 : 0) | // no move X data = ((data & 0x80) || use_dot ? 0x80 : 0) | // no move X
((data & 0x40) ? 0x8 : 0) | // A ((data & 0x40) ? 0x8 : 0) | // A
((data & 0x20) ? 0x10 : 0) | // B ((data & 0x20) ? 0x10 : 0) | // B
((data & 0x10) ? 0x20 : 0) | // C ((data & 0x10) ? 0x20 : 0) | // C
((data & 0x8) ? 0x1 : 0) | // D ((data & 0x8) ? 0x1 : 0) | // D
((data & 0x4) ? 0x2 : 0) | // E ((data & 0x4) ? 0x2 : 0) | // E
((data & 0x2) ? 0x4 : 0) | // F ((data & 0x2) ? 0x4 : 0) | // F
((data & 0x1) ? 0x40 : 0); // G ((data & 0x1) ? 0x40 : 0); // G
} else { } else {
// XABCDEFG > XGFEDCBA // XABCDEFG > XGFEDCBA
data = ((data & 0x80) ? 0x80 : 0) | // no move X data = ((data & 0x80) ? 0x80 : 0) | // no move X
@ -331,18 +332,18 @@ uint8_t TM1637Display::print(uint8_t start_pos, const char *str) {
((data & 0x2) ? 0x20 : 0) | // F ((data & 0x2) ? 0x20 : 0) | // F
((data & 0x1) ? 0x40 : 0); // G ((data & 0x1) ? 0x40 : 0); // G
} }
if (*str == '.') { use_dot = *str == '.';
if (pos != start_pos) if (use_dot) {
pos--; if ((!this->inverted_) && (pos != start_pos)) {
this->buffer_[pos] |= 0b10000000; this->buffer_[pos - 1] |= 0b10000000;
}
} else { } else {
if (pos >= 6) { if (pos >= 6) {
ESP_LOGE(TAG, "String is too long for the display!"); ESP_LOGE(TAG, "String is too long for the display!");
break; break;
} }
this->buffer_[pos] = data; this->buffer_[pos++] = data;
} }
pos++;
} }
return pos - start_pos; return pos - start_pos;
} }