mirror of
https://github.com/arendst/Tasmota.git
synced 2026-07-27 20:05:46 +00:00
Cleaner solidify (#24788)
This commit is contained in:
@@ -16,7 +16,7 @@ class builder:
|
||||
def __init__(self, input_folders, output_folder, macro_files):
|
||||
self.output = output_folder
|
||||
self.input = input_folders
|
||||
self.config = list(macro_files)
|
||||
self.config = macro_files
|
||||
self.macro = None
|
||||
self.strmap = {}
|
||||
self.strmap_weak = {}
|
||||
@@ -24,7 +24,6 @@ class builder:
|
||||
self.bytesmap = {}
|
||||
|
||||
self.macro = macro_table()
|
||||
self.config.append("../../../tasmota/tasmota_defines_for_berry.h")
|
||||
for path in self.config:
|
||||
self.macro.scan_file(path)
|
||||
|
||||
|
||||
@@ -341,6 +341,6 @@ for filePath in fileList:
|
||||
print("Error while deleting file : ", filePath)
|
||||
|
||||
print(f"Berry coc compiler")
|
||||
cmd = (env["PYTHONEXE"],join("tools","coc","coc"),"-o","generate","src","default",join("..","berry_tasmota","src"),join("..","berry_matter","src","solidify"),join("..","berry_matter","src"),join("..","berry_custom","src","solidify"),join("..","berry_custom","src"),join("..","berry_animation","src","solidify"),join("..","berry_animation","src"),join("..","berry_tasmota","src","solidify"),join("..","berry_mapping","src"),join("..","berry_int64","src"),join("..","..","libesp32_lvgl","lv_binding_berry","src"),join("..","..","libesp32_lvgl","lv_binding_berry","src","solidify"),join("..","..","libesp32_lvgl","lv_binding_berry","generate"),join("..","..","libesp32_lvgl","lv_haspmota","src","solidify"),"-c",join("default","berry_conf.h"))
|
||||
cmd = (env["PYTHONEXE"],join("tools","coc","coc"),"-o","generate","src","default",join("..","berry_tasmota","src"),join("..","berry_matter","src","solidify"),join("..","berry_matter","src"),join("..","berry_custom","src","solidify"),join("..","berry_custom","src"),join("..","berry_animation","src","solidify"),join("..","berry_animation","src"),join("..","berry_tasmota","src","solidify"),join("..","berry_mapping","src"),join("..","berry_int64","src"),join("..","..","libesp32_lvgl","lv_binding_berry","src"),join("..","..","libesp32_lvgl","lv_binding_berry","src","solidify"),join("..","..","libesp32_lvgl","lv_binding_berry","generate"),join("..","..","libesp32_lvgl","lv_haspmota","src","solidify"),"-c",join("default","berry_conf.h"),join("..","..","..","tasmota","tasmota_defines_for_berry.h"))
|
||||
returncode = subprocess.call(cmd, shell=False)
|
||||
os.chdir(CURRENT_DIR)
|
||||
|
||||
Reference in New Issue
Block a user