jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete objid property

Browse Source
This commit is contained in:
fvanroie 2023-04-13 00:17:54 +02:00
parent b74066253c
commit 6f4bde6556
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGLELOG.md
View File

@ -13,6 +13,7 @@
- Set default `line_width` of new `line` objects to 1 - Set default `line_width` of new `line` objects to 1
- Allow line and block comments in pages.jsonl - Allow line and block comments in pages.jsonl
- Removed deprecated `txt` property, use `text` instead - Removed deprecated `txt` property, use `text` instead
- Removed deprecated `objid` property, use `obj` instead
- HASP theme: Toggle objects now use the secondary color when they are in the toggled state. - HASP theme: Toggle objects now use the secondary color when they are in the toggled state.
### Fonts ### Fonts

14
src/hasp/hasp_object.cpp
View File

@ -270,19 +270,19 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
/* Create the object first */ /* Create the object first */
/* Validate type */ /* Validate type */
if(config[FPSTR(FP_OBJID)].isNull()) { // TODO: obsolete objid // if(config[FPSTR(FP_OBJID)].isNull()) { // TODO: obsolete objid
if(config[FPSTR(FP_OBJ)].isNull()) { if(config[FPSTR(FP_OBJ)].isNull()) {
return; // comments return; // comments
} else { } else {
sdbm = Parser::get_sdbm(config[FPSTR(FP_OBJ)].as<const char*>()); sdbm = Parser::get_sdbm(config[FPSTR(FP_OBJ)].as<const char*>());
config.remove(FPSTR(FP_OBJ)); config.remove(FPSTR(FP_OBJ));
} }
} else { // } else {
LOG_WARNING(TAG_HASP, F(D_ATTRIBUTE_OBSOLETE D_ATTRIBUTE_INSTEAD), "objid", // LOG_WARNING(TAG_HASP, F(D_ATTRIBUTE_OBSOLETE D_ATTRIBUTE_INSTEAD), "objid",
"obj"); // TODO: obsolete objid // "obj"); // TODO: obsolete objid
sdbm = config[FPSTR(FP_OBJID)].as<uint8_t>(); // sdbm = config[FPSTR(FP_OBJID)].as<uint8_t>();
config.remove(FPSTR(FP_OBJID)); // config.remove(FPSTR(FP_OBJID));
} // }
switch(sdbm) { switch(sdbm) {
/* ----- Custom Objects ------ */ /* ----- Custom Objects ------ */