From 5a598870f1e450e5de5323d0c2239e780ce1f26c Mon Sep 17 00:00:00 2001 From: Lanket Date: Fri, 14 Dec 2018 23:25:49 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=92=D0=B5=D0=B4=D0=B5=D1=82=D1=81=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=B0=D0=BB=D0=B0=20htt?= =?UTF-8?q?ps://github.com/Aculeasis/mdmTerminal2=20=D0=9A=D0=B0=D0=BA=20?= =?UTF-8?q?=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=20=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B8=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=BD=D0=B5=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D0=BC=D0=B0.=20?= =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0=20=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D1=82=20Anaki=20http://majordomo.smartliving?= =?UTF-8?q?.ru/forum/memberlist.php=3Fmode=3Dviewprofile&u=3D46679=20gitHu?= =?UTF-8?q?b=202=D0=B9=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D1=82?= =?UTF-8?q?=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0=20https://gith?= =?UTF-8?q?ub.com/Aculeasis/mdmTerminal2=20gitHub=20=D1=81=D1=8B=D1=80?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20htt?= =?UTF-8?q?ps://github.com/lanket/mdmPiTerminalModule/tree/Ver2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fc4a66e..f8a1279 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ # mdmPiTerminalModule -Модуль системы управления (терминал) умным домом [majordomo](https://majordomo.smartliving.ru) для голосового ассистента / умной колонки из доступных элементов Orange Pi Zero [репозитарий самой умной колонки](https://github.com/devoff/mdmPiTerminal) +Модуль системы управления (терминал) умным домом [majordomo](https://majordomo.smartliving.ru) для голосового ассистента / умной колонки из доступных элементов Orange Pi Zero +Ведется разработка модуля для поддержки второй версии термиала https://github.com/Aculeasis/mdmTerminal2 +Как будет готов модуль для второй версии после обновления первая версия терминала будет несовместима. +Разработка терминала ведет Anaki http://majordomo.smartliving.ru/forum/memberlist.php?mode=viewprofile&u=46679 +gitHub 2й версии терминала https://github.com/Aculeasis/mdmTerminal2 +gitHub сырого модуля https://github.com/lanket/mdmPiTerminalModule/tree/Ver2 From 55b5361cccc44ff933d64ad7f13818f6387415e6 Mon Sep 17 00:00:00 2001 From: Aculeasis <42580940+Aculeasis@users.noreply.github.com> Date: Thu, 2 May 2019 05:09:18 +0000 Subject: [PATCH 2/7] Update for new database format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Теперь вместо MAJORDROID_API используется CANTTS. Поставил оба для совместимости. --- modules/mdmPiTerminal/mpt_edit.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mdmPiTerminal/mpt_edit.inc.php b/modules/mdmPiTerminal/mpt_edit.inc.php index 18739ca..fbca6b5 100644 --- a/modules/mdmPiTerminal/mpt_edit.inc.php +++ b/modules/mdmPiTerminal/mpt_edit.inc.php @@ -180,7 +180,7 @@ $out['ERR']=1; } } - $tmp=SQLSelect("SELECT ID, TITLE, NAME, HOST, if(IS_ONLINE = 1, 'Online', 'Offline') as ONLINE FROM terminals WHERE MAJORDROID_API = 1 ORDER BY TITLE"); + $tmp=SQLSelect("SELECT ID, TITLE, NAME, HOST, if(IS_ONLINE = 1, 'Online', 'Offline') as ONLINE FROM terminals WHERE CANTTS = 1 OR MAJORDROID_API = 1 ORDER BY TITLE"); $terminals_total=count($tmp); for($terminals_i=0;$terminals_i<$terminals_total;$terminals_i++) { $terminal_id_opt[$tmp[$terminals_i]['ID']]=$tmp[$terminals_i]['NAME']; From 38534fb9bc6b5692b0283c1f321bc99f718dea35 Mon Sep 17 00:00:00 2001 From: Aculeasis <42580940+Aculeasis@users.noreply.github.com> Date: Thu, 2 May 2019 22:55:05 +0000 Subject: [PATCH 3/7] Show only support majorordroid API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Да, наверное так правильнее --- modules/mdmPiTerminal/mpt_edit.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mdmPiTerminal/mpt_edit.inc.php b/modules/mdmPiTerminal/mpt_edit.inc.php index fbca6b5..7b960ed 100644 --- a/modules/mdmPiTerminal/mpt_edit.inc.php +++ b/modules/mdmPiTerminal/mpt_edit.inc.php @@ -180,7 +180,7 @@ $out['ERR']=1; } } - $tmp=SQLSelect("SELECT ID, TITLE, NAME, HOST, if(IS_ONLINE = 1, 'Online', 'Offline') as ONLINE FROM terminals WHERE CANTTS = 1 OR MAJORDROID_API = 1 ORDER BY TITLE"); + $tmp=SQLSelect("SELECT ID, TITLE, NAME, HOST, if(IS_ONLINE = 1, 'Online', 'Offline') as ONLINE FROM terminals WHERE TTS_TYPE = majordroid OR MAJORDROID_API = 1 ORDER BY TITLE"); $terminals_total=count($tmp); for($terminals_i=0;$terminals_i<$terminals_total;$terminals_i++) { $terminal_id_opt[$tmp[$terminals_i]['ID']]=$tmp[$terminals_i]['NAME']; From 7c6a734278acc3c2f546fcf1bd65e8d631aeacd7 Mon Sep 17 00:00:00 2001 From: lanket Date: Fri, 3 May 2019 23:26:42 +0300 Subject: [PATCH 4/7] Update mpt_edit.inc.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлены пропущенные кавычки в SQL --- modules/mdmPiTerminal/mpt_edit.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mdmPiTerminal/mpt_edit.inc.php b/modules/mdmPiTerminal/mpt_edit.inc.php index 7b960ed..33b10ea 100644 --- a/modules/mdmPiTerminal/mpt_edit.inc.php +++ b/modules/mdmPiTerminal/mpt_edit.inc.php @@ -180,7 +180,7 @@ $out['ERR']=1; } } - $tmp=SQLSelect("SELECT ID, TITLE, NAME, HOST, if(IS_ONLINE = 1, 'Online', 'Offline') as ONLINE FROM terminals WHERE TTS_TYPE = majordroid OR MAJORDROID_API = 1 ORDER BY TITLE"); + $tmp=SQLSelect("SELECT ID, TITLE, NAME, HOST, if(IS_ONLINE = 1, 'Online', 'Offline') as ONLINE FROM terminals WHERE TTS_TYPE = 'majordroid' OR MAJORDROID_API = 1 ORDER BY TITLE"); $terminals_total=count($tmp); for($terminals_i=0;$terminals_i<$terminals_total;$terminals_i++) { $terminal_id_opt[$tmp[$terminals_i]['ID']]=$tmp[$terminals_i]['NAME']; From f1318100d06e241309bcf93e34d4bd26dcf5c102 Mon Sep 17 00:00:00 2001 From: DMITRIY SANNIKOV Date: Thu, 29 Aug 2019 00:46:55 +0500 Subject: [PATCH 5/7] Update mdmPiTerminal.class.php add settings --- modules/mdmPiTerminal/mdmPiTerminal.class.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/mdmPiTerminal/mdmPiTerminal.class.php b/modules/mdmPiTerminal/mdmPiTerminal.class.php index 54131e0..dc6c7c8 100644 --- a/modules/mdmPiTerminal/mdmPiTerminal.class.php +++ b/modules/mdmPiTerminal/mdmPiTerminal.class.php @@ -324,6 +324,12 @@ function dbInstall($data) { mpt: SETTINGS_CHROME_MODE TINYINT NOT NULL DEFAULT 2 mpt: SETTINGS_CHROME_CHOKE BOOLEAN NOT NULL DEFAULT 0 mpt: SETTINGS_CHROME_ALARMSTT BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_LAZY_RECORD BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_ALARM_RECOGNIZED BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_BLOCKING_LISTENER BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_NO_BACKGROUND_PLAY BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_OPTIMISTIC_NONBLOCK_TTS BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_AUDIO_GAIN TINYINT NOT NULL DEFAULT 1 mpt: SNOWBOY_TOKEN varchar(100) NOT NULL DEFAULT 'd4977cf8ff6ede6efb8d2277c1608c7dbebf18a7' mpt: SETTINGS_SENSITIVITY varchar(3) NOT NULL DEFAULT '0.7' mpt: SETTINGS_PROVIDERTTS varchar(20) NOT NULL DEFAULT 'google' @@ -340,6 +346,7 @@ function dbInstall($data) { mpt: YANDEX_APIKEYSTT varchar(100) NOT NULL DEFAULT '' mpt: YANDEX_EMOTION varchar(15) NOT NULL DEFAULT 'good' mpt: YANDEX_SPEAKER varchar(15) NOT NULL DEFAULT 'alyss' + mpt: YANDEX_GRPC BOOLEAN NOT NULL DEFAULT 0 mpt: AWS_SPEAKER varchar(15) NOT NULL DEFAULT 'Tatyana' mpt: AWS_ACCESS_KEY_ID varchar(100) NOT NULL DEFAULT '' mpt: AWS_SECRET_ACCESS_KEY varchar(100) NOT NULL DEFAULT '' @@ -387,6 +394,12 @@ function validate($param) mpt: SETTINGS_CHROME_MODE TINYINT NOT NULL DEFAULT 2 mpt: SETTINGS_CHROME_CHOKE BOOLEAN NOT NULL DEFAULT 0 mpt: SETTINGS_CHROME_ALARMSTT BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_LAZY_RECORD BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_ALARM_RECOGNIZED BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_BLOCKING_LISTENER BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_NO_BACKGROUND_PLAY BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_OPTIMISTIC_NONBLOCK_TTS BOOLEAN NOT NULL DEFAULT 0 + mpt: SETTINGS_AUDIO_GAIN TINYINT NOT NULL DEFAULT 15 mpt: SNOWBOY_TOKEN varchar(100) NOT NULL DEFAULT 'd4977cf8ff6ede6efb8d2277c1608c7dbebf18a7' mpt: SETTINGS_SENSITIVITY varchar(3) NOT NULL DEFAULT '0.7' mpt: SETTINGS_PROVIDERTTS varchar(20) NOT NULL DEFAULT 'google' @@ -403,6 +416,7 @@ function validate($param) mpt: YANDEX_APIKEYSTT varchar(100) NOT NULL DEFAULT '' mpt: YANDEX_EMOTION varchar(15) NOT NULL DEFAULT 'good' mpt: YANDEX_SPEAKER varchar(15) NOT NULL DEFAULT 'alyss' + mpt: YANDEX_GRPC BOOLEAN NOT NULL DEFAULT 0 mpt: AWS_SPEAKER varchar(15) NOT NULL DEFAULT 'Tatyana' mpt: AWS_ACCESS_KEY_ID varchar(100) NOT NULL DEFAULT '' mpt: AWS_SECRET_ACCESS_KEY varchar(100) NOT NULL DEFAULT '' From 3b57c9fcd2a08373c222ab2205b2fb98111a739d Mon Sep 17 00:00:00 2001 From: DMITRIY SANNIKOV Date: Thu, 29 Aug 2019 00:47:30 +0500 Subject: [PATCH 6/7] Update mpt_edit.inc.php --- modules/mdmPiTerminal/mpt_edit.inc.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/mdmPiTerminal/mpt_edit.inc.php b/modules/mdmPiTerminal/mpt_edit.inc.php index 33b10ea..a4d40a1 100644 --- a/modules/mdmPiTerminal/mpt_edit.inc.php +++ b/modules/mdmPiTerminal/mpt_edit.inc.php @@ -117,6 +117,32 @@ //updating 'settings_chrome_alarmstt' (BOOLEAN) $rec['SETTINGS_CHROME_ALARMSTT']= $this->validate('settings_chrome_alarmstt'); //updating 'majordomo_object_name' (varchar) + + + $rec['SETTINGS_LAZY_RECORD']= $this->validate('settings_lazy_record'); + //updating 'majordomo_object_name' (varchar) + $rec['SETTINGS_ALARM_RECOGNIZED']= $this->validate('settings_alarm_recognized'); + //updating 'majordomo_object_name' (varchar) + $rec['SETTINGS_BLOCKING_LISTENER']= $this->validate('settings_blocking_listener'); + //updating 'majordomo_object_name' (varchar) + $rec['SETTINGS_NO_BACKGROUND_PLAY']= $this->validate('settings_no_background_play'); + //updating 'majordomo_object_name' (varchar) + $rec['SETTINGS_OPTIMISTIC_NONBLOCK_TTS']= $this->validate('settings_optimistic_nonblock_tts'); + //updating 'majordomo_object_name' (varchar) + $rec['SETTINGS_AUDIO_GAIN']= $this->validate('settings_audio_gain'); + //updating 'majordomo_object_name' (varchar) + $rec['YANDEX_GRPC']= $this->validate('yandex_grpc'); + //updating 'majordomo_object_name' (varchar) + + + + + + + + + + $rec['MAJORDOMO_OBJECT_NAME']= $this->validate('majordomo_object_name'); //updating 'majordomo_object_method' (varchar) $rec['MAJORDOMO_OBJECT_METHOD']= $this->validate('majordomo_object_method'); From 390a5aef8a55f2cfaa38638c637c13fb0c95feea Mon Sep 17 00:00:00 2001 From: DMITRIY SANNIKOV Date: Thu, 29 Aug 2019 00:48:30 +0500 Subject: [PATCH 7/7] Update mpt_edit.html add new settings --- templates/mdmPiTerminal/mpt_edit.html | 110 +++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 10 deletions(-) diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 6a8b9a5..bb2bb6b 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -71,7 +71,7 @@
@@ -81,7 +81,7 @@
@@ -91,17 +91,31 @@
+ + + +
+ +
+ +
+
+ + +
@@ -109,7 +123,7 @@
@@ -119,7 +133,7 @@
@@ -129,7 +143,7 @@
@@ -137,7 +151,7 @@
@@ -173,13 +187,71 @@
+ + + + +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + + + + +
+ +
+
+ + +

Обратная связь с MajorDomo

@@ -478,6 +550,19 @@

Яндекс

+ + + +
+ +
+ +
+
+ +

Amazon AWS

Для доступа нужен аккаунт AWS, первые 5 миллионов символов в месяц первые 12 месяцев бесплатно.

@@ -531,6 +616,11 @@

Amazon AWS

+ + + + +

RHVoice TTS запущенный в виде веб-сервиса.

Голос лучше чем у гугла.
Один из самый быстрых в плане отклика.
Отклик на апельсинке с отключенным кэшем примерно 100 мс
На i7 в виртуалке ~ 20 мс.
GitHub