diff --git a/CHANGLELOG.md b/CHANGLELOG.md index d98e2353..9351eced 100644 --- a/CHANGLELOG.md +++ b/CHANGLELOG.md @@ -13,6 +13,7 @@ - Set default `line_width` of new `line` objects to 1 - Allow line and block comments in pages.jsonl - 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. ### Fonts diff --git a/src/hasp/hasp_object.cpp b/src/hasp/hasp_object.cpp index b3bda831..08fd170e 100644 --- a/src/hasp/hasp_object.cpp +++ b/src/hasp/hasp_object.cpp @@ -270,19 +270,19 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id) /* Create the object first */ /* 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()) { return; // comments } else { sdbm = Parser::get_sdbm(config[FPSTR(FP_OBJ)].as()); config.remove(FPSTR(FP_OBJ)); } - } else { - LOG_WARNING(TAG_HASP, F(D_ATTRIBUTE_OBSOLETE D_ATTRIBUTE_INSTEAD), "objid", - "obj"); // TODO: obsolete objid - sdbm = config[FPSTR(FP_OBJID)].as(); - config.remove(FPSTR(FP_OBJID)); - } + // } else { + // LOG_WARNING(TAG_HASP, F(D_ATTRIBUTE_OBSOLETE D_ATTRIBUTE_INSTEAD), "objid", + // "obj"); // TODO: obsolete objid + // sdbm = config[FPSTR(FP_OBJID)].as(); + // config.remove(FPSTR(FP_OBJID)); + // } switch(sdbm) { /* ----- Custom Objects ------ */