mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-13 05:46:30 +00:00
HASPmota meta
attribute and improved berry_run
(#18685)
This commit is contained in:
parent
d48c826d42
commit
2b76e8e668
@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
### Added
|
### Added
|
||||||
- Command ``WifiPower 0`` to enable dynamic wifi power based on RSSI by @TD-er (#15443)
|
- Command ``WifiPower 0`` to enable dynamic wifi power based on RSSI by @TD-er (#15443)
|
||||||
- Command ``WifiPower 1`` to restore default wifi power
|
- Command ``WifiPower 1`` to restore default wifi power
|
||||||
|
- HASPmota `meta` attribute and improved `berry_run`
|
||||||
|
|
||||||
### Breaking Changed
|
### Breaking Changed
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -138,6 +138,7 @@ class lvh_obj
|
|||||||
# "text_rule": nil,
|
# "text_rule": nil,
|
||||||
# "text_rule_formula": nil,
|
# "text_rule_formula": nil,
|
||||||
# "text_rule_format": nil,
|
# "text_rule_format": nil,
|
||||||
|
# "meta": nil,
|
||||||
# roller
|
# roller
|
||||||
# "options": nil,
|
# "options": nil,
|
||||||
# qrcode
|
# qrcode
|
||||||
@ -154,6 +155,7 @@ class lvh_obj
|
|||||||
var _lv_label # sub-label if exists
|
var _lv_label # sub-label if exists
|
||||||
var _page # parent page object
|
var _page # parent page object
|
||||||
var _action # value of the HASPmota `action` attribute, shouldn't be called `self.action` since we want to trigger the set/member functions
|
var _action # value of the HASPmota `action` attribute, shouldn't be called `self.action` since we want to trigger the set/member functions
|
||||||
|
var _meta # free form metadata
|
||||||
|
|
||||||
#====================================================================
|
#====================================================================
|
||||||
# Rule engine to map value and text to rules
|
# Rule engine to map value and text to rules
|
||||||
@ -778,6 +780,17 @@ class lvh_obj
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
#====================================================================
|
||||||
|
# Metadata
|
||||||
|
#
|
||||||
|
#====================================================================
|
||||||
|
def set_meta(t)
|
||||||
|
self._meta = t
|
||||||
|
end
|
||||||
|
def get_meta()
|
||||||
|
return self._meta
|
||||||
|
end
|
||||||
|
|
||||||
#====================================================================
|
#====================================================================
|
||||||
# Rule based updates of `val` and `text`
|
# Rule based updates of `val` and `text`
|
||||||
#
|
#
|
||||||
@ -1725,13 +1738,12 @@ class HASPmota
|
|||||||
|
|
||||||
# first run any Berry code embedded
|
# first run any Berry code embedded
|
||||||
var berry_run = str(jline.find("berry_run"))
|
var berry_run = str(jline.find("berry_run"))
|
||||||
|
var func_compiled
|
||||||
if berry_run != "nil"
|
if berry_run != "nil"
|
||||||
try
|
try
|
||||||
var func_compiled = compile(berry_run)
|
func_compiled = compile(berry_run)
|
||||||
# run the compiled code once
|
|
||||||
func_compiled()
|
|
||||||
except .. as e,m
|
except .. as e,m
|
||||||
print(string.format("HSP: unable to run berry code \"%s\" - '%s' - %s", berry_run, e, m))
|
print(string.format("HSP: unable to compile berry code \"%s\" - '%s' - %s", berry_run, e, m))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -1795,6 +1807,19 @@ class HASPmota
|
|||||||
# create a global variable for this object of form p<page>b<id>, ex p1b2
|
# create a global variable for this object of form p<page>b<id>, ex p1b2
|
||||||
var glob_name = string.format("p%ib%i", lvh_page_cur.id(), obj_id)
|
var glob_name = string.format("p%ib%i", lvh_page_cur.id(), obj_id)
|
||||||
global.(glob_name) = obj_lvh
|
global.(glob_name) = obj_lvh
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
if func_compiled != nil
|
||||||
|
try
|
||||||
|
# run the compiled code once
|
||||||
|
var f_ret = func_compiled()
|
||||||
|
if type(f_ret) == 'function'
|
||||||
|
f_ret(obj_lvh)
|
||||||
|
end
|
||||||
|
except .. as e,m
|
||||||
|
print(string.format("HSP: unable to run berry code \"%s\" - '%s' - %s", berry_run, e, m))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if obj_id == 0 && obj_type != "nil"
|
if obj_id == 0 && obj_type != "nil"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user