mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ESP32 non-core3 mis-aligned %_b

This commit is contained in:
Theo Arends 2024-04-02 16:37:42 +02:00
parent d90f0e1cbe
commit 34d6bffe7a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/default/Ext-printf/src/ext_printf.cpp
View File

@ -326,13 +326,29 @@ int32_t ext_vsnprintf_P(char * out_buf, size_t buf_len, const char * fmt_P, va_l
} }
} }
break; break;
// '%_b' outputs an unsigned int to binary // '%_b' outputs a uint32_t to binary
// '%8_b' outputs a uint8_t to binary
case 'b': // Binary, decimals indicates the zero prefill case 'b': // Binary, decimals indicates the zero prefill
{ {
if (cur_val < min_valid_ptr) { new_val_str = ext_invalid_mem; } if (cur_val < min_valid_ptr) { new_val_str = ext_invalid_mem; }
else { else {
if ((decimals < 0) || (decimals > 32)) { decimals = 1; } #ifdef ESP8266
if ((decimals < 1) || (decimals > 32)) { decimals = 1; }
ToBinary(*(uint32_t*)cur_val, hex, decimals); ToBinary(*(uint32_t*)cur_val, hex, decimals);
#endif // ESP8266
#ifdef ESP32
#if ESP_IDF_VERSION_MAJOR >= 5
if ((decimals < 1) || (decimals > 32)) { decimals = 1; }
ToBinary(*(uint32_t*)cur_val, hex, decimals);
#else
// Workaround ESP32 non-32-bit boundery issue
// '%_b' outputs a uint8_t to binary (ESP8266) but as uint32_t on ESP32!
if ((decimals < 1) || (decimals > 32)) { decimals = 32; }
uint32_t mask = (32 == decimals) ? 0xFFFFFFFF : (1 << decimals) -1;
uint32_t val = *(uint32_t*)cur_val & mask;
ToBinary(val, hex, decimals);
#endif // ESP_IDF_VERSION_MAJOR
#endif // ESP32
new_val_str = copyStr(hex); new_val_str = copyStr(hex);
if (new_val_str == nullptr) { goto free_allocs; } if (new_val_str == nullptr) { goto free_allocs; }
allocs[alloc_idx++] = new_val_str; allocs[alloc_idx++] = new_val_str;