diff --git a/lib/lib_display/UDisplay/uDisplay.cpp b/lib/lib_display/UDisplay/uDisplay.cpp index 8414795e0..f6ac1a20b 100755 --- a/lib/lib_display/UDisplay/uDisplay.cpp +++ b/lib/lib_display/UDisplay/uDisplay.cpp @@ -20,7 +20,7 @@ #include #include "uDisplay.h" -#define UDSP_DEBUG +// #define UDSP_DEBUG const uint16_t udisp_colors[]={UDISP_BLACK,UDISP_WHITE,UDISP_RED,UDISP_GREEN,UDISP_BLUE,UDISP_CYAN,UDISP_MAGENTA,\ UDISP_YELLOW,UDISP_NAVY,UDISP_DARKGREEN,UDISP_DARKCYAN,UDISP_MAROON,UDISP_PURPLE,UDISP_OLIVE,\ diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h index f5c5d5af8..c17f3d2cd 100644 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -83,7 +83,7 @@ extern const bcstring be_const_str_SERIAL_8O1; extern const bcstring be_const_str_SERIAL_8O2; extern const bcstring be_const_str_SK6812_GRBW; extern const bcstring be_const_str_STATE_DEFAULT; -extern const bcstring be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27; +extern const bcstring be_const_str_TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27; extern const bcstring be_const_str_Tasmota; extern const bcstring be_const_str_Tele; extern const bcstring be_const_str_Timer; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h index b200c3d4b..e2a82bb92 100644 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -147,7 +147,7 @@ be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_c be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, NULL); be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_time_str); be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_srand); -be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str_get_option); +be_define_const_str(TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: Loaded Tasmota App '%s'", 926477145u, 0, 28, &be_const_str_consume_silence); be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_file); be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_pop_path); be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, NULL); @@ -848,7 +848,7 @@ static const bstring* const m_string_table[] = { (const bstring *)&be_const_str_find, (const bstring *)&be_const_str_SERIAL_8E2, NULL, - (const bstring *)&be_const_str_consume_silence, + (const bstring *)&be_const_str_TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27, (const bstring *)&be_const_str_False, (const bstring *)&be_const_str__settings_def, (const bstring *)&be_const_str__X23, @@ -1141,7 +1141,7 @@ static const bstring* const m_string_table[] = { (const bstring *)&be_const_str__write, NULL, NULL, - (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, + (const bstring *)&be_const_str_get_option, (const bstring *)&be_const_str_wifi, (const bstring *)&be_const_str_OPTION_A, (const bstring *)&be_const_str_True, diff --git a/lib/libesp32/berry_tasmota/src/be_tapp_lib.c b/lib/libesp32/berry_tasmota/src/be_tapp_lib.c index 1a312d110..d47d9c2d0 100644 --- a/lib/libesp32/berry_tasmota/src/be_tapp_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_tapp_lib.c @@ -61,7 +61,7 @@ be_local_closure(Tapp_autoexec, /* name */ /* K7 */ be_nested_str(tasmota), /* K8 */ be_nested_str(log), /* K9 */ be_nested_str(format), - /* K10 */ be_nested_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27), + /* K10 */ be_nested_str(TAP_X3A_X20Loaded_X20Tasmota_X20App_X20_X27_X25s_X27), /* K11 */ be_const_int(2), /* K12 */ be_nested_str(load), /* K13 */ be_nested_str(_X23autoexec_X2Ebe), diff --git a/lib/libesp32/berry_tasmota/src/embedded/tapp.be b/lib/libesp32/berry_tasmota/src/embedded/tapp.be index 30aa1f740..d1638bb64 100644 --- a/lib/libesp32/berry_tasmota/src/embedded/tapp.be +++ b/lib/libesp32/berry_tasmota/src/embedded/tapp.be @@ -19,7 +19,7 @@ tapp_module.init = def (m) for d: dir if string.find(d, ".tapp") > 0 - tasmota.log(string.format("TAP: found Tasmota App '%s'", d), 2) + tasmota.log(string.format("TAP: Loaded Tasmota App '%s'", d), 2) tasmota.load(d + "#autoexec.be") end end diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index fc6ee981e..a4a12736e 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -317,7 +317,7 @@ void BerryInit(void) { be_pop(berry.vm, 1); } - AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_BERRY "Berry initialized, RAM used=%u"), callBerryGC()); + AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_BERRY "Berry initialized, RAM used=%u bytes"), callBerryGC()); berry_init_ok = true; // we generate a synthetic event `autoexec` diff --git a/tasmota/xdsp_17_universal.ino b/tasmota/xdsp_17_universal.ino index a37d5af5e..bd77e2a2b 100644 --- a/tasmota/xdsp_17_universal.ino +++ b/tasmota/xdsp_17_universal.ino @@ -79,7 +79,7 @@ int8_t cs; if (desc) { memcpy_P(fbuff, desc, DISPDESC_SIZE - 1); ddesc = fbuff; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: const char descriptor used")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: const char descriptor used")); } @@ -92,7 +92,7 @@ int8_t cs; fp.read((uint8_t*)fbuff, size); fp.close(); ddesc = fbuff; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: File descriptor used")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: File descriptor used")); } } #endif // USE_UFILESYS @@ -106,7 +106,7 @@ int8_t cs; while (*lp != '\n') lp++; memcpy(fbuff, lp + 1, DISPDESC_SIZE - 1); ddesc = fbuff; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: Script descriptor used")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: Script descriptor used")); } } #endif // USE_SCRIPT @@ -123,7 +123,7 @@ int8_t cs; if (fbuff[cnt] == ' ') fbuff[cnt] = '\n'; } ddesc = fbuff; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: Rule 3 descriptor used")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: Rule 3 descriptor used")); } } @@ -134,12 +134,12 @@ int8_t cs; if (!ddesc) { memcpy_P(fbuff, DSP_SAMPLE_DESC, sizeof(DSP_SAMPLE_DESC)); ddesc = fbuff; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: Flash descriptor used")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: Flash descriptor used")); } #endif // DSP_ROM_DESC if (!ddesc) { - AddLog(LOG_LEVEL_INFO, PSTR("DSP: No valid descriptor found")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: No valid descriptor found")); if (fbuff) free(fbuff); return 0; } @@ -238,7 +238,7 @@ int8_t cs; // init renderer if (renderer) { delete renderer; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: reinit")); + AddLog(LOG_LEVEL_DEBUG, PSTR("DSP: reinit")); } udisp = new uDisplay(ddesc); @@ -328,7 +328,7 @@ int8_t cs; #endif // SHOW_SPLASH udisp_init_done = true; - AddLog(LOG_LEVEL_INFO, PSTR("DSP: %s!"), renderer->devname()); + AddLog(LOG_LEVEL_INFO, PSTR("DSP: Configured display '%s'"), renderer->devname()); return renderer; }