jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-21 01:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add command JsonPP <command>|backlog <command>;... to enable JSON PP only once

Browse Source
This commit is contained in:
Theo Arends 2025-04-19 16:56:15 +02:00
parent a11e269ca0
commit 015fa1da89
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
## [14.6.0.1] ## [14.6.0.1]
### Added ### Added
- Command `JsonPP 0..7` to enable (>0) JSON Pretty Print on user interfaces and set number of indents - Command `JsonPP 0..7` to enable (>0) JSON Pretty Print on user interfaces and set number of indents
- Command `JsonPP <command>|backlog <command>;...` to enable JSON PP only once
### Breaking Changed ### Breaking Changed

1
RELEASENOTES.md
View File

@ -117,6 +117,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
## Changelog v14.6.0.1 ## Changelog v14.6.0.1
### Added ### Added
- Command `JsonPP 0..7` to enable (>0) JSON Pretty Print on user interfaces and set number of indents - Command `JsonPP 0..7` to enable (>0) JSON Pretty Print on user interfaces and set number of indents
- Command `JsonPP <command>|backlog <command>;...` to enable JSON PP only once
### Breaking Changed ### Breaking Changed

36
tasmota/tasmota_support/support_command.ino
View File

@ -664,6 +664,35 @@ void CmndDelay(void) {
ResponseCmndNumber(bl_delay); ResponseCmndNumber(bl_delay);
} }
void CmndJsonPP(void) {
// JsonPP 0 - Disable JSON Pretty Print
// JsonPP 1..7 - Enable JSON Pretty Print with 1..7 indent spaces
// JsonPP <command> - If not enabled, enable JSON PP with 1 indent, execute command and restore JsonPP
// JsonPP Backlog <command>;... - If not enabled, enable JSON PP with 1 indent, execute command and restore JsonPP
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 7)) {
Settings->mbflag2.json_pretty_print = XdrvMailbox.payload;
}
else if (XdrvMailbox.data_len) {
uint32_t last_json_pretty_print = Settings->mbflag2.json_pretty_print;
if (0 == Settings->mbflag2.json_pretty_print) {
Settings->mbflag2.json_pretty_print = 1; // Default 1 indent if not set
}
bool backlog = (strchr(XdrvMailbox.data, ';') != nullptr);
String cmnds = XdrvMailbox.data;
if (!last_json_pretty_print && backlog) {
cmnds += ";_JsonPP ";
cmnds += last_json_pretty_print; // Restore JsonPP after execution of backlog commands
}
ExecuteCommand((char*)cmnds.c_str(), SRC_IGNORE);
if (!last_json_pretty_print && !backlog) { // Restore JsonPP after execution of single command
Settings->mbflag2.json_pretty_print = last_json_pretty_print;
}
ResponseClear();
return;
}
ResponseCmndNumber(Settings->mbflag2.json_pretty_print);
}
void CmndPower(void) void CmndPower(void)
{ {
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.devices_present)) { if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TasmotaGlobal.devices_present)) {
@ -1267,13 +1296,6 @@ void CmndOtaUrl(void)
ResponseCmndChar(SettingsText(SET_OTAURL)); ResponseCmndChar(SettingsText(SET_OTAURL));
} }
void CmndJsonPP(void) {
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 7)) {
Settings->mbflag2.json_pretty_print = XdrvMailbox.payload;
}
ResponseCmndNumber(Settings->mbflag2.json_pretty_print);
}
void CmndSeriallog(void) void CmndSeriallog(void)
{ {
if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) { if ((XdrvMailbox.payload >= LOG_LEVEL_NONE) && (XdrvMailbox.payload <= LOG_LEVEL_DEBUG_MORE)) {