mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-24 11:46:34 +00:00
Merge branch 'master' of https://github.com/HASwitchPlate/openHASP
This commit is contained in:
commit
0cdf250d0c
@ -86,13 +86,13 @@
|
||||
"ssid": "SSID"
|
||||
},
|
||||
"wg": {
|
||||
"title": "WireGuard Settings",
|
||||
"btn": "WireGuard Settings",
|
||||
"title": "WireGuard 设置",
|
||||
"btn": "WireGuard 设置",
|
||||
"vpnip": "VPN IP",
|
||||
"privkey": "Private Key",
|
||||
"host": "Remote IP",
|
||||
"port": "Remote Port",
|
||||
"pubkey": "Remote Public Key"
|
||||
"privkey": "专用密钥",
|
||||
"host": "远程IP",
|
||||
"port": "删除",
|
||||
"pubkey": "远程公钥"
|
||||
},
|
||||
"mqtt": {
|
||||
"title": "MQTT 设置",
|
||||
|
@ -321,7 +321,6 @@ void lv_qrcode_delete(lv_obj_t* qrcode)
|
||||
lv_img_dsc_t* img = lv_canvas_get_img(qrcode);
|
||||
lv_mem_free(img->data);
|
||||
lv_mem_free(img);
|
||||
lv_obj_del(qrcode);
|
||||
}
|
||||
|
||||
/**********************
|
||||
|
@ -381,6 +381,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
|
||||
case HASP_OBJ_QRCODE:
|
||||
obj = lv_qrcode_create(parent_obj, 140, LV_COLOR_BLACK, LV_COLOR_WHITE);
|
||||
if(obj) {
|
||||
lv_obj_set_event_cb(obj, delete_event_handler);
|
||||
obj->user_data.objid = LV_HASP_QRCODE;
|
||||
}
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user