mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add DisplayMode 6

Browse Source
This commit is contained in:
Theo Arends 2025-08-24 17:04:31 +02:00
parent c80563b3b5
commit 43a5359af7
6 changed files with 89 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
## [15.0.1.3]
### Added
- ESP32 ROM SHA Hardware Acceleration to BearSSL (#23819)
### Breaking Changed

3
RELEASENOTES.md
View File

@ -123,7 +123,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
- Universal display driver for ZJY169S0800TG01 ST7789 280x240 [#23638](https://github.com/arendst/Tasmota/issues/23638)
- NeoPool add Redox tank alarm [#19811](https://github.com/arendst/Tasmota/issues/19811)
- I2S additions [#23543](https://github.com/arendst/Tasmota/issues/23543)
- Basic support for ESP32-P4 [#23663](https://github.com/arendst/Tasmota/issues/23663)
- ESP32 ROM SHA Hardware Acceleration to BearSSL [#23819](https://github.com/arendst/Tasmota/issues/23819)
- Support for ESP32-P4 [#23663](https://github.com/arendst/Tasmota/issues/23663)
- Support for ESP32-C5 [#23804](https://github.com/arendst/Tasmota/issues/23804)
- ESP32-P4 command `HostedOta` [#23675](https://github.com/arendst/Tasmota/issues/23675)
- Berry f-strings now support ':' in expression [#23618](https://github.com/arendst/Tasmota/issues/23618)

85
tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
View File

@ -159,6 +159,17 @@ enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_E
enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };
enum DisplayModes {
DM_USER_CONTROL, // 0
DM_TIME,
DM_LOCAL_SENSORS,
DM_TIME_LOCAL_SENSORS,
DM_MQTT_SENSORS,
DM_TIME_MQTT_SENSORS,
DM_MQTT_TOPIC_UPTIME,
DM_MAX
};
const char kDisplayCommands[] PROGMEM = D_PRFX_DISPLAY "|" // Prefix
"|" D_CMND_DISP_MODEL "|" D_CMND_DISP_TYPE "|" D_CMND_DISP_WIDTH "|" D_CMND_DISP_HEIGHT "|" D_CMND_DISP_MODE "|"
D_CMND_DISP_INVERT "|" D_CMND_DISP_REFRESH "|" D_CMND_DISP_DIMMER "|" D_CMND_DISP_COLS "|" D_CMND_DISP_ROWS "|"
@ -1790,6 +1801,40 @@ void DisplayAnalyzeJson(char *topic, const char *json) {
}
}
void DisplayState(char *topic, const char *json) {
static uint32_t minute = 61;
char buffer[Settings->display_cols[0] +1]; // Max sized buffer string
if (minute != RtcTime.minute) {
minute = RtcTime.minute;
char buffer2[Settings->display_cols[0] +1]; // Max sized buffer string
memset(buffer2, '-', sizeof(buffer2)); // Set to -
buffer2[sizeof(buffer2) -1] = '\0';
snprintf_P(buffer, sizeof(buffer), PSTR("- %02d" D_HOUR_MINUTE_SEPARATOR "%02d %s"), RtcTime.hour, RtcTime.minute, buffer2);
DisplayLogBufferAdd(buffer);
}
const char *uptime = EmptyStr;
if (Settings->display_cols[0] > 20) { // Need space for displaying topic and uptime
String jsonStr = json; // {"Time":"2025-08-24T14:34:59","Uptime":"0T00:05:10","UptimeSec":310,"Heap":49,...
JsonParser parser((char*)jsonStr.c_str());
JsonParserObject root = parser.getRootObject();
if (root) { // Did JSON parsing went ok?
uptime = root.getStr(PSTR(D_JSON_UPTIME), EmptyStr);
if (strlen(uptime) && (Settings->display_cols[0] < 24)) {
char *eol = (char*)uptime + strlen(uptime) -3;
*eol = '\0'; // Remove uptime seconds
}
}
}
// int spaces = Settings->display_cols[0] - Settings->display_cols[1] - strlen(topic); // Left align on DisplayCols2
int spaces = Settings->display_cols[0] - strlen(topic) - strlen(uptime); // Right align on DisplayCols1
if (spaces < 1) { spaces = 1; }
snprintf_P(buffer, sizeof(buffer), PSTR("%s%*s%s"), topic, spaces, "", uptime);
DisplayLogBufferAdd(buffer);
}
void DisplayMqttSubscribe(void) {
/* Subscribe to tele messages only
* Supports the following FullTopic formats
@ -1811,7 +1856,7 @@ void DisplayMqttSubscribe(void) {
}
strncat(ntopic, SettingsText(SET_MQTTPREFIX3), sizeof(ntopic) - strlen(ntopic) -1); // Subscribe to tele messages
strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1); // Add multi-level wildcard
if (Settings->display_model && (Settings->display_mode &0x04)) {
if (Settings->display_model && (Settings->display_mode >= DM_MQTT_SENSORS)) {
disp_subscribed = true;
MqttSubscribe(ntopic);
} else {
@ -1829,10 +1874,22 @@ bool DisplayMqttData(void) {
snprintf_P(stopic, sizeof(stopic) , PSTR("%s/"), SettingsText(SET_MQTTPREFIX3)); // tele/
char *tp = strstr(XdrvMailbox.topic, stopic);
if (tp) { // tele/tasmota/SENSOR
if (Settings->display_mode &0x04) {
tp = tp + strlen(stopic); // tasmota/SENSOR
char *topic = strtok(tp, "/"); // tasmota
DisplayAnalyzeJson(topic, XdrvMailbox.data);
if (Settings->display_mode >= DM_MQTT_SENSORS) { // 4..6
tp = tp + strlen(stopic); // tasmota/SENSOR
char *state = strstr_P(tp, PSTR("STATE"));
char *sensor = strstr_P(tp, PSTR("SENSOR"));
char *topic = strtok(tp, "/"); // tasmota
if (topic) {
if (DM_MQTT_TOPIC_UPTIME == Settings->display_mode) {
if (state) {
DisplayState(topic, XdrvMailbox.data);
}
} else { // DM_MQTT_SENSORS and DM_TIME_MQTT_SENSORS
if (state || sensor) {
DisplayAnalyzeJson(topic, XdrvMailbox.data);
}
}
}
}
return true;
}
@ -1840,9 +1897,10 @@ bool DisplayMqttData(void) {
return false;
}
void DisplayLocalSensor(void)
{
if ((Settings->display_mode &0x02) && (0 == TasmotaGlobal.tele_period)) {
void DisplayLocalSensor(void) {
if (((DM_LOCAL_SENSORS == Settings->display_mode) ||
(DM_TIME_LOCAL_SENSORS == Settings->display_mode)) &&
(0 == TasmotaGlobal.tele_period)) {
char no_topic[1] = { 0 };
// DisplayAnalyzeJson(TasmotaGlobal.mqtt_topic, ResponseData()); // Add local topic
DisplayAnalyzeJson(no_topic, ResponseData()); // Discard any topic
@ -1899,7 +1957,7 @@ void DisplayInitDriver(void) {
disp_device = TasmotaGlobal.devices_present;
#ifndef USE_DISPLAY_MODES1TO5
Settings->display_mode = 0;
Settings->display_mode = DM_USER_CONTROL;
#else
DisplayLogBufferInit();
#endif // USE_DISPLAY_MODES1TO5
@ -1987,19 +2045,20 @@ void CmndDisplayMode(void) {
* 3 = Day Local sensors and time Local sensors and time
* 4 = Mqtt left and time Mqtt (incl local) sensors Mqtt (incl local) sensors
* 5 = Mqtt up and time Mqtt (incl local) sensors and time Mqtt (incl local) sensors and time
* 6 = Mqtt topic Mqtt topic Mqtt topic
*/
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
if ((XdrvMailbox.payload >= DM_USER_CONTROL) && (XdrvMailbox.payload < DM_MAX)) {
uint32_t last_display_mode = Settings->display_mode;
Settings->display_mode = XdrvMailbox.payload;
if (last_display_mode != Settings->display_mode) { // Switch to different mode
if ((!last_display_mode && Settings->display_mode) || // Switch to mode 1, 2, 3 or 4
if ((!last_display_mode && Settings->display_mode) || // Switch to mode >0
(last_display_mode && !Settings->display_mode)) { // Switch to mode 0
DisplayInit(DISPLAY_INIT_MODE);
}
if (1 == Settings->display_mode) { // Switch to mode 1
if (DM_TIME == Settings->display_mode) { // Switch to mode 1
DisplayClear();
}
else if (Settings->display_mode > 1) { // Switch to mode 2, 3 or 4
else if (Settings->display_mode > DM_TIME) { // Switch to mode 2 .. 6
DisplayLogBufferInit();
}
DisplayMqttSubscribe();

13
tasmota/tasmota_xdsp_display/xdsp_05_epaper_29.ino
View File

@ -155,15 +155,10 @@ void EpdRefresh29(void) // Every second
EpdDrawStringAt(0, 0, tftdt, COLORED, 0);
*/
switch (Settings->display_mode) {
case 1: // Text
case 2: // Local
case 3: // Local
case 4: // Mqtt
case 5: // Mqtt
EpdPrintLog29();
renderer->Updateframe();
break;
if (Settings->display_mode > DM_USER_CONTROL) {
EpdPrintLog29();
renderer->Updateframe();
}
// EpdDisplayFrame();

17
tasmota/tasmota_xdsp_display/xdsp_16_esp32_epaper_47.ino
View File

@ -329,18 +329,11 @@ void EPD47_Time(void) {
void EPD47_Refresh(void) { // Every second
if (!renderer) return;
if (Settings->display_mode) { // Mode 0 is User text
switch (Settings->display_mode) {
case 1: // Time
EPD47_Time();
break;
case 2: // Local
case 3: // Local
case 4: // Mqtt
case 5: // Mqtt
EPD47_PrintLog();
break;
}
if (DM_TIME == Settings->display_mode) {
EPD47_Time();
}
else if (Settings->display_mode > DM_TIME) {
EPD47_PrintLog();
}
}

17
tasmota/tasmota_xdsp_display/xdsp_17_universal.ino
View File

@ -586,18 +586,11 @@ void UDISP_Time(void) {
void UDISP_Refresh(void) { // Every second
if (!renderer) return;
if (Settings->display_mode) { // Mode 0 is User text
switch (Settings->display_mode) {
case 1: // Time
UDISP_Time();
break;
case 2: // Local
case 3: // Local
case 4: // Mqtt
case 5: // Mqtt
UDISP_PrintLog();
break;
}
if (DM_TIME == Settings->display_mode) {
UDISP_Time();
}
else if (Settings->display_mode > DM_TIME) {
UDISP_PrintLog();
}
}