From a6d8ba93056c1a4e243d56da447e241b2504fae2 Mon Sep 17 00:00:00 2001 From: Evgeny Zinoviev Date: Sat, 10 Jun 2023 23:20:37 +0300 Subject: [PATCH] move files again --- .gitignore | 12 +++++------ .../CameraWebServer/CameraWebServer.ino | 0 .../esp32-cam}/CameraWebServer/app_httpd.cpp | 0 .../esp32-cam}/CameraWebServer/camera_index.h | 0 .../esp32-cam}/CameraWebServer/camera_pins.h | 0 .../CameraWebServer/index_ov2640.html | 0 bin/__py_include.py | 2 +- .../pio}/include/homekit/logging.h | 0 .../pio}/include/homekit/macros.h | 0 .../pio}/include/homekit/stopwatch.h | 0 .../pio}/include/homekit/util.h | 0 .../pio}/libs/config/homekit/config.cpp | 0 .../pio}/libs/config/homekit/config.h | 0 .../pio}/libs/config/library.json | 0 .../libs/http_server/homekit/http_server.cpp | 0 .../libs/http_server/homekit/http_server.h | 0 .../pio}/libs/http_server/library.json | 0 .../pio}/libs/led/homekit/led.cpp | 0 .../pio}/libs/led/homekit/led.h | 0 .../pio}/libs/led/library.json | 0 .../pio}/libs/main/homekit/main.cpp | 0 .../pio}/libs/main/homekit/main.h | 0 .../pio}/libs/main/library.json | 0 .../pio}/libs/mqtt/homekit/mqtt/module.cpp | 0 .../pio}/libs/mqtt/homekit/mqtt/module.h | 0 .../pio}/libs/mqtt/homekit/mqtt/mqtt.cpp | 0 .../pio}/libs/mqtt/homekit/mqtt/mqtt.h | 0 .../pio}/libs/mqtt/homekit/mqtt/payload.h | 0 .../pio}/libs/mqtt/library.json | 0 .../homekit/mqtt/module/diagnostics.cpp | 0 .../homekit/mqtt/module/diagnostics.h | 0 .../libs/mqtt_module_diagnostics/library.json | 0 .../homekit/mqtt/module/ota.cpp | 0 .../mqtt_module_ota/homekit/mqtt/module/ota.h | 0 .../pio}/libs/mqtt_module_ota/library.json | 0 .../homekit/mqtt/module/relay.cpp | 0 .../homekit/mqtt/module/relay.h | 0 .../pio}/libs/mqtt_module_relay/library.json | 0 .../homekit/mqtt/module/temphum.cpp | 0 .../homekit/mqtt/module/temphum.h | 0 .../libs/mqtt_module_temphum/library.json | 0 .../pio}/libs/relay/homekit/relay.cpp | 0 .../pio}/libs/relay/homekit/relay.h | 0 .../pio}/libs/relay/library.json | 0 .../pio}/libs/static/homekit/static.cpp | 0 .../pio}/libs/static/homekit/static.h | 0 .../pio}/libs/static/library.json | 0 .../pio}/libs/temphum/homekit/temphum.cpp | 0 .../pio}/libs/temphum/homekit/temphum.h | 0 .../pio}/libs/temphum/library.json | 0 .../pio}/libs/wifi/homekit/wifi.cpp | 0 .../pio}/libs/wifi/homekit/wifi.h | 0 .../pio}/libs/wifi/library.json | 0 .../common => include/pio}/make_static.sh | 0 .../common => include/pio}/static/app.js | 0 .../common => include/pio}/static/favicon.ico | Bin .../common => include/pio}/static/index.html | 0 .../common => include/pio}/static/md5.js | 0 .../common => include/pio}/static/style.css | 0 {py_include => include/py}/__init__.py | 0 .../py}/homekit/__init__.py | 0 .../py}/homekit/api/__init__.py | 0 .../py}/homekit/api/__init__.pyi | 0 .../py}/homekit/api/config.py | 0 .../py}/homekit/api/errors/__init__.py | 0 .../homekit/api/errors/api_response_error.py | 0 .../py}/homekit/api/types/__init__.py | 0 .../py}/homekit/api/types/types.py | 0 .../py}/homekit/api/web_api_client.py | 0 .../py}/homekit/audio/__init__.py | 0 .../py}/homekit/audio/amixer.py | 0 .../py}/homekit/camera/__init__.py | 0 .../py}/homekit/camera/esp32.py | 0 .../py}/homekit/camera/types.py | 0 .../py}/homekit/camera/util.py | 0 .../py}/homekit/config/__init__.py | 0 .../py}/homekit/config/_configs.py | 0 .../py}/homekit/config/config.py | 0 .../py}/homekit/database/__init__.py | 0 .../py}/homekit/database/__init__.pyi | 0 .../py}/homekit/database/_base.py | 0 .../py}/homekit/database/bots.py | 0 .../py}/homekit/database/clickhouse.py | 0 .../py}/homekit/database/inverter.py | 0 .../homekit/database/inverter_time_formats.py | 0 .../py}/homekit/database/mysql.py | 0 .../py}/homekit/database/sensors.py | 0 .../py}/homekit/database/simple_state.py | 0 .../py}/homekit/database/sqlite.py | 0 .../py}/homekit/http/__init__.py | 0 .../py}/homekit/http/http.py | 0 .../py}/homekit/inverter/__init__.py | 0 .../py}/homekit/inverter/config.py | 0 .../py}/homekit/inverter/emulator.py | 0 .../py}/homekit/inverter/inverter_wrapper.py | 0 .../py}/homekit/inverter/monitor.py | 0 .../py}/homekit/inverter/types.py | 0 .../py}/homekit/inverter/util.py | 0 .../py}/homekit/media/__init__.py | 0 .../py}/homekit/media/__init__.pyi | 0 .../py}/homekit/media/node_client.py | 0 .../py}/homekit/media/node_server.py | 0 .../py}/homekit/media/record.py | 0 .../py}/homekit/media/record_client.py | 0 .../py}/homekit/media/storage.py | 0 .../py}/homekit/media/types.py | 0 .../py}/homekit/mqtt/__init__.py | 0 .../py}/homekit/mqtt/_config.py | 0 .../py}/homekit/mqtt/_module.py | 0 .../py}/homekit/mqtt/_mqtt.py | 0 .../py}/homekit/mqtt/_node.py | 0 .../py}/homekit/mqtt/_payload.py | 0 .../py}/homekit/mqtt/_util.py | 0 .../py}/homekit/mqtt/_wrapper.py | 0 .../py}/homekit/mqtt/module/diagnostics.py | 0 .../py}/homekit/mqtt/module/inverter.py | 0 .../py}/homekit/mqtt/module/ota.py | 0 .../py}/homekit/mqtt/module/relay.py | 0 .../py}/homekit/mqtt/module/temphum.py | 0 .../py}/homekit/pio/__init__.py | 0 .../py}/homekit/pio/exceptions.py | 0 .../py}/homekit/pio/products.py | 0 .../py}/homekit/relay/__init__.py | 0 .../py}/homekit/relay/__init__.pyi | 0 .../py}/homekit/relay/sunxi_h3_client.py | 0 .../py}/homekit/relay/sunxi_h3_server.py | 0 .../py}/homekit/soundsensor/__init__.py | 0 .../py}/homekit/soundsensor/__init__.pyi | 0 .../py}/homekit/soundsensor/node.py | 0 .../py}/homekit/soundsensor/server.py | 0 .../py}/homekit/soundsensor/server_client.py | 0 .../py}/homekit/telegram/__init__.py | 0 .../py}/homekit/telegram/_botcontext.py | 0 .../py}/homekit/telegram/_botdb.py | 0 .../py}/homekit/telegram/_botlang.py | 0 .../py}/homekit/telegram/_botutil.py | 0 .../py}/homekit/telegram/aio.py | 0 .../py}/homekit/telegram/bot.py | 0 .../py}/homekit/telegram/config.py | 0 .../py}/homekit/telegram/telegram.py | 0 .../py}/homekit/temphum/__init__.py | 0 .../py}/homekit/temphum/base.py | 0 .../py}/homekit/temphum/i2c.py | 0 {py_include => include/py}/homekit/util.py | 0 {py_include => include/py}/pyA20/__init__.pyi | 0 .../py}/pyA20/gpio/connector.pyi | 0 .../py}/pyA20/gpio/gpio.pyi | 0 .../py}/pyA20/gpio/port.pyi | 0 {py_include => include/py}/pyA20/port.pyi | 0 .../py}/syncleo/__init__.py | 0 {py_include => include/py}/syncleo/kettle.py | 0 .../py}/syncleo/protocol.py | 0 {platformio => pio}/dumb_mqtt/src/main.cpp | 0 {platformio => pio}/relayctl/src/main.cpp | 0 {platformio => pio}/temphum/src/main.cpp | 0 .../temphum_relayctl/src/main.cpp | 0 platformio/dumb_mqtt/.gitignore | 3 --- platformio/relayctl/.gitignore | 3 --- platformio/temphum/.gitignore | 3 --- test/__py_include.py | 9 +++++++++ test/mqtt_relay_server_util.py | 18 ++++++----------- test/mqtt_relay_util.py | 12 +++-------- test/test.py | 1 + test/test_amixer.py | 9 +++------ test/test_api.py | 14 ++++--------- test/test_esp32_cam.py | 14 ++++--------- test/test_inverter_monitor.py | 19 ++++-------------- test/test_ipcam_server_cleanup.py | 16 +++++---------- test/test_polaris_stuff.py | 11 ++-------- test/test_record_upload.py | 17 +++++----------- test/test_send_fake_sound_hit.py | 10 ++------- test/test_sensors_plot.py | 0 test/test_sound_node_client.py | 9 +++------ test/test_sound_server_api.py | 14 ++++--------- test/test_stopwatch.py | 1 + test/test_telegram_aio_send_photo.py | 13 +++--------- 176 files changed, 66 insertions(+), 144 deletions(-) rename {esp32-cam => arduino/esp32-cam}/CameraWebServer/CameraWebServer.ino (100%) rename {esp32-cam => arduino/esp32-cam}/CameraWebServer/app_httpd.cpp (100%) rename {esp32-cam => arduino/esp32-cam}/CameraWebServer/camera_index.h (100%) rename {esp32-cam => arduino/esp32-cam}/CameraWebServer/camera_pins.h (100%) rename {esp32-cam => arduino/esp32-cam}/CameraWebServer/index_ov2640.html (100%) rename {platformio/common => include/pio}/include/homekit/logging.h (100%) rename {platformio/common => include/pio}/include/homekit/macros.h (100%) rename {platformio/common => include/pio}/include/homekit/stopwatch.h (100%) rename {platformio/common => include/pio}/include/homekit/util.h (100%) rename {platformio/common => include/pio}/libs/config/homekit/config.cpp (100%) rename {platformio/common => include/pio}/libs/config/homekit/config.h (100%) rename {platformio/common => include/pio}/libs/config/library.json (100%) rename {platformio/common => include/pio}/libs/http_server/homekit/http_server.cpp (100%) rename {platformio/common => include/pio}/libs/http_server/homekit/http_server.h (100%) rename {platformio/common => include/pio}/libs/http_server/library.json (100%) rename {platformio/common => include/pio}/libs/led/homekit/led.cpp (100%) rename {platformio/common => include/pio}/libs/led/homekit/led.h (100%) rename {platformio/common => include/pio}/libs/led/library.json (100%) rename {platformio/common => include/pio}/libs/main/homekit/main.cpp (100%) rename {platformio/common => include/pio}/libs/main/homekit/main.h (100%) rename {platformio/common => include/pio}/libs/main/library.json (100%) rename {platformio/common => include/pio}/libs/mqtt/homekit/mqtt/module.cpp (100%) rename {platformio/common => include/pio}/libs/mqtt/homekit/mqtt/module.h (100%) rename {platformio/common => include/pio}/libs/mqtt/homekit/mqtt/mqtt.cpp (100%) rename {platformio/common => include/pio}/libs/mqtt/homekit/mqtt/mqtt.h (100%) rename {platformio/common => include/pio}/libs/mqtt/homekit/mqtt/payload.h (100%) rename {platformio/common => include/pio}/libs/mqtt/library.json (100%) rename {platformio/common => include/pio}/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp (100%) rename {platformio/common => include/pio}/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h (100%) rename {platformio/common => include/pio}/libs/mqtt_module_diagnostics/library.json (100%) rename {platformio/common => include/pio}/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp (100%) rename {platformio/common => include/pio}/libs/mqtt_module_ota/homekit/mqtt/module/ota.h (100%) rename {platformio/common => include/pio}/libs/mqtt_module_ota/library.json (100%) rename {platformio/common => include/pio}/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp (100%) rename {platformio/common => include/pio}/libs/mqtt_module_relay/homekit/mqtt/module/relay.h (100%) rename {platformio/common => include/pio}/libs/mqtt_module_relay/library.json (100%) rename {platformio/common => include/pio}/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp (100%) rename {platformio/common => include/pio}/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h (100%) rename {platformio/common => include/pio}/libs/mqtt_module_temphum/library.json (100%) rename {platformio/common => include/pio}/libs/relay/homekit/relay.cpp (100%) rename {platformio/common => include/pio}/libs/relay/homekit/relay.h (100%) rename {platformio/common => include/pio}/libs/relay/library.json (100%) rename {platformio/common => include/pio}/libs/static/homekit/static.cpp (100%) rename {platformio/common => include/pio}/libs/static/homekit/static.h (100%) rename {platformio/common => include/pio}/libs/static/library.json (100%) rename {platformio/common => include/pio}/libs/temphum/homekit/temphum.cpp (100%) rename {platformio/common => include/pio}/libs/temphum/homekit/temphum.h (100%) rename {platformio/common => include/pio}/libs/temphum/library.json (100%) rename {platformio/common => include/pio}/libs/wifi/homekit/wifi.cpp (100%) rename {platformio/common => include/pio}/libs/wifi/homekit/wifi.h (100%) rename {platformio/common => include/pio}/libs/wifi/library.json (100%) rename {platformio/common => include/pio}/make_static.sh (100%) rename {platformio/common => include/pio}/static/app.js (100%) rename {platformio/common => include/pio}/static/favicon.ico (100%) rename {platformio/common => include/pio}/static/index.html (100%) rename {platformio/common => include/pio}/static/md5.js (100%) rename {platformio/common => include/pio}/static/style.css (100%) rename {py_include => include/py}/__init__.py (100%) rename {py_include => include/py}/homekit/__init__.py (100%) rename {py_include => include/py}/homekit/api/__init__.py (100%) rename {py_include => include/py}/homekit/api/__init__.pyi (100%) rename {py_include => include/py}/homekit/api/config.py (100%) rename {py_include => include/py}/homekit/api/errors/__init__.py (100%) rename {py_include => include/py}/homekit/api/errors/api_response_error.py (100%) rename {py_include => include/py}/homekit/api/types/__init__.py (100%) rename {py_include => include/py}/homekit/api/types/types.py (100%) rename {py_include => include/py}/homekit/api/web_api_client.py (100%) rename {py_include => include/py}/homekit/audio/__init__.py (100%) rename {py_include => include/py}/homekit/audio/amixer.py (100%) rename {py_include => include/py}/homekit/camera/__init__.py (100%) rename {py_include => include/py}/homekit/camera/esp32.py (100%) rename {py_include => include/py}/homekit/camera/types.py (100%) rename {py_include => include/py}/homekit/camera/util.py (100%) rename {py_include => include/py}/homekit/config/__init__.py (100%) rename {py_include => include/py}/homekit/config/_configs.py (100%) rename {py_include => include/py}/homekit/config/config.py (100%) rename {py_include => include/py}/homekit/database/__init__.py (100%) rename {py_include => include/py}/homekit/database/__init__.pyi (100%) rename {py_include => include/py}/homekit/database/_base.py (100%) rename {py_include => include/py}/homekit/database/bots.py (100%) rename {py_include => include/py}/homekit/database/clickhouse.py (100%) rename {py_include => include/py}/homekit/database/inverter.py (100%) rename {py_include => include/py}/homekit/database/inverter_time_formats.py (100%) rename {py_include => include/py}/homekit/database/mysql.py (100%) rename {py_include => include/py}/homekit/database/sensors.py (100%) rename {py_include => include/py}/homekit/database/simple_state.py (100%) rename {py_include => include/py}/homekit/database/sqlite.py (100%) rename {py_include => include/py}/homekit/http/__init__.py (100%) rename {py_include => include/py}/homekit/http/http.py (100%) rename {py_include => include/py}/homekit/inverter/__init__.py (100%) rename {py_include => include/py}/homekit/inverter/config.py (100%) rename {py_include => include/py}/homekit/inverter/emulator.py (100%) rename {py_include => include/py}/homekit/inverter/inverter_wrapper.py (100%) rename {py_include => include/py}/homekit/inverter/monitor.py (100%) rename {py_include => include/py}/homekit/inverter/types.py (100%) rename {py_include => include/py}/homekit/inverter/util.py (100%) rename {py_include => include/py}/homekit/media/__init__.py (100%) rename {py_include => include/py}/homekit/media/__init__.pyi (100%) rename {py_include => include/py}/homekit/media/node_client.py (100%) rename {py_include => include/py}/homekit/media/node_server.py (100%) rename {py_include => include/py}/homekit/media/record.py (100%) rename {py_include => include/py}/homekit/media/record_client.py (100%) rename {py_include => include/py}/homekit/media/storage.py (100%) rename {py_include => include/py}/homekit/media/types.py (100%) rename {py_include => include/py}/homekit/mqtt/__init__.py (100%) rename {py_include => include/py}/homekit/mqtt/_config.py (100%) rename {py_include => include/py}/homekit/mqtt/_module.py (100%) rename {py_include => include/py}/homekit/mqtt/_mqtt.py (100%) rename {py_include => include/py}/homekit/mqtt/_node.py (100%) rename {py_include => include/py}/homekit/mqtt/_payload.py (100%) rename {py_include => include/py}/homekit/mqtt/_util.py (100%) rename {py_include => include/py}/homekit/mqtt/_wrapper.py (100%) rename {py_include => include/py}/homekit/mqtt/module/diagnostics.py (100%) rename {py_include => include/py}/homekit/mqtt/module/inverter.py (100%) rename {py_include => include/py}/homekit/mqtt/module/ota.py (100%) rename {py_include => include/py}/homekit/mqtt/module/relay.py (100%) rename {py_include => include/py}/homekit/mqtt/module/temphum.py (100%) rename {py_include => include/py}/homekit/pio/__init__.py (100%) rename {py_include => include/py}/homekit/pio/exceptions.py (100%) rename {py_include => include/py}/homekit/pio/products.py (100%) rename {py_include => include/py}/homekit/relay/__init__.py (100%) rename {py_include => include/py}/homekit/relay/__init__.pyi (100%) rename {py_include => include/py}/homekit/relay/sunxi_h3_client.py (100%) rename {py_include => include/py}/homekit/relay/sunxi_h3_server.py (100%) rename {py_include => include/py}/homekit/soundsensor/__init__.py (100%) rename {py_include => include/py}/homekit/soundsensor/__init__.pyi (100%) rename {py_include => include/py}/homekit/soundsensor/node.py (100%) rename {py_include => include/py}/homekit/soundsensor/server.py (100%) rename {py_include => include/py}/homekit/soundsensor/server_client.py (100%) rename {py_include => include/py}/homekit/telegram/__init__.py (100%) rename {py_include => include/py}/homekit/telegram/_botcontext.py (100%) rename {py_include => include/py}/homekit/telegram/_botdb.py (100%) rename {py_include => include/py}/homekit/telegram/_botlang.py (100%) rename {py_include => include/py}/homekit/telegram/_botutil.py (100%) rename {py_include => include/py}/homekit/telegram/aio.py (100%) rename {py_include => include/py}/homekit/telegram/bot.py (100%) rename {py_include => include/py}/homekit/telegram/config.py (100%) rename {py_include => include/py}/homekit/telegram/telegram.py (100%) rename {py_include => include/py}/homekit/temphum/__init__.py (100%) rename {py_include => include/py}/homekit/temphum/base.py (100%) rename {py_include => include/py}/homekit/temphum/i2c.py (100%) rename {py_include => include/py}/homekit/util.py (100%) rename {py_include => include/py}/pyA20/__init__.pyi (100%) rename {py_include => include/py}/pyA20/gpio/connector.pyi (100%) rename {py_include => include/py}/pyA20/gpio/gpio.pyi (100%) rename {py_include => include/py}/pyA20/gpio/port.pyi (100%) rename {py_include => include/py}/pyA20/port.pyi (100%) rename {py_include => include/py}/syncleo/__init__.py (100%) rename {py_include => include/py}/syncleo/kettle.py (100%) rename {py_include => include/py}/syncleo/protocol.py (100%) rename {platformio => pio}/dumb_mqtt/src/main.cpp (100%) rename {platformio => pio}/relayctl/src/main.cpp (100%) rename {platformio => pio}/temphum/src/main.cpp (100%) rename {platformio => pio}/temphum_relayctl/src/main.cpp (100%) delete mode 100644 platformio/dumb_mqtt/.gitignore delete mode 100644 platformio/relayctl/.gitignore delete mode 100644 platformio/temphum/.gitignore create mode 100644 test/__py_include.py delete mode 100755 test/test_sensors_plot.py diff --git a/.gitignore b/.gitignore index 1280ea2..6de5e71 100644 --- a/.gitignore +++ b/.gitignore @@ -6,19 +6,19 @@ config.def.h __pycache__ .DS_Store -/py_include/test/test_inverter_monitor.log +/include/test/test_inverter_monitor.log /youtrack-certificate /cpp -/py_include/test.py +/include/test.py /bin/test.py -/esp32-cam/CameraWebServer/wifi_password.h +/arduino/esp32-cam/CameraWebServer/wifi_password.h cmake-build-* .pio platformio.ini CMakeListsPrivate.txt -/platformio/*/CMakeLists.txt -/platformio/*/CMakeListsPrivate.txt -/platformio/*/.gitignore +/pio/*/CMakeLists.txt +/pio/*/CMakeListsPrivate.txt +/pio/*/.gitignore *.swp /localwebsite/vendor diff --git a/esp32-cam/CameraWebServer/CameraWebServer.ino b/arduino/esp32-cam/CameraWebServer/CameraWebServer.ino similarity index 100% rename from esp32-cam/CameraWebServer/CameraWebServer.ino rename to arduino/esp32-cam/CameraWebServer/CameraWebServer.ino diff --git a/esp32-cam/CameraWebServer/app_httpd.cpp b/arduino/esp32-cam/CameraWebServer/app_httpd.cpp similarity index 100% rename from esp32-cam/CameraWebServer/app_httpd.cpp rename to arduino/esp32-cam/CameraWebServer/app_httpd.cpp diff --git a/esp32-cam/CameraWebServer/camera_index.h b/arduino/esp32-cam/CameraWebServer/camera_index.h similarity index 100% rename from esp32-cam/CameraWebServer/camera_index.h rename to arduino/esp32-cam/CameraWebServer/camera_index.h diff --git a/esp32-cam/CameraWebServer/camera_pins.h b/arduino/esp32-cam/CameraWebServer/camera_pins.h similarity index 100% rename from esp32-cam/CameraWebServer/camera_pins.h rename to arduino/esp32-cam/CameraWebServer/camera_pins.h diff --git a/esp32-cam/CameraWebServer/index_ov2640.html b/arduino/esp32-cam/CameraWebServer/index_ov2640.html similarity index 100% rename from esp32-cam/CameraWebServer/index_ov2640.html rename to arduino/esp32-cam/CameraWebServer/index_ov2640.html diff --git a/bin/__py_include.py b/bin/__py_include.py index 7f95e28..8f98830 100644 --- a/bin/__py_include.py +++ b/bin/__py_include.py @@ -1,7 +1,7 @@ import sys import os.path -for _name in ('py_include',): +for _name in ('include/py',): sys.path.extend([ os.path.realpath( os.path.join(os.path.dirname(os.path.join(__file__)), '..', _name) diff --git a/platformio/common/include/homekit/logging.h b/include/pio/include/homekit/logging.h similarity index 100% rename from platformio/common/include/homekit/logging.h rename to include/pio/include/homekit/logging.h diff --git a/platformio/common/include/homekit/macros.h b/include/pio/include/homekit/macros.h similarity index 100% rename from platformio/common/include/homekit/macros.h rename to include/pio/include/homekit/macros.h diff --git a/platformio/common/include/homekit/stopwatch.h b/include/pio/include/homekit/stopwatch.h similarity index 100% rename from platformio/common/include/homekit/stopwatch.h rename to include/pio/include/homekit/stopwatch.h diff --git a/platformio/common/include/homekit/util.h b/include/pio/include/homekit/util.h similarity index 100% rename from platformio/common/include/homekit/util.h rename to include/pio/include/homekit/util.h diff --git a/platformio/common/libs/config/homekit/config.cpp b/include/pio/libs/config/homekit/config.cpp similarity index 100% rename from platformio/common/libs/config/homekit/config.cpp rename to include/pio/libs/config/homekit/config.cpp diff --git a/platformio/common/libs/config/homekit/config.h b/include/pio/libs/config/homekit/config.h similarity index 100% rename from platformio/common/libs/config/homekit/config.h rename to include/pio/libs/config/homekit/config.h diff --git a/platformio/common/libs/config/library.json b/include/pio/libs/config/library.json similarity index 100% rename from platformio/common/libs/config/library.json rename to include/pio/libs/config/library.json diff --git a/platformio/common/libs/http_server/homekit/http_server.cpp b/include/pio/libs/http_server/homekit/http_server.cpp similarity index 100% rename from platformio/common/libs/http_server/homekit/http_server.cpp rename to include/pio/libs/http_server/homekit/http_server.cpp diff --git a/platformio/common/libs/http_server/homekit/http_server.h b/include/pio/libs/http_server/homekit/http_server.h similarity index 100% rename from platformio/common/libs/http_server/homekit/http_server.h rename to include/pio/libs/http_server/homekit/http_server.h diff --git a/platformio/common/libs/http_server/library.json b/include/pio/libs/http_server/library.json similarity index 100% rename from platformio/common/libs/http_server/library.json rename to include/pio/libs/http_server/library.json diff --git a/platformio/common/libs/led/homekit/led.cpp b/include/pio/libs/led/homekit/led.cpp similarity index 100% rename from platformio/common/libs/led/homekit/led.cpp rename to include/pio/libs/led/homekit/led.cpp diff --git a/platformio/common/libs/led/homekit/led.h b/include/pio/libs/led/homekit/led.h similarity index 100% rename from platformio/common/libs/led/homekit/led.h rename to include/pio/libs/led/homekit/led.h diff --git a/platformio/common/libs/led/library.json b/include/pio/libs/led/library.json similarity index 100% rename from platformio/common/libs/led/library.json rename to include/pio/libs/led/library.json diff --git a/platformio/common/libs/main/homekit/main.cpp b/include/pio/libs/main/homekit/main.cpp similarity index 100% rename from platformio/common/libs/main/homekit/main.cpp rename to include/pio/libs/main/homekit/main.cpp diff --git a/platformio/common/libs/main/homekit/main.h b/include/pio/libs/main/homekit/main.h similarity index 100% rename from platformio/common/libs/main/homekit/main.h rename to include/pio/libs/main/homekit/main.h diff --git a/platformio/common/libs/main/library.json b/include/pio/libs/main/library.json similarity index 100% rename from platformio/common/libs/main/library.json rename to include/pio/libs/main/library.json diff --git a/platformio/common/libs/mqtt/homekit/mqtt/module.cpp b/include/pio/libs/mqtt/homekit/mqtt/module.cpp similarity index 100% rename from platformio/common/libs/mqtt/homekit/mqtt/module.cpp rename to include/pio/libs/mqtt/homekit/mqtt/module.cpp diff --git a/platformio/common/libs/mqtt/homekit/mqtt/module.h b/include/pio/libs/mqtt/homekit/mqtt/module.h similarity index 100% rename from platformio/common/libs/mqtt/homekit/mqtt/module.h rename to include/pio/libs/mqtt/homekit/mqtt/module.h diff --git a/platformio/common/libs/mqtt/homekit/mqtt/mqtt.cpp b/include/pio/libs/mqtt/homekit/mqtt/mqtt.cpp similarity index 100% rename from platformio/common/libs/mqtt/homekit/mqtt/mqtt.cpp rename to include/pio/libs/mqtt/homekit/mqtt/mqtt.cpp diff --git a/platformio/common/libs/mqtt/homekit/mqtt/mqtt.h b/include/pio/libs/mqtt/homekit/mqtt/mqtt.h similarity index 100% rename from platformio/common/libs/mqtt/homekit/mqtt/mqtt.h rename to include/pio/libs/mqtt/homekit/mqtt/mqtt.h diff --git a/platformio/common/libs/mqtt/homekit/mqtt/payload.h b/include/pio/libs/mqtt/homekit/mqtt/payload.h similarity index 100% rename from platformio/common/libs/mqtt/homekit/mqtt/payload.h rename to include/pio/libs/mqtt/homekit/mqtt/payload.h diff --git a/platformio/common/libs/mqtt/library.json b/include/pio/libs/mqtt/library.json similarity index 100% rename from platformio/common/libs/mqtt/library.json rename to include/pio/libs/mqtt/library.json diff --git a/platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp b/include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp similarity index 100% rename from platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp rename to include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.cpp diff --git a/platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h b/include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h similarity index 100% rename from platformio/common/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h rename to include/pio/libs/mqtt_module_diagnostics/homekit/mqtt/module/diagnostics.h diff --git a/platformio/common/libs/mqtt_module_diagnostics/library.json b/include/pio/libs/mqtt_module_diagnostics/library.json similarity index 100% rename from platformio/common/libs/mqtt_module_diagnostics/library.json rename to include/pio/libs/mqtt_module_diagnostics/library.json diff --git a/platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp b/include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp similarity index 100% rename from platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp rename to include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.cpp diff --git a/platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.h b/include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.h similarity index 100% rename from platformio/common/libs/mqtt_module_ota/homekit/mqtt/module/ota.h rename to include/pio/libs/mqtt_module_ota/homekit/mqtt/module/ota.h diff --git a/platformio/common/libs/mqtt_module_ota/library.json b/include/pio/libs/mqtt_module_ota/library.json similarity index 100% rename from platformio/common/libs/mqtt_module_ota/library.json rename to include/pio/libs/mqtt_module_ota/library.json diff --git a/platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp b/include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp similarity index 100% rename from platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp rename to include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.cpp diff --git a/platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.h b/include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.h similarity index 100% rename from platformio/common/libs/mqtt_module_relay/homekit/mqtt/module/relay.h rename to include/pio/libs/mqtt_module_relay/homekit/mqtt/module/relay.h diff --git a/platformio/common/libs/mqtt_module_relay/library.json b/include/pio/libs/mqtt_module_relay/library.json similarity index 100% rename from platformio/common/libs/mqtt_module_relay/library.json rename to include/pio/libs/mqtt_module_relay/library.json diff --git a/platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp b/include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp similarity index 100% rename from platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp rename to include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.cpp diff --git a/platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h b/include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h similarity index 100% rename from platformio/common/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h rename to include/pio/libs/mqtt_module_temphum/homekit/mqtt/module/temphum.h diff --git a/platformio/common/libs/mqtt_module_temphum/library.json b/include/pio/libs/mqtt_module_temphum/library.json similarity index 100% rename from platformio/common/libs/mqtt_module_temphum/library.json rename to include/pio/libs/mqtt_module_temphum/library.json diff --git a/platformio/common/libs/relay/homekit/relay.cpp b/include/pio/libs/relay/homekit/relay.cpp similarity index 100% rename from platformio/common/libs/relay/homekit/relay.cpp rename to include/pio/libs/relay/homekit/relay.cpp diff --git a/platformio/common/libs/relay/homekit/relay.h b/include/pio/libs/relay/homekit/relay.h similarity index 100% rename from platformio/common/libs/relay/homekit/relay.h rename to include/pio/libs/relay/homekit/relay.h diff --git a/platformio/common/libs/relay/library.json b/include/pio/libs/relay/library.json similarity index 100% rename from platformio/common/libs/relay/library.json rename to include/pio/libs/relay/library.json diff --git a/platformio/common/libs/static/homekit/static.cpp b/include/pio/libs/static/homekit/static.cpp similarity index 100% rename from platformio/common/libs/static/homekit/static.cpp rename to include/pio/libs/static/homekit/static.cpp diff --git a/platformio/common/libs/static/homekit/static.h b/include/pio/libs/static/homekit/static.h similarity index 100% rename from platformio/common/libs/static/homekit/static.h rename to include/pio/libs/static/homekit/static.h diff --git a/platformio/common/libs/static/library.json b/include/pio/libs/static/library.json similarity index 100% rename from platformio/common/libs/static/library.json rename to include/pio/libs/static/library.json diff --git a/platformio/common/libs/temphum/homekit/temphum.cpp b/include/pio/libs/temphum/homekit/temphum.cpp similarity index 100% rename from platformio/common/libs/temphum/homekit/temphum.cpp rename to include/pio/libs/temphum/homekit/temphum.cpp diff --git a/platformio/common/libs/temphum/homekit/temphum.h b/include/pio/libs/temphum/homekit/temphum.h similarity index 100% rename from platformio/common/libs/temphum/homekit/temphum.h rename to include/pio/libs/temphum/homekit/temphum.h diff --git a/platformio/common/libs/temphum/library.json b/include/pio/libs/temphum/library.json similarity index 100% rename from platformio/common/libs/temphum/library.json rename to include/pio/libs/temphum/library.json diff --git a/platformio/common/libs/wifi/homekit/wifi.cpp b/include/pio/libs/wifi/homekit/wifi.cpp similarity index 100% rename from platformio/common/libs/wifi/homekit/wifi.cpp rename to include/pio/libs/wifi/homekit/wifi.cpp diff --git a/platformio/common/libs/wifi/homekit/wifi.h b/include/pio/libs/wifi/homekit/wifi.h similarity index 100% rename from platformio/common/libs/wifi/homekit/wifi.h rename to include/pio/libs/wifi/homekit/wifi.h diff --git a/platformio/common/libs/wifi/library.json b/include/pio/libs/wifi/library.json similarity index 100% rename from platformio/common/libs/wifi/library.json rename to include/pio/libs/wifi/library.json diff --git a/platformio/common/make_static.sh b/include/pio/make_static.sh similarity index 100% rename from platformio/common/make_static.sh rename to include/pio/make_static.sh diff --git a/platformio/common/static/app.js b/include/pio/static/app.js similarity index 100% rename from platformio/common/static/app.js rename to include/pio/static/app.js diff --git a/platformio/common/static/favicon.ico b/include/pio/static/favicon.ico similarity index 100% rename from platformio/common/static/favicon.ico rename to include/pio/static/favicon.ico diff --git a/platformio/common/static/index.html b/include/pio/static/index.html similarity index 100% rename from platformio/common/static/index.html rename to include/pio/static/index.html diff --git a/platformio/common/static/md5.js b/include/pio/static/md5.js similarity index 100% rename from platformio/common/static/md5.js rename to include/pio/static/md5.js diff --git a/platformio/common/static/style.css b/include/pio/static/style.css similarity index 100% rename from platformio/common/static/style.css rename to include/pio/static/style.css diff --git a/py_include/__init__.py b/include/py/__init__.py similarity index 100% rename from py_include/__init__.py rename to include/py/__init__.py diff --git a/py_include/homekit/__init__.py b/include/py/homekit/__init__.py similarity index 100% rename from py_include/homekit/__init__.py rename to include/py/homekit/__init__.py diff --git a/py_include/homekit/api/__init__.py b/include/py/homekit/api/__init__.py similarity index 100% rename from py_include/homekit/api/__init__.py rename to include/py/homekit/api/__init__.py diff --git a/py_include/homekit/api/__init__.pyi b/include/py/homekit/api/__init__.pyi similarity index 100% rename from py_include/homekit/api/__init__.pyi rename to include/py/homekit/api/__init__.pyi diff --git a/py_include/homekit/api/config.py b/include/py/homekit/api/config.py similarity index 100% rename from py_include/homekit/api/config.py rename to include/py/homekit/api/config.py diff --git a/py_include/homekit/api/errors/__init__.py b/include/py/homekit/api/errors/__init__.py similarity index 100% rename from py_include/homekit/api/errors/__init__.py rename to include/py/homekit/api/errors/__init__.py diff --git a/py_include/homekit/api/errors/api_response_error.py b/include/py/homekit/api/errors/api_response_error.py similarity index 100% rename from py_include/homekit/api/errors/api_response_error.py rename to include/py/homekit/api/errors/api_response_error.py diff --git a/py_include/homekit/api/types/__init__.py b/include/py/homekit/api/types/__init__.py similarity index 100% rename from py_include/homekit/api/types/__init__.py rename to include/py/homekit/api/types/__init__.py diff --git a/py_include/homekit/api/types/types.py b/include/py/homekit/api/types/types.py similarity index 100% rename from py_include/homekit/api/types/types.py rename to include/py/homekit/api/types/types.py diff --git a/py_include/homekit/api/web_api_client.py b/include/py/homekit/api/web_api_client.py similarity index 100% rename from py_include/homekit/api/web_api_client.py rename to include/py/homekit/api/web_api_client.py diff --git a/py_include/homekit/audio/__init__.py b/include/py/homekit/audio/__init__.py similarity index 100% rename from py_include/homekit/audio/__init__.py rename to include/py/homekit/audio/__init__.py diff --git a/py_include/homekit/audio/amixer.py b/include/py/homekit/audio/amixer.py similarity index 100% rename from py_include/homekit/audio/amixer.py rename to include/py/homekit/audio/amixer.py diff --git a/py_include/homekit/camera/__init__.py b/include/py/homekit/camera/__init__.py similarity index 100% rename from py_include/homekit/camera/__init__.py rename to include/py/homekit/camera/__init__.py diff --git a/py_include/homekit/camera/esp32.py b/include/py/homekit/camera/esp32.py similarity index 100% rename from py_include/homekit/camera/esp32.py rename to include/py/homekit/camera/esp32.py diff --git a/py_include/homekit/camera/types.py b/include/py/homekit/camera/types.py similarity index 100% rename from py_include/homekit/camera/types.py rename to include/py/homekit/camera/types.py diff --git a/py_include/homekit/camera/util.py b/include/py/homekit/camera/util.py similarity index 100% rename from py_include/homekit/camera/util.py rename to include/py/homekit/camera/util.py diff --git a/py_include/homekit/config/__init__.py b/include/py/homekit/config/__init__.py similarity index 100% rename from py_include/homekit/config/__init__.py rename to include/py/homekit/config/__init__.py diff --git a/py_include/homekit/config/_configs.py b/include/py/homekit/config/_configs.py similarity index 100% rename from py_include/homekit/config/_configs.py rename to include/py/homekit/config/_configs.py diff --git a/py_include/homekit/config/config.py b/include/py/homekit/config/config.py similarity index 100% rename from py_include/homekit/config/config.py rename to include/py/homekit/config/config.py diff --git a/py_include/homekit/database/__init__.py b/include/py/homekit/database/__init__.py similarity index 100% rename from py_include/homekit/database/__init__.py rename to include/py/homekit/database/__init__.py diff --git a/py_include/homekit/database/__init__.pyi b/include/py/homekit/database/__init__.pyi similarity index 100% rename from py_include/homekit/database/__init__.pyi rename to include/py/homekit/database/__init__.pyi diff --git a/py_include/homekit/database/_base.py b/include/py/homekit/database/_base.py similarity index 100% rename from py_include/homekit/database/_base.py rename to include/py/homekit/database/_base.py diff --git a/py_include/homekit/database/bots.py b/include/py/homekit/database/bots.py similarity index 100% rename from py_include/homekit/database/bots.py rename to include/py/homekit/database/bots.py diff --git a/py_include/homekit/database/clickhouse.py b/include/py/homekit/database/clickhouse.py similarity index 100% rename from py_include/homekit/database/clickhouse.py rename to include/py/homekit/database/clickhouse.py diff --git a/py_include/homekit/database/inverter.py b/include/py/homekit/database/inverter.py similarity index 100% rename from py_include/homekit/database/inverter.py rename to include/py/homekit/database/inverter.py diff --git a/py_include/homekit/database/inverter_time_formats.py b/include/py/homekit/database/inverter_time_formats.py similarity index 100% rename from py_include/homekit/database/inverter_time_formats.py rename to include/py/homekit/database/inverter_time_formats.py diff --git a/py_include/homekit/database/mysql.py b/include/py/homekit/database/mysql.py similarity index 100% rename from py_include/homekit/database/mysql.py rename to include/py/homekit/database/mysql.py diff --git a/py_include/homekit/database/sensors.py b/include/py/homekit/database/sensors.py similarity index 100% rename from py_include/homekit/database/sensors.py rename to include/py/homekit/database/sensors.py diff --git a/py_include/homekit/database/simple_state.py b/include/py/homekit/database/simple_state.py similarity index 100% rename from py_include/homekit/database/simple_state.py rename to include/py/homekit/database/simple_state.py diff --git a/py_include/homekit/database/sqlite.py b/include/py/homekit/database/sqlite.py similarity index 100% rename from py_include/homekit/database/sqlite.py rename to include/py/homekit/database/sqlite.py diff --git a/py_include/homekit/http/__init__.py b/include/py/homekit/http/__init__.py similarity index 100% rename from py_include/homekit/http/__init__.py rename to include/py/homekit/http/__init__.py diff --git a/py_include/homekit/http/http.py b/include/py/homekit/http/http.py similarity index 100% rename from py_include/homekit/http/http.py rename to include/py/homekit/http/http.py diff --git a/py_include/homekit/inverter/__init__.py b/include/py/homekit/inverter/__init__.py similarity index 100% rename from py_include/homekit/inverter/__init__.py rename to include/py/homekit/inverter/__init__.py diff --git a/py_include/homekit/inverter/config.py b/include/py/homekit/inverter/config.py similarity index 100% rename from py_include/homekit/inverter/config.py rename to include/py/homekit/inverter/config.py diff --git a/py_include/homekit/inverter/emulator.py b/include/py/homekit/inverter/emulator.py similarity index 100% rename from py_include/homekit/inverter/emulator.py rename to include/py/homekit/inverter/emulator.py diff --git a/py_include/homekit/inverter/inverter_wrapper.py b/include/py/homekit/inverter/inverter_wrapper.py similarity index 100% rename from py_include/homekit/inverter/inverter_wrapper.py rename to include/py/homekit/inverter/inverter_wrapper.py diff --git a/py_include/homekit/inverter/monitor.py b/include/py/homekit/inverter/monitor.py similarity index 100% rename from py_include/homekit/inverter/monitor.py rename to include/py/homekit/inverter/monitor.py diff --git a/py_include/homekit/inverter/types.py b/include/py/homekit/inverter/types.py similarity index 100% rename from py_include/homekit/inverter/types.py rename to include/py/homekit/inverter/types.py diff --git a/py_include/homekit/inverter/util.py b/include/py/homekit/inverter/util.py similarity index 100% rename from py_include/homekit/inverter/util.py rename to include/py/homekit/inverter/util.py diff --git a/py_include/homekit/media/__init__.py b/include/py/homekit/media/__init__.py similarity index 100% rename from py_include/homekit/media/__init__.py rename to include/py/homekit/media/__init__.py diff --git a/py_include/homekit/media/__init__.pyi b/include/py/homekit/media/__init__.pyi similarity index 100% rename from py_include/homekit/media/__init__.pyi rename to include/py/homekit/media/__init__.pyi diff --git a/py_include/homekit/media/node_client.py b/include/py/homekit/media/node_client.py similarity index 100% rename from py_include/homekit/media/node_client.py rename to include/py/homekit/media/node_client.py diff --git a/py_include/homekit/media/node_server.py b/include/py/homekit/media/node_server.py similarity index 100% rename from py_include/homekit/media/node_server.py rename to include/py/homekit/media/node_server.py diff --git a/py_include/homekit/media/record.py b/include/py/homekit/media/record.py similarity index 100% rename from py_include/homekit/media/record.py rename to include/py/homekit/media/record.py diff --git a/py_include/homekit/media/record_client.py b/include/py/homekit/media/record_client.py similarity index 100% rename from py_include/homekit/media/record_client.py rename to include/py/homekit/media/record_client.py diff --git a/py_include/homekit/media/storage.py b/include/py/homekit/media/storage.py similarity index 100% rename from py_include/homekit/media/storage.py rename to include/py/homekit/media/storage.py diff --git a/py_include/homekit/media/types.py b/include/py/homekit/media/types.py similarity index 100% rename from py_include/homekit/media/types.py rename to include/py/homekit/media/types.py diff --git a/py_include/homekit/mqtt/__init__.py b/include/py/homekit/mqtt/__init__.py similarity index 100% rename from py_include/homekit/mqtt/__init__.py rename to include/py/homekit/mqtt/__init__.py diff --git a/py_include/homekit/mqtt/_config.py b/include/py/homekit/mqtt/_config.py similarity index 100% rename from py_include/homekit/mqtt/_config.py rename to include/py/homekit/mqtt/_config.py diff --git a/py_include/homekit/mqtt/_module.py b/include/py/homekit/mqtt/_module.py similarity index 100% rename from py_include/homekit/mqtt/_module.py rename to include/py/homekit/mqtt/_module.py diff --git a/py_include/homekit/mqtt/_mqtt.py b/include/py/homekit/mqtt/_mqtt.py similarity index 100% rename from py_include/homekit/mqtt/_mqtt.py rename to include/py/homekit/mqtt/_mqtt.py diff --git a/py_include/homekit/mqtt/_node.py b/include/py/homekit/mqtt/_node.py similarity index 100% rename from py_include/homekit/mqtt/_node.py rename to include/py/homekit/mqtt/_node.py diff --git a/py_include/homekit/mqtt/_payload.py b/include/py/homekit/mqtt/_payload.py similarity index 100% rename from py_include/homekit/mqtt/_payload.py rename to include/py/homekit/mqtt/_payload.py diff --git a/py_include/homekit/mqtt/_util.py b/include/py/homekit/mqtt/_util.py similarity index 100% rename from py_include/homekit/mqtt/_util.py rename to include/py/homekit/mqtt/_util.py diff --git a/py_include/homekit/mqtt/_wrapper.py b/include/py/homekit/mqtt/_wrapper.py similarity index 100% rename from py_include/homekit/mqtt/_wrapper.py rename to include/py/homekit/mqtt/_wrapper.py diff --git a/py_include/homekit/mqtt/module/diagnostics.py b/include/py/homekit/mqtt/module/diagnostics.py similarity index 100% rename from py_include/homekit/mqtt/module/diagnostics.py rename to include/py/homekit/mqtt/module/diagnostics.py diff --git a/py_include/homekit/mqtt/module/inverter.py b/include/py/homekit/mqtt/module/inverter.py similarity index 100% rename from py_include/homekit/mqtt/module/inverter.py rename to include/py/homekit/mqtt/module/inverter.py diff --git a/py_include/homekit/mqtt/module/ota.py b/include/py/homekit/mqtt/module/ota.py similarity index 100% rename from py_include/homekit/mqtt/module/ota.py rename to include/py/homekit/mqtt/module/ota.py diff --git a/py_include/homekit/mqtt/module/relay.py b/include/py/homekit/mqtt/module/relay.py similarity index 100% rename from py_include/homekit/mqtt/module/relay.py rename to include/py/homekit/mqtt/module/relay.py diff --git a/py_include/homekit/mqtt/module/temphum.py b/include/py/homekit/mqtt/module/temphum.py similarity index 100% rename from py_include/homekit/mqtt/module/temphum.py rename to include/py/homekit/mqtt/module/temphum.py diff --git a/py_include/homekit/pio/__init__.py b/include/py/homekit/pio/__init__.py similarity index 100% rename from py_include/homekit/pio/__init__.py rename to include/py/homekit/pio/__init__.py diff --git a/py_include/homekit/pio/exceptions.py b/include/py/homekit/pio/exceptions.py similarity index 100% rename from py_include/homekit/pio/exceptions.py rename to include/py/homekit/pio/exceptions.py diff --git a/py_include/homekit/pio/products.py b/include/py/homekit/pio/products.py similarity index 100% rename from py_include/homekit/pio/products.py rename to include/py/homekit/pio/products.py diff --git a/py_include/homekit/relay/__init__.py b/include/py/homekit/relay/__init__.py similarity index 100% rename from py_include/homekit/relay/__init__.py rename to include/py/homekit/relay/__init__.py diff --git a/py_include/homekit/relay/__init__.pyi b/include/py/homekit/relay/__init__.pyi similarity index 100% rename from py_include/homekit/relay/__init__.pyi rename to include/py/homekit/relay/__init__.pyi diff --git a/py_include/homekit/relay/sunxi_h3_client.py b/include/py/homekit/relay/sunxi_h3_client.py similarity index 100% rename from py_include/homekit/relay/sunxi_h3_client.py rename to include/py/homekit/relay/sunxi_h3_client.py diff --git a/py_include/homekit/relay/sunxi_h3_server.py b/include/py/homekit/relay/sunxi_h3_server.py similarity index 100% rename from py_include/homekit/relay/sunxi_h3_server.py rename to include/py/homekit/relay/sunxi_h3_server.py diff --git a/py_include/homekit/soundsensor/__init__.py b/include/py/homekit/soundsensor/__init__.py similarity index 100% rename from py_include/homekit/soundsensor/__init__.py rename to include/py/homekit/soundsensor/__init__.py diff --git a/py_include/homekit/soundsensor/__init__.pyi b/include/py/homekit/soundsensor/__init__.pyi similarity index 100% rename from py_include/homekit/soundsensor/__init__.pyi rename to include/py/homekit/soundsensor/__init__.pyi diff --git a/py_include/homekit/soundsensor/node.py b/include/py/homekit/soundsensor/node.py similarity index 100% rename from py_include/homekit/soundsensor/node.py rename to include/py/homekit/soundsensor/node.py diff --git a/py_include/homekit/soundsensor/server.py b/include/py/homekit/soundsensor/server.py similarity index 100% rename from py_include/homekit/soundsensor/server.py rename to include/py/homekit/soundsensor/server.py diff --git a/py_include/homekit/soundsensor/server_client.py b/include/py/homekit/soundsensor/server_client.py similarity index 100% rename from py_include/homekit/soundsensor/server_client.py rename to include/py/homekit/soundsensor/server_client.py diff --git a/py_include/homekit/telegram/__init__.py b/include/py/homekit/telegram/__init__.py similarity index 100% rename from py_include/homekit/telegram/__init__.py rename to include/py/homekit/telegram/__init__.py diff --git a/py_include/homekit/telegram/_botcontext.py b/include/py/homekit/telegram/_botcontext.py similarity index 100% rename from py_include/homekit/telegram/_botcontext.py rename to include/py/homekit/telegram/_botcontext.py diff --git a/py_include/homekit/telegram/_botdb.py b/include/py/homekit/telegram/_botdb.py similarity index 100% rename from py_include/homekit/telegram/_botdb.py rename to include/py/homekit/telegram/_botdb.py diff --git a/py_include/homekit/telegram/_botlang.py b/include/py/homekit/telegram/_botlang.py similarity index 100% rename from py_include/homekit/telegram/_botlang.py rename to include/py/homekit/telegram/_botlang.py diff --git a/py_include/homekit/telegram/_botutil.py b/include/py/homekit/telegram/_botutil.py similarity index 100% rename from py_include/homekit/telegram/_botutil.py rename to include/py/homekit/telegram/_botutil.py diff --git a/py_include/homekit/telegram/aio.py b/include/py/homekit/telegram/aio.py similarity index 100% rename from py_include/homekit/telegram/aio.py rename to include/py/homekit/telegram/aio.py diff --git a/py_include/homekit/telegram/bot.py b/include/py/homekit/telegram/bot.py similarity index 100% rename from py_include/homekit/telegram/bot.py rename to include/py/homekit/telegram/bot.py diff --git a/py_include/homekit/telegram/config.py b/include/py/homekit/telegram/config.py similarity index 100% rename from py_include/homekit/telegram/config.py rename to include/py/homekit/telegram/config.py diff --git a/py_include/homekit/telegram/telegram.py b/include/py/homekit/telegram/telegram.py similarity index 100% rename from py_include/homekit/telegram/telegram.py rename to include/py/homekit/telegram/telegram.py diff --git a/py_include/homekit/temphum/__init__.py b/include/py/homekit/temphum/__init__.py similarity index 100% rename from py_include/homekit/temphum/__init__.py rename to include/py/homekit/temphum/__init__.py diff --git a/py_include/homekit/temphum/base.py b/include/py/homekit/temphum/base.py similarity index 100% rename from py_include/homekit/temphum/base.py rename to include/py/homekit/temphum/base.py diff --git a/py_include/homekit/temphum/i2c.py b/include/py/homekit/temphum/i2c.py similarity index 100% rename from py_include/homekit/temphum/i2c.py rename to include/py/homekit/temphum/i2c.py diff --git a/py_include/homekit/util.py b/include/py/homekit/util.py similarity index 100% rename from py_include/homekit/util.py rename to include/py/homekit/util.py diff --git a/py_include/pyA20/__init__.pyi b/include/py/pyA20/__init__.pyi similarity index 100% rename from py_include/pyA20/__init__.pyi rename to include/py/pyA20/__init__.pyi diff --git a/py_include/pyA20/gpio/connector.pyi b/include/py/pyA20/gpio/connector.pyi similarity index 100% rename from py_include/pyA20/gpio/connector.pyi rename to include/py/pyA20/gpio/connector.pyi diff --git a/py_include/pyA20/gpio/gpio.pyi b/include/py/pyA20/gpio/gpio.pyi similarity index 100% rename from py_include/pyA20/gpio/gpio.pyi rename to include/py/pyA20/gpio/gpio.pyi diff --git a/py_include/pyA20/gpio/port.pyi b/include/py/pyA20/gpio/port.pyi similarity index 100% rename from py_include/pyA20/gpio/port.pyi rename to include/py/pyA20/gpio/port.pyi diff --git a/py_include/pyA20/port.pyi b/include/py/pyA20/port.pyi similarity index 100% rename from py_include/pyA20/port.pyi rename to include/py/pyA20/port.pyi diff --git a/py_include/syncleo/__init__.py b/include/py/syncleo/__init__.py similarity index 100% rename from py_include/syncleo/__init__.py rename to include/py/syncleo/__init__.py diff --git a/py_include/syncleo/kettle.py b/include/py/syncleo/kettle.py similarity index 100% rename from py_include/syncleo/kettle.py rename to include/py/syncleo/kettle.py diff --git a/py_include/syncleo/protocol.py b/include/py/syncleo/protocol.py similarity index 100% rename from py_include/syncleo/protocol.py rename to include/py/syncleo/protocol.py diff --git a/platformio/dumb_mqtt/src/main.cpp b/pio/dumb_mqtt/src/main.cpp similarity index 100% rename from platformio/dumb_mqtt/src/main.cpp rename to pio/dumb_mqtt/src/main.cpp diff --git a/platformio/relayctl/src/main.cpp b/pio/relayctl/src/main.cpp similarity index 100% rename from platformio/relayctl/src/main.cpp rename to pio/relayctl/src/main.cpp diff --git a/platformio/temphum/src/main.cpp b/pio/temphum/src/main.cpp similarity index 100% rename from platformio/temphum/src/main.cpp rename to pio/temphum/src/main.cpp diff --git a/platformio/temphum_relayctl/src/main.cpp b/pio/temphum_relayctl/src/main.cpp similarity index 100% rename from platformio/temphum_relayctl/src/main.cpp rename to pio/temphum_relayctl/src/main.cpp diff --git a/platformio/dumb_mqtt/.gitignore b/platformio/dumb_mqtt/.gitignore deleted file mode 100644 index 3fe18ad..0000000 --- a/platformio/dumb_mqtt/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.pio -CMakeListsPrivate.txt -cmake-build-*/ diff --git a/platformio/relayctl/.gitignore b/platformio/relayctl/.gitignore deleted file mode 100644 index 3fe18ad..0000000 --- a/platformio/relayctl/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.pio -CMakeListsPrivate.txt -cmake-build-*/ diff --git a/platformio/temphum/.gitignore b/platformio/temphum/.gitignore deleted file mode 100644 index 3fe18ad..0000000 --- a/platformio/temphum/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.pio -CMakeListsPrivate.txt -cmake-build-*/ diff --git a/test/__py_include.py b/test/__py_include.py new file mode 100644 index 0000000..8f98830 --- /dev/null +++ b/test/__py_include.py @@ -0,0 +1,9 @@ +import sys +import os.path + +for _name in ('include/py',): + sys.path.extend([ + os.path.realpath( + os.path.join(os.path.dirname(os.path.join(__file__)), '..', _name) + ) + ]) \ No newline at end of file diff --git a/test/mqtt_relay_server_util.py b/test/mqtt_relay_server_util.py index ac6a9ae..6c02d75 100755 --- a/test/mqtt_relay_server_util.py +++ b/test/mqtt_relay_server_util.py @@ -1,17 +1,11 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include -from src.home.config import config -from src.home.mqtt.relay import MQTTRelayClient +from homekit.config import config if __name__ == '__main__': - config.load_app('test_mqtt_relay_server') - relay = MQTTRelayClient('test') - relay.connect_and_loop() + print(config) + # config.load_app('test_mqtt_relay_server') + # relay = MQTTRelayClient('test') + # relay.connect_and_loop() diff --git a/test/mqtt_relay_util.py b/test/mqtt_relay_util.py index 0d8c764..394bbe8 100755 --- a/test/mqtt_relay_util.py +++ b/test/mqtt_relay_util.py @@ -1,15 +1,9 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include from argparse import ArgumentParser -from src.home.config import config -from src.home.mqtt.relay import MQTTRelayController +from homekit.config import config +from homekit.mqtt.relay import MQTTRelayController if __name__ == '__main__': diff --git a/test/test.py b/test/test.py index 413c25c..267a19f 100755 --- a/test/test.py +++ b/test/test.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +import __py_include from homekit.relay import RelayClient diff --git a/test/test_amixer.py b/test/test_amixer.py index 464941e..e4abc73 100755 --- a/test/test_amixer.py +++ b/test/test_amixer.py @@ -1,12 +1,9 @@ #!/usr/bin/env python3 -import sys, os.path -sys.path.extend([ - os.path.realpath(os.path.join(os.path.dirname(os.path.join(__file__)), '..')), -]) +import __py_include from argparse import ArgumentParser -from src.home.config import config -from src.home.audio import amixer +from homekit.config import config +from homekit.audio import amixer def validate_control(input: str): diff --git a/test/test_api.py b/test/test_api.py index ecf8764..80ab62a 100755 --- a/test/test_api.py +++ b/test/test_api.py @@ -1,15 +1,9 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include -from src.home.api import WebApiClient -from src.home.api.types import BotType -from src.home.config import config +from homekit.api import WebApiClient +from homekit.api.types import BotType +from homekit.config import config if __name__ == '__main__': diff --git a/test/test_esp32_cam.py b/test/test_esp32_cam.py index 6a4ad25..962768f 100755 --- a/test/test_esp32_cam.py +++ b/test/test_esp32_cam.py @@ -1,18 +1,12 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include from pprint import pprint from argparse import ArgumentParser from time import sleep -from src.home.util import Addr -from src.home.camera import esp32 -from src.home.config import config +from homekit.util import Addr +from homekit.camera import esp32 +from homekit.config import config if __name__ == '__main__': parser = ArgumentParser() diff --git a/test/test_inverter_monitor.py b/test/test_inverter_monitor.py index 621c0e9..3231bab 100755 --- a/test/test_inverter_monitor.py +++ b/test/test_inverter_monitor.py @@ -1,22 +1,11 @@ #!/usr/bin/env python3 -import cmd -import time -import logging -import socket -import sys -import threading -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include from enum import Enum, auto from typing import Optional -from src.home.util import stringify -from src.home.config import config -from src.home.inverter import ( +from homekit.util import stringify +from homekit.config import config +from homekit.inverter import ( wrapper_instance as inverter, InverterMonitor, diff --git a/test/test_ipcam_server_cleanup.py b/test/test_ipcam_server_cleanup.py index 5f313a4..ae8d31c 100644 --- a/test/test_ipcam_server_cleanup.py +++ b/test/test_ipcam_server_cleanup.py @@ -1,19 +1,13 @@ #!/usr/bin/env python3 -import shutil -import sys -import os -import re +import __py_include import logging -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import os +import shutil +import re from functools import cmp_to_key from datetime import datetime -from pprint import pprint -from src.home.config import config +from homekit.config import config logger = logging.getLogger(__name__) diff --git a/test/test_polaris_stuff.py b/test/test_polaris_stuff.py index b921891..7778667 100755 --- a/test/test_polaris_stuff.py +++ b/test/test_polaris_stuff.py @@ -1,13 +1,6 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) - -import src.syncleo as polaris +import __py_include +import syncleo if __name__ == '__main__': diff --git a/test/test_record_upload.py b/test/test_record_upload.py index c0daceb..f9c83d8 100755 --- a/test/test_record_upload.py +++ b/test/test_record_upload.py @@ -1,19 +1,12 @@ #!/usr/bin/env python3 +import __py_include import logging -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) - import time -from src.home.api import WebApiClient, RequestParams -from src.home.config import config -from src.home.media import SoundRecordClient -from src.home.util import Addr +from homekit.api import WebApiClient, RequestParams +from homekit.config import config +from homekit.media import SoundRecordClient +from homekit.util import Addr logger = logging.getLogger(__name__) diff --git a/test/test_send_fake_sound_hit.py b/test/test_send_fake_sound_hit.py index 61886cd..3cc3e50 100755 --- a/test/test_send_fake_sound_hit.py +++ b/test/test_send_fake_sound_hit.py @@ -1,14 +1,8 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include from argparse import ArgumentParser -from src.home.util import send_datagram, stringify, Addr +from homekit.util import send_datagram, stringify, Addr if __name__ == '__main__': diff --git a/test/test_sensors_plot.py b/test/test_sensors_plot.py deleted file mode 100755 index e69de29..0000000 diff --git a/test/test_sound_node_client.py b/test/test_sound_node_client.py index 16feb78..c3748ca 100755 --- a/test/test_sound_node_client.py +++ b/test/test_sound_node_client.py @@ -1,11 +1,8 @@ #!/usr/bin/env python3 -import sys, os.path -sys.path.extend([ - os.path.realpath(os.path.join(os.path.dirname(os.path.join(__file__)), '..')), -]) +import __py_include -from src.home.api.errors import ApiResponseError -from src.home.media import SoundNodeClient +from homekit.api.errors import ApiResponseError +from homekit.media import SoundNodeClient if __name__ == '__main__': diff --git a/test/test_sound_server_api.py b/test/test_sound_server_api.py index 77fe1ba..11cd422 100755 --- a/test/test_sound_server_api.py +++ b/test/test_sound_server_api.py @@ -1,17 +1,11 @@ #!/usr/bin/env python3 -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import __py_include import threading from time import sleep -from src.home.config import config -from src.home.api import WebApiClient -from src.home.api.types import SoundSensorLocation +from homekit.config import config +from homekit.api import WebApiClient +from homekit.api.types import SoundSensorLocation from typing import List, Tuple interrupted = False diff --git a/test/test_stopwatch.py b/test/test_stopwatch.py index 9dd7762..1da0fe7 100755 --- a/test/test_stopwatch.py +++ b/test/test_stopwatch.py @@ -1,3 +1,4 @@ +import __py_include from homekit.util import Stopwatch, StopwatchError from time import sleep diff --git a/test/test_telegram_aio_send_photo.py b/test/test_telegram_aio_send_photo.py index 4d05c03..019fa92 100644 --- a/test/test_telegram_aio_send_photo.py +++ b/test/test_telegram_aio_send_photo.py @@ -1,16 +1,9 @@ #!/usr/bin/env python3 +import __py_include import asyncio -import sys -import os.path -sys.path.extend([ - os.path.realpath( - os.path.join(os.path.dirname(os.path.join(__file__)), '..') - ) -]) +import homekit.telegram.aio as telegram -import src.home.telegram.aio as telegram - -from src.home.config import config +from homekit.config import config async def main():