Merge branch 'feature/tuyamcu'

libretiny-eu · Sep 6, 2023 · 6b8c768 · 6b8c768
2 parents 14d6c76 + ef0cd43
commit 6b8c768
Show file tree

Hide file tree

Showing 41 changed files with 3,248 additions and 264 deletions.
diff --git a/ltctplugin/upk2esphome/cli.py b/ltctplugin/upk2esphome/cli.py
@@ -11,7 +11,7 @@
     cloudcutter_list_devices,
 )
 from ltctplugin.upk2esphome.work import UpkThread
-from upk2esphome import Opts, generate_yaml
+from upk2esphome import Opts, upk2esphome
 
 
 def add_options():
@@ -160,12 +160,12 @@ def firmware(file: click.File, output: click.File, **kwargs):
     work.start()
 
 
-def write_upk(data: dict, output: click.File, storage_only: bool, **kwargs):
+def write_upk(data: dict, output: click.File, storage_only: bool = False, **kwargs):
     if storage_only:
         text = json.dumps(data, indent="\t")
     else:
         opts = Opts(**kwargs)
-        yr = generate_yaml(data, opts)
+        yr = upk2esphome(data, opts)
         for line in yr.logs:
             info(f"UPK: {line}")
         for line in yr.warnings: