jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/HASwitchPlate/openHASP

Browse Source
This commit is contained in:
fvanroie 2024-04-04 01:04:07 +02:00
commit 0cdf250d0c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/zh_CN.json
View File

@ -86,13 +86,13 @@
"ssid": "SSID" "ssid": "SSID"
}, },
"wg": { "wg": {
"title": "WireGuard Settings", "title": "WireGuard 设置",
"btn": "WireGuard Settings", "btn": "WireGuard 设置",
"vpnip": "VPN IP", "vpnip": "VPN IP",
"privkey": "Private Key", "privkey": "专用密钥",
"host": "Remote IP", "host": "远程IP",
"port": "Remote Port", "port": "删除",
"pubkey": "Remote Public Key" "pubkey": "远程公钥"
}, },
"mqtt": { "mqtt": {
"title": "MQTT 设置", "title": "MQTT 设置",

1
lib/lv_lib_qrcode/lv_qrcode.c
View File

@ -321,7 +321,6 @@ void lv_qrcode_delete(lv_obj_t* qrcode)
lv_img_dsc_t* img = lv_canvas_get_img(qrcode); lv_img_dsc_t* img = lv_canvas_get_img(qrcode);
lv_mem_free(img->data); lv_mem_free(img->data);
lv_mem_free(img); lv_mem_free(img);
lv_obj_del(qrcode);
} }
/********************** /**********************

1
src/hasp/hasp_object.cpp
View File

@ -381,6 +381,7 @@ void hasp_new_object(const JsonObject& config, uint8_t& saved_page_id)
case HASP_OBJ_QRCODE: case HASP_OBJ_QRCODE:
obj = lv_qrcode_create(parent_obj, 140, LV_COLOR_BLACK, LV_COLOR_WHITE); obj = lv_qrcode_create(parent_obj, 140, LV_COLOR_BLACK, LV_COLOR_WHITE);
if(obj) { if(obj) {
lv_obj_set_event_cb(obj, delete_event_handler);
obj->user_data.objid = LV_HASP_QRCODE; obj->user_data.objid = LV_HASP_QRCODE;
} }
break; break;