From de4776eaa898a040616ad2fa23925cb33f347b86 Mon Sep 17 00:00:00 2001 From: Nikolay Vasilchuk Date: Tue, 9 Feb 2021 15:22:27 +0300 Subject: [PATCH] Code moved --- esphome/README.md | 2 +- esphome/README_EN.md | 2 +- README.md => native/README.md | 12 ++++++------ README_EN.md => native/README_EN.md | 12 ++++++------ {data => native/data}/index.html | 0 {data => native/data}/script.js | 0 {data => native/data}/style.css | 0 .../homeassistant}/domofon.yaml | 0 {homeassistant => native/homeassistant}/ha.png | Bin platformio.ini => native/platformio.ini | 0 scheme.jpeg => native/scheme.jpeg | Bin {src => native/src}/config/hardware.h | 0 {src => native/src}/config/mqtt.h | 0 {src => native/src}/config/software.h | 0 {src => native/src}/debug.ino | 0 {src => native/src}/domofon.ino | 0 {src => native/src}/hardware.ino | 0 {src => native/src}/inc/include.h | 0 {src => native/src}/inc/types.h | 0 {src => native/src}/led.ino | 0 {src => native/src}/main.ino | 0 {src => native/src}/mqtt.ino | 0 {src => native/src}/ota.ino | 0 {src => native/src}/server.ino | 0 {src => native/src}/wifi.ino | 0 25 files changed, 14 insertions(+), 14 deletions(-) rename README.md => native/README.md (92%) rename README_EN.md => native/README_EN.md (90%) rename {data => native/data}/index.html (100%) rename {data => native/data}/script.js (100%) rename {data => native/data}/style.css (100%) rename {homeassistant => native/homeassistant}/domofon.yaml (100%) rename {homeassistant => native/homeassistant}/ha.png (100%) rename platformio.ini => native/platformio.ini (100%) rename scheme.jpeg => native/scheme.jpeg (100%) rename {src => native/src}/config/hardware.h (100%) rename {src => native/src}/config/mqtt.h (100%) rename {src => native/src}/config/software.h (100%) rename {src => native/src}/debug.ino (100%) rename {src => native/src}/domofon.ino (100%) rename {src => native/src}/hardware.ino (100%) rename {src => native/src}/inc/include.h (100%) rename {src => native/src}/inc/types.h (100%) rename {src => native/src}/led.ino (100%) rename {src => native/src}/main.ino (100%) rename {src => native/src}/mqtt.ino (100%) rename {src => native/src}/ota.ino (100%) rename {src => native/src}/server.ino (100%) rename {src => native/src}/wifi.ino (100%) diff --git a/esphome/README.md b/esphome/README.md index 189e6cf..3e29b2c 100644 --- a/esphome/README.md +++ b/esphome/README.md @@ -9,7 +9,7 @@ --- -[Схема и компоненты](https://github.com/Anonym-tsk/smart-domofon/blob/master/README.md) +[Схема и компоненты](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/README.md) ## Кнопка и индикация * Красный светодиод мигает diff --git a/esphome/README_EN.md b/esphome/README_EN.md index 02027ef..f60d783 100644 --- a/esphome/README_EN.md +++ b/esphome/README_EN.md @@ -9,7 +9,7 @@ Enjoy my work? [Help me out](http://yasobe.ru/na/esphome) for a couple of :beers --- -[Scheme and parts](https://github.com/Anonym-tsk/smart-domofon/blob/master/README_EN.md) +[Scheme and parts](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/README_EN.md) ## Button and LED * Red LED blinks diff --git a/README.md b/native/README.md similarity index 92% rename from README.md rename to native/README.md index 7f234ac..3915d49 100644 --- a/README.md +++ b/native/README.md @@ -1,5 +1,5 @@ # Умный домофон на ESP8266 -[English](https://github.com/Anonym-tsk/smart-domofon/blob/master/README_EN.md) | **Русский** +[English](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/README_EN.md) | **Русский** Устройство умеет открывать домофон при входящем вызове. Работает только с координатными домофонами. Проверено с домофонами Visit, Cyfral, Metakom, Altis. @@ -33,15 +33,15 @@ 9. [microUSB кабель](https://roboshop.spb.ru/BS-410) ## Схема -![Scheme](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/scheme.jpeg) +![Scheme](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/native/scheme.jpeg) *За схему спасибо Oleg Yu* ### Эта версия прошивки больше не поддерживается. Пожалуйста, используйте [новую прошивку на базе ESPHome](https://github.com/Anonym-tsk/smart-domofon/blob/master/esphome/README.md). ## Конфигурация и прошивка -1. Заполните настройки WiFi и MQTT в файле [software.h](https://github.com/Anonym-tsk/smart-domofon/blob/master/src/config/software.h) -2. Укажите `upload_port` в файле [platformio.ini](https://github.com/Anonym-tsk/smart-domofon/blob/master/platformio.ini) +1. Заполните настройки WiFi и MQTT в файле [software.h](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/src/config/software.h) +2. Укажите `upload_port` в файле [platformio.ini](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/platformio.ini) 3. Используйте [PlatformIO](https://platformio.org/platformio-ide) для компиляции и загрузки прошивки ## MQTT сообщения статуса (domofon/status) @@ -62,8 +62,8 @@ * 'F' - fail; отправляется в ответ на команды 'O' и 'N' (означает, что команда была получена, но в данный момент не было входящего звонка) ## Интеграция с Home Assistant -![Home Assistant](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/homeassistant/ha.png) +![Home Assistant](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/native/homeassistant/ha.png) -[Конфигурация для Home Assistant с автоматизацией, сенсором и переключателями](https://github.com/Anonym-tsk/smart-domofon/blob/master/homeassistant/domofon.yaml) +[Конфигурация для Home Assistant с автоматизацией, сенсором и переключателями](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/homeassistant/domofon.yaml) Положите этот файл в `/config/packages/domofon.yaml` и исправьте используемые сервисы в автоматизации. diff --git a/README_EN.md b/native/README_EN.md similarity index 90% rename from README_EN.md rename to native/README_EN.md index 8fdff19..d6fd6fd 100644 --- a/README_EN.md +++ b/native/README_EN.md @@ -1,5 +1,5 @@ # Smart intercom based on ESP8266 -**English** | [Русский](https://github.com/Anonym-tsk/smart-domofon/blob/master/README.md) +**English** | [Русский](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/README.md) This device can send "door open" command to intercom main unit after receiving of incoming call. It only works with coordinate line intercoms. Tested with Cyfral russian intercom. @@ -33,14 +33,14 @@ Instead of NodeMCU, you can buy almost any ESP with enough count of GPIO (for ex 9. [microUSB кабель](https://roboshop.spb.ru/BS-410) ## Scheme -![Scheme](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/scheme.jpeg) +![Scheme](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/native/scheme.jpeg) *Thanks to Oleg Yu* ### This is old deprecated version. Please use new [ESPHome version](https://github.com/Anonym-tsk/smart-domofon/blob/master/esphome/README_EN.md) ## Configuration and build -1. Fill in WiFi and MQTT credentials in [software.h](https://github.com/Anonym-tsk/smart-domofon/blob/master/src/config/software.h) -2. Fill in `upload_port` in [platformio.ini](https://github.com/Anonym-tsk/smart-domofon/blob/master/platformio.ini) +1. Fill in WiFi and MQTT credentials in [software.h](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/src/config/software.h) +2. Fill in `upload_port` in [platformio.ini](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/platformio.ini) 3. Use [PlatformIO](https://platformio.org/platformio-ide) to build and upload firmware ## Status MQTT messages (domofon/status) @@ -61,8 +61,8 @@ Instead of NodeMCU, you can buy almost any ESP with enough count of GPIO (for ex * 'F' - fail; sent in response to 'O' or 'N' command (this means that 'O' or 'N' command has been received but no incoming call detected) ## Home Assistant integration -![Home Assistant](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/homeassistant/ha.png) +![Home Assistant](https://raw.githubusercontent.com/Anonym-tsk/smart-domofon/master/native/homeassistant/ha.png) -[Full configuration with sensor, switches and automations](https://github.com/Anonym-tsk/smart-domofon/blob/master/homeassistant/domofon.yaml) +[Full configuration with sensor, switches and automations](https://github.com/Anonym-tsk/smart-domofon/blob/master/native/homeassistant/domofon.yaml) Put this file into `/config/packages/domofon.yaml` and correct notification service in automations. diff --git a/data/index.html b/native/data/index.html similarity index 100% rename from data/index.html rename to native/data/index.html diff --git a/data/script.js b/native/data/script.js similarity index 100% rename from data/script.js rename to native/data/script.js diff --git a/data/style.css b/native/data/style.css similarity index 100% rename from data/style.css rename to native/data/style.css diff --git a/homeassistant/domofon.yaml b/native/homeassistant/domofon.yaml similarity index 100% rename from homeassistant/domofon.yaml rename to native/homeassistant/domofon.yaml diff --git a/homeassistant/ha.png b/native/homeassistant/ha.png similarity index 100% rename from homeassistant/ha.png rename to native/homeassistant/ha.png diff --git a/platformio.ini b/native/platformio.ini similarity index 100% rename from platformio.ini rename to native/platformio.ini diff --git a/scheme.jpeg b/native/scheme.jpeg similarity index 100% rename from scheme.jpeg rename to native/scheme.jpeg diff --git a/src/config/hardware.h b/native/src/config/hardware.h similarity index 100% rename from src/config/hardware.h rename to native/src/config/hardware.h diff --git a/src/config/mqtt.h b/native/src/config/mqtt.h similarity index 100% rename from src/config/mqtt.h rename to native/src/config/mqtt.h diff --git a/src/config/software.h b/native/src/config/software.h similarity index 100% rename from src/config/software.h rename to native/src/config/software.h diff --git a/src/debug.ino b/native/src/debug.ino similarity index 100% rename from src/debug.ino rename to native/src/debug.ino diff --git a/src/domofon.ino b/native/src/domofon.ino similarity index 100% rename from src/domofon.ino rename to native/src/domofon.ino diff --git a/src/hardware.ino b/native/src/hardware.ino similarity index 100% rename from src/hardware.ino rename to native/src/hardware.ino diff --git a/src/inc/include.h b/native/src/inc/include.h similarity index 100% rename from src/inc/include.h rename to native/src/inc/include.h diff --git a/src/inc/types.h b/native/src/inc/types.h similarity index 100% rename from src/inc/types.h rename to native/src/inc/types.h diff --git a/src/led.ino b/native/src/led.ino similarity index 100% rename from src/led.ino rename to native/src/led.ino diff --git a/src/main.ino b/native/src/main.ino similarity index 100% rename from src/main.ino rename to native/src/main.ino diff --git a/src/mqtt.ino b/native/src/mqtt.ino similarity index 100% rename from src/mqtt.ino rename to native/src/mqtt.ino diff --git a/src/ota.ino b/native/src/ota.ino similarity index 100% rename from src/ota.ino rename to native/src/ota.ino diff --git a/src/server.ino b/native/src/server.ino similarity index 100% rename from src/server.ino rename to native/src/server.ino diff --git a/src/wifi.ino b/native/src/wifi.ino similarity index 100% rename from src/wifi.ino rename to native/src/wifi.ino