jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update example code

Browse Source
This commit is contained in:
Theo Arends 2024-02-08 14:42:58 +01:00
parent 7d698a6752
commit 2f0b1e8edd
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tasmota/tasmota_xdrv_driver/xdrv_122_file_json_settings_demo.ino
View File

@ -31,7 +31,6 @@
#warning **** USE_DRV_FILE_JSON_DEMO is enabled **** #warning **** USE_DRV_FILE_JSON_DEMO is enabled ****
#define XDRV_122 122 #define XDRV_122 122
#define XDRV_KEY "drvset122"
#define DRV_DEMO_MAX_DRV_TEXT 16 #define DRV_DEMO_MAX_DRV_TEXT 16
@ -53,9 +52,10 @@ struct {
* Driver Settings load and save * Driver Settings load and save
\*********************************************************************************************/ \*********************************************************************************************/
#define XDRV_122_KEY "drvset122"
bool DrvDemoLoadData(void) { bool DrvDemoLoadData(void) {
char key[20]; char key[] = XDRV_122_KEY;
snprintf_P(key, sizeof(key), PSTR(XDRV_KEY));
String json = UfsJsonSettingsRead(key); String json = UfsJsonSettingsRead(key);
if (json.length() == 0) { return false; } if (json.length() == 0) { return false; }
@ -63,19 +63,13 @@ bool DrvDemoLoadData(void) {
JsonParserObject root = parser.getRootObject(); JsonParserObject root = parser.getRootObject();
if (!root) { return false; } if (!root) { return false; }
JsonParserToken val = root[PSTR("Crc")]; DrvDemoSettings.crc32 = root.getUInt(PSTR("Crc"), DrvDemoSettings.crc32);
if (val) { DrvDemoSettings.version = root.getUInt(PSTR("Version"), DrvDemoSettings.version);
DrvDemoSettings.crc32 = val.getUInt();
}
val = root[PSTR("Version")];
if (val) {
DrvDemoSettings.version = val.getInt();
}
JsonParserArray arr = root[PSTR("Text")]; JsonParserArray arr = root[PSTR("Text")];
if (arr) { if (arr) {
for (uint32_t i = 0; i < DRV_DEMO_MAX_DRV_TEXT; i++) { for (uint32_t i = 0; i < DRV_DEMO_MAX_DRV_TEXT; i++) {
if (arr[i]) { if (arr[i]) {
snprintf(DrvDemoSettings.drv_text[i], 10, arr[i].getStr()); strlcpy(DrvDemoSettings.drv_text[i], arr[i].getStr(), sizeof(DrvDemoSettings.drv_text[0]));
} }
} }
} }
@ -83,17 +77,23 @@ bool DrvDemoLoadData(void) {
} }
bool DrvDemoSaveData(void) { bool DrvDemoSaveData(void) {
Response_P(PSTR("{\"" XDRV_KEY "\":{\"Crc\":%u,\"Version\":%u,\"Text\":["), DrvDemoSettings.crc32, DrvDemoSettings.version); Response_P(PSTR("{\"" XDRV_122_KEY "\":{"
"\"Crc\":%u,"
"\"Version\":%u,"
"\"Text\":["),
DrvDemoSettings.crc32,
DrvDemoSettings.version);
for (uint32_t i = 0; i < DRV_DEMO_MAX_DRV_TEXT; i++) { for (uint32_t i = 0; i < DRV_DEMO_MAX_DRV_TEXT; i++) {
ResponseAppend_P(PSTR("%s\"%s\""), (i)?",":"", DrvDemoSettings.drv_text[i]); ResponseAppend_P(PSTR("%s\"%s\""),
(i)?",":"",
DrvDemoSettings.drv_text[i]);
} }
ResponseAppend_P(PSTR("]}}")); ResponseAppend_P(PSTR("]}}"));
return UfsJsonSettingsWrite(ResponseData()); return UfsJsonSettingsWrite(ResponseData());
} }
void DrvDemoDeleteData(void) { void DrvDemoDeleteData(void) {
char key[20]; char key[] = XDRV_122_KEY;
snprintf_P(key, sizeof(key), PSTR(XDRV_KEY));
UfsJsonSettingsDelete(key); // Use defaults UfsJsonSettingsDelete(key); // Use defaults
} }

5
tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino
View File

@ -670,6 +670,11 @@ bool UfsJsonSettingsWrite(const char* data) {
// Input {"UserSet2":{"Param1":123,"Param2":"Text2"}} // Input {"UserSet2":{"Param1":123,"Param2":"Text2"}}
// Output 0 = Error, 1 = Append success // Output 0 = Error, 1 = Append success
String json = data;
JsonParser parser((char*)json.c_str());
JsonParserObject root = parser.getRootObject();
if (!root) { return false; } // Error - invalid JSON
char filename[14]; char filename[14];
snprintf_P(filename, sizeof(filename), PSTR(TASM_FILE_DRIVER), 0); // /.drvset000 snprintf_P(filename, sizeof(filename), PSTR(TASM_FILE_DRIVER), 0); // /.drvset000
if (!TfsFileExists(filename)) { if (!TfsFileExists(filename)) {