From 00b3cd120f6357a35ef7e8b1c3ffad458a068266 Mon Sep 17 00:00:00 2001
From: Evgeny Zinoviev <me@ch1p.io>
Date: Sun, 11 Jun 2023 01:43:36 +0300
Subject: pio: fix libs paths

---
 include/pio/libs/main/library.json                    | 6 +++---
 include/pio/libs/mqtt_module_diagnostics/library.json | 4 ++--
 include/pio/libs/mqtt_module_ota/library.json         | 6 +++---
 include/pio/libs/mqtt_module_relay/library.json       | 6 +++---
 include/pio/libs/mqtt_module_temphum/library.json     | 4 ++--
 include/py/homekit/pio/products.py                    | 6 ++++--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/include/pio/libs/main/library.json b/include/pio/libs/main/library.json
index 728d4f8..c5586d8 100644
--- a/include/pio/libs/main/library.json
+++ b/include/pio/libs/main/library.json
@@ -1,12 +1,12 @@
 {
   "name": "homekit_main",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "build": {
     "flags": "-I../../include"
   },
   "dependencies": {
-    "homekit_mqtt_module_ota": "file://../common/libs/mqtt_module_ota",
-    "homekit_mqtt_module_diagnostics": "file://../common/libs/mqtt_module_diagnostics"
+    "homekit_mqtt_module_ota": "file://../../include/pio/libs/mqtt_module_ota",
+    "homekit_mqtt_module_diagnostics": "file://../../include/pio/libs/mqtt_module_diagnostics"
   }
 }
 
diff --git a/include/pio/libs/mqtt_module_diagnostics/library.json b/include/pio/libs/mqtt_module_diagnostics/library.json
index a3d3244..70acb79 100644
--- a/include/pio/libs/mqtt_module_diagnostics/library.json
+++ b/include/pio/libs/mqtt_module_diagnostics/library.json
@@ -1,10 +1,10 @@
 {
   "name": "homekit_mqtt_module_diagnostics",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "build": {
     "flags": "-I../../include"
   },
   "dependencies": {
-    "homekit_mqtt": "file://../common/libs/mqtt"
+    "homekit_mqtt": "file://../../include/pio/libs/mqtt"
   }
 }
diff --git a/include/pio/libs/mqtt_module_ota/library.json b/include/pio/libs/mqtt_module_ota/library.json
index 4f40a47..1577fed 100644
--- a/include/pio/libs/mqtt_module_ota/library.json
+++ b/include/pio/libs/mqtt_module_ota/library.json
@@ -1,11 +1,11 @@
 {
   "name": "homekit_mqtt_module_ota",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "build": {
     "flags": "-I../../include"
   },
   "dependencies": {
-    "homekit_led": "file://../common/libs/led",
-    "homekit_mqtt": "file://../common/libs/mqtt"
+    "homekit_led": "file://../../include/pio/libs/led",
+    "homekit_mqtt": "file://../../include/pio/libs/mqtt"
   }
 }
diff --git a/include/pio/libs/mqtt_module_relay/library.json b/include/pio/libs/mqtt_module_relay/library.json
index 6cbbfb0..18a510c 100644
--- a/include/pio/libs/mqtt_module_relay/library.json
+++ b/include/pio/libs/mqtt_module_relay/library.json
@@ -1,11 +1,11 @@
 {
   "name": "homekit_mqtt_module_relay",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "build": {
     "flags": "-I../../include"
   },
   "dependencies": {
-    "homekit_mqtt": "file://../common/libs/mqtt",
-    "homekit_relay": "file://../common/libs/relay"
+    "homekit_mqtt": "file://../../include/pio/libs/mqtt",
+    "homekit_relay": "file://../../include/pio/libs/relay"
   }
 }
diff --git a/include/pio/libs/mqtt_module_temphum/library.json b/include/pio/libs/mqtt_module_temphum/library.json
index 068debd..c7ee7af 100644
--- a/include/pio/libs/mqtt_module_temphum/library.json
+++ b/include/pio/libs/mqtt_module_temphum/library.json
@@ -5,7 +5,7 @@
     "flags": "-I../../include"
   },
   "dependencies": {
-    "homekit_mqtt": "file://../common/libs/mqtt",
-    "homekit_temphum": "file://../common/libs/temphum"
+    "homekit_mqtt": "file://../../include/pio/libs/mqtt",
+    "homekit_temphum": "file://../../include/pio/libs/temphum"
   }
 }
diff --git a/include/py/homekit/pio/products.py b/include/py/homekit/pio/products.py
index c4fcd73..a0e7a1f 100644
--- a/include/py/homekit/pio/products.py
+++ b/include/py/homekit/pio/products.py
@@ -89,8 +89,10 @@ def platformio_ini(product_config: dict,
     buf.write(f'upload_port = {upload_port}\n')
     buf.write(f'monitor_speed = {monitor_speed}\n')
     if libs:
-        buf.write(f'lib_deps =')
+        buf.write(f'lib_deps =\n')
         for lib in libs:
+            if lib.startswith('homekit_'):
+                lib = 'file://../../include/pio/libs/'+lib[8:]
             buf.write(f'    {lib}\n')
     buf.write(f'build_flags =\n')
     if defines:
@@ -107,7 +109,7 @@ def platformio_ini(product_config: dict,
                 if type(value) is str and not is_enum:
                     buf.write('"\\"')
             buf.write('\n')
-        buf.write(f'    -I../common/include')
+        buf.write(f'    -I../../include/pio/include')
     buf.write(f'\nbuild_type = {build_type}')
 
     return buf.getvalue()
-- 
cgit v1.2.3