From 5bbb1d873d965e5c280bb2a50526e79e22381a0f Mon Sep 17 00:00:00 2001 From: Lanket Date: Sun, 25 Nov 2018 01:00:21 +0300 Subject: [PATCH 01/42] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=BB=D0=BE=D0=B2=D0=B8=D0=BD=D1=83=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D0=BE=D0=B5=D0=BA=20=D1=82=D0=B5=D1=80?= =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0.=20=D0=9E=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=B2=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=86=D0=B5=D1=81=D1=81=D0=B5...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mdmPiTerminal/mdmPiTerminal.class.php | 22 ++- templates/mdmPiTerminal/mpt_edit.html | 179 +++++++++++++++++- 2 files changed, 195 insertions(+), 6 deletions(-) diff --git a/modules/mdmPiTerminal/mdmPiTerminal.class.php b/modules/mdmPiTerminal/mdmPiTerminal.class.php index cdf04f2..c98cf12 100644 --- a/modules/mdmPiTerminal/mdmPiTerminal.class.php +++ b/modules/mdmPiTerminal/mdmPiTerminal.class.php @@ -1,8 +1,8 @@ +* @author Wizard * @copyright http://majordomo.smartliving.ru/ (c) * @version 0.1 (wizard, 23:05:08 [May 07, 2018]) */ @@ -279,6 +279,22 @@ function dbInstall($data) { mpt: ALARMKWACTIVATED BOOLEAN NOT NULL DEFAULT TRUE mpt: ALARMTTS BOOLEAN NOT NULL DEFAULT TRUE mpt: ALARMSTT BOOLEAN NOT NULL DEFAULT TRUE + mpt: VERSION int(1) NOT NULL DEFAULT 2 + mpt: MIC_INDEX TINYINT NOT NULL DEFAULT -1 + mpt: OPTIMISTIC_NONBLOCK_TTS BOOLEAN NOT NULL DEFAULT TRUE + mpt: ASK_ME_AGAIN TINYINT NOT NULL DEFAULT 0 + mpt: QUIET BOOLEAN NOT NULL DEFAULT FALSE + mpt: NO_HELLO BOOLEAN NOT NULL DEFAULT FALSE + mpt: BLOCKING_LISTENER BOOLEAN NOT NULL DEFAULT TRUE + mpt: ENERGY_THRESHOLD TINYINT NOT NULL DEFAULT 0 + mpt: PHRASE_TIME_LIMIT TINYINT NOT NULL DEFAULT 15 + mpt: CHROME_MODE BOOLEAN NOT NULL DEFAULT TRUE + mpt: CHROME_CHOKE BOOLEAN NOT NULL DEFAULT FALSE + mpt: CHROME_ALARMSTT BOOLEAN NOT NULL DEFAULT FALSE + mpt: LANG varchar(10) NOT NULL DEFAULT 'ru' + mpt: LANG_CHECK BOOLEAN NOT NULL DEFAULT FALSE + mpt: CLEAR_MODELS BOOLEAN NOT NULL DEFAULT FALSE + mpt: TOKEN varchar(100) NOT NULL DEFAULT 'd4977cf8ff6ede6efb8d2277c1608c7dbebf18a7' EOD; parent::dbInstall($data); } @@ -288,4 +304,4 @@ function dbInstall($data) { * * TW9kdWxlIGNyZWF0ZWQgTWF5IDA3LCAyMDE4IHVzaW5nIFNlcmdlIEouIHdpemFyZCAoQWN0aXZlVW5pdCBJbmMgd3d3LmFjdGl2ZXVuaXQuY29tKQ== * -*/ +*/ \ No newline at end of file diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 8206042..80a8c4f 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -95,6 +95,18 @@
--> + +
+ +
+ +
+
- +
- +
- +
+
+ Ниже настройки предназначенные только для второй версии терминала. +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+
+ + +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+
+ + + + --> + + --> +
@@ -235,14 +235,14 @@
- + - + - +
@@ -284,7 +284,7 @@
@@ -294,7 +294,7 @@
@@ -304,14 +304,14 @@
- + - + - +
@@ -372,17 +372,17 @@
-->
-
+
+ + + + [#if ID!=""#] [#else ID#] [#endif ID#] <#LANG_CANCEL#> - - - -
@@ -399,26 +399,23 @@

Запись первого образца ключевого слова

-

Запись второго образца ключевого слова

-

Запись третьего образца ключевого слова

-

Последний этап тренировки ключевого слова надо сгенерить служебный файл из записанных образцов по которому и будет работать распознавание ключевого слова.

-
-

Применить настройки на терминале

+
+

Удалить модель

+ +
+

Применить настройки на терминале

From ccdfa993eb7bbf96da909b64c0b46061e4f5a25c Mon Sep 17 00:00:00 2001 From: Lanket Date: Sun, 2 Dec 2018 01:56:54 +0300 Subject: [PATCH 03/42] =?UTF-8?q?=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=D1=81=D1=8F=20=D0=B4=D0=BE=20=D0=BE=D0=B1=D1=8A?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/mdmPiTerminal/mpt_edit.html | 140 +++++++++++++++++++------- 1 file changed, 103 insertions(+), 37 deletions(-) diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 0e47e3b..3640f1c 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -28,11 +28,20 @@
+
@@ -95,10 +104,10 @@
--> - +
+
-
--> +
+
+ --> + + --> - - -
- -
- - + --> + + + --> -
-
- +
+ --> - [#if ID!=""#] - - [#else ID#] - + + [#endif ID#] - <#LANG_CANCEL#> -
+ +
+
+ [#if ID!=""#] + + [#else ID#] + + [#endif ID#] + <#LANG_CANCEL#> +
+ + + +
+
+ [#if OK#] +
<#LANG_DATA_SAVED#>
+ [#endif OK#] + [#if ERR#] +
<#LANG_FILLOUT_REQURED#>
+ [#endif ERR#] +
+ [#if ID=""#] + <#LANG_NEW_RECORD#> + [#endif ID#] +
+ +
+ +
+
+ + + + [#if ID!=""#] + + + [#endif ID#]
+
+
+ [#if ID!=""#] + + [#else ID#] + + [#endif ID#] + <#LANG_CANCEL#> +
+
+ +
+ +

Обновить терминал

+ +
+ +

Откатить термина до предыдущего успешного обновления

+ +
+ + + + +
+

Здесь можно записать до шести ключевых слов по 3 образца каждого ключевого слова. Для избегания ложных срабатываний лучше записать словосочетание из двух слов и более. Для лучшего качества срабатывания лучше записывать с тем микрофоном, который будет использоваться для распознавания. Говорить надо в микрофон на терминале.

1е слово @@ -414,9 +479,10 @@

Удалить модель

-
+
From 303ab0be8e7ca60c73aa0045b15e0ce694d710d3 Mon Sep 17 00:00:00 2001 From: Lanket Date: Sun, 2 Dec 2018 02:07:44 +0300 Subject: [PATCH 04/42] =?UTF-8?q?=D0=9E=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B8=D0=BB=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B,=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B1=D0=B0=D0=B3?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/mdmPiTerminal/mpt_edit.html | 78 +++++++++------------------ 1 file changed, 26 insertions(+), 52 deletions(-) diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 3640f1c..b021494 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -41,10 +41,7 @@
- -
- - +
[#if OK#]
<#LANG_DATA_SAVED#>
@@ -56,6 +53,11 @@ [#if ID=""#] <#LANG_NEW_RECORD#> [#endif ID#] + + + +
+ - - - [#if ID!=""#] - - - [#endif ID#] - -
-
- [#if ID!=""#] - - [#else ID#] - - [#endif ID#] - <#LANG_CANCEL#> -
-
-
-
- [#if OK#] -
<#LANG_DATA_SAVED#>
- [#endif OK#] - [#if ERR#] -
<#LANG_FILLOUT_REQURED#>
- [#endif ERR#] -
- [#if ID=""#] - <#LANG_NEW_RECORD#> - [#endif ID#] -
- - - [#if ID!=""#] - - - [#endif ID#] -
-
-
- [#if ID!=""#] - - [#else ID#] - - [#endif ID#] - <#LANG_CANCEL#> -
-
-
@@ -484,6 +438,26 @@ -->
+ + + + [#if ID!=""#] + + + [#endif ID#] + +
+
+ [#if ID!=""#] + + [#else ID#] + + [#endif ID#] + <#LANG_CANCEL#> +
+
+ +
+ +
+
+

+ +

+

+ +

+

+ +

+

+ + + +

+ +
+ +
-
- -

- -

-

- -

-

- -

-

- - - -

+ function doConnectDisconnect() { + (document.remote_log_form.connectButton.value == "Connect") ? doConnect() : doDisconnect() + } + From 09d741a9f05c8af19fb56c4e553e64936e902167 Mon Sep 17 00:00:00 2001 From: Aculeasis <42580940+Aculeasis@users.noreply.github.com> Date: Fri, 4 Jan 2019 16:27:55 +0000 Subject: [PATCH 33/42] Change websocket port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Теперь веб-сокет работает через 7999 порт. --- templates/mdmPiTerminal/mpt_edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 63954e8..9f6609f 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -711,7 +711,7 @@

RHVoice

function doConnect() { - websocket = new WebSocket("ws://" + document.remote_log_form.terminal_ip.value + ":8999/"); + websocket = new WebSocket("ws://" + document.remote_log_form.terminal_ip.value + ":7999/"); websocket.onopen = function(evt) { onOpen(evt) }; websocket.onclose = function(evt) { onClose(evt) }; websocket.onmessage = function(evt) { onMessage(evt) }; From 6514da886347f3f3c943dabb54bbb53457aee3c5 Mon Sep 17 00:00:00 2001 From: Lanket Date: Sat, 5 Jan 2019 04:19:51 +0300 Subject: [PATCH 34/42] =?UTF-8?q?=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mdmPiTerminal/mpt_edit.inc.php | 29 +++++ templates/mdmPiTerminal/mpt_edit.html | 153 +++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/modules/mdmPiTerminal/mpt_edit.inc.php b/modules/mdmPiTerminal/mpt_edit.inc.php index f6967af..6e43215 100644 --- a/modules/mdmPiTerminal/mpt_edit.inc.php +++ b/modules/mdmPiTerminal/mpt_edit.inc.php @@ -43,6 +43,8 @@ $rec['SETTINGS_PROVIDERTTS']= $this->validate('settings_providertts'); //updating 'cache_tts_priority' (varchar) $rec['CACHE_TTS_PRIORITY']= $this->validate('cache_tts_priority'); + //updating 'cache_tts_size' (varchar) + $rec['CACHE_TTS_SIZE']= $this->validate('cache_tts_size'); //updating 'settings_providerstt' (varchar) $rec['SETTINGS_PROVIDERSTT']= $this->validate('settings_providerstt'); //updating 'yandex_apikeytts' (varchar) @@ -78,6 +80,19 @@ //updating 'pocketsphinx0rest_server' (varchar) $rec['POCKETSPHINX0REST_SERVER']= $this->validate('pocketsphinx0rest_server'); } + else if($_POST['panel_admin']) + { + //updating 'update_interval' (varchar) + $rec['UPDATE_INTERVAL']= $this->validate('update_interval'); + //updating 'update_turnoff' (varchar) + $rec['UPDATE_TURNOFF']= $this->validate('update_turnoff'); + //updating 'update_fallback' (varchar) + $rec['UPDATE_FALLBACK']= $this->validate('update_fallback'); + //updating 'update_pip' (varchar) + $rec['UPDATE_PIP']= $this->validate('update_pip'); + //updating 'update_apt' (varchar) + $rec['UPDATE_APT']= $this->validate('update_apt'); + } else { if($this->debug == 1) debmes("mpt edit not panel_voice" ); @@ -113,6 +128,20 @@ $rec['PROXY_MONKEY_PATCHING']= $this->validate('proxy_monkey_patching'); //updating 'proxy_proxy' (varchar) $rec['PROXY_PROXY']= $this->validate('proxy_proxy'); + //updating 'mpd_control' (varchar) + $rec['MPD_CONTROL']= $this->validate('mpd_control'); + //updating 'mpd_ip' (varchar) + $rec['MPD_IP']= $this->validate('mpd_ip'); + //updating 'mpd_port' (varchar) + $rec['MPD_PORT']= $this->validate('mpd_port'); + //updating 'mpd_pause' (varchar) + $rec['MPD_PAUSE']= $this->validate('mpd_pause'); + //updating 'mpd_smoothly' (varchar) + $rec['MPD_SMOOTHLY']= $this->validate('mpd_smoothly'); + //updating 'mpd_quieter' (varchar) + $rec['MPD_QUIETER']= $this->validate('mpd_quieter'); + //updating 'mpd_wait_resume' (varchar) + $rec['MPD_WAIT_RESUME']= $this->validate('mpd_wait_resume'); } if($this->debug == 1) debmes('mpt edit befour ok'); diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 9f6609f..57c1127 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -237,6 +237,58 @@

Proxy

+
+

MPD

+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ @@ -351,6 +403,16 @@

Сервисы речи

+ + +
+ +
+
+ +
@@ -771,7 +833,98 @@

RHVoice

(document.remote_log_form.connectButton.value == "Connect") ? doConnect() : doDisconnect() } + + + [#if OK#] +
<#LANG_DATA_SAVED#>
+ [#endif OK#] + [#if ERR#] +
<#LANG_FILLOUT_REQURED#>
+ [#endif ERR#] +
+ [#if ID=""#] + <#LANG_NEW_RECORD#> + [#endif ID#] + +
+

Настройки обновления

+

Терминал может самостоятельно обновляться с помощью стандартных механизмов гит. +Для этого он должен быть установлен через git clone, а директория терминала должна +оставаться валидным и доступным для git pull локальным репозиторием, pull не сработает +если вы изменяли файлы терминала. Проверить доступность можно с помощью git status. + +Обновление засчитывается если хоть один .py файл в src/ изменился, +или в Requirements/ появились новые пакеты. +Время последней проверки обновления и хеш коммита от предыдущего обновления хранятся +в update.json +

+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + + + + + + [#if ID!=""#] + + [#endif ID#] +
+
+
+ [#if ID!=""#] + + [#else ID#] + + [#endif ID#] + <#LANG_CANCEL#> +
+
+ + + +
From ab75e07b2e479d53eae537193f3fe67efd47f1c7 Mon Sep 17 00:00:00 2001 From: Lanket Date: Sun, 6 Jan 2019 03:23:11 +0300 Subject: [PATCH 35/42] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=D0=B8=20=D1=81=20?= =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=20boolian,=20=D0=B8=20=D1=81=D0=BE=D1=85=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B0=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D1=85=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=B8=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mdmPiTerminal/mdmPiTerminal.class.php | 70 +++++++++---------- modules/mdmPiTerminal/mpt_edit.inc.php | 16 +++-- templates/mdmPiTerminal/action_admin.html | 2 +- templates/mdmPiTerminal/mpt_edit.html | 44 ++++++------ 4 files changed, 70 insertions(+), 62 deletions(-) diff --git a/modules/mdmPiTerminal/mdmPiTerminal.class.php b/modules/mdmPiTerminal/mdmPiTerminal.class.php index b5c7441..fb6704e 100644 --- a/modules/mdmPiTerminal/mdmPiTerminal.class.php +++ b/modules/mdmPiTerminal/mdmPiTerminal.class.php @@ -17,7 +17,7 @@ class mdmPiTerminal extends module { * @access private */ function mdmPiTerminal() { - $this->debug = 0; + $this->debug = 1; $this->name="mdmPiTerminal"; $this->title="MDM VoiceAssistant"; $this->module_category="<#LANG_SECTION_DEVICES#>"; @@ -314,26 +314,26 @@ function dbInstall($data) { $data = <<debug == 1) debmes(">mpt edit validate int : $param = $oldvalue > $value ! isset = $setParam xxx " . isset($value)); // if(isset($value)) diff --git a/modules/mdmPiTerminal/mpt_edit.inc.php b/modules/mdmPiTerminal/mpt_edit.inc.php index 6e43215..18739ca 100644 --- a/modules/mdmPiTerminal/mpt_edit.inc.php +++ b/modules/mdmPiTerminal/mpt_edit.inc.php @@ -9,7 +9,7 @@ $rec=SQLSelectOne("SELECT * FROM $table_name WHERE ID='$id'"); if($rec['ID_TERMINAL']) { - $tmp = SQLSelectOne('SELECT HOST FROM terminals where ID = ' . $rec['ID_TERMINAL']); + $tmp = SQLSelectOne('SELECT HOST , NAME FROM terminals where ID = ' . $rec['ID_TERMINAL']); $out['IP_TERMINAL'] = $tmp['HOST']; } @@ -22,7 +22,7 @@ if($rec['ID']) $qry = " and ID <> " . $rec['ID']; $findduble=SQLSelectOne("SELECT * FROM $table_name WHERE ID_TERMINAL='$id_terminal' $qry"); // chech not empy terminal and mast no dubles - if(($rec['ID_TERMINAL'] == '' or $findduble['ID']) and !$_POST['panel_voice']) + if(($rec['ID_TERMINAL'] == '' or $findduble['ID']) and !$_POST['panel_voice'] and !$_POST['panel_admin']) { $out['ERR_ID_TERMINAL']=1; $ok=0; @@ -147,13 +147,21 @@ if($this->debug == 1) debmes('mpt edit befour ok'); if ($ok) { if($this->debug == 1) debmes('mpt edit after ok'); + $nmTerm = $tmp['NAME']; if ($rec['ID']) { + if($this->debug == 1) debmes("mpt edit update : $nmTerm ! ip: " . $tmp['HOST']); + if ($this->config['CREATE_CLASS'] == 1) + { + if($this->debug == 1) debmes("mpt edit update CreateClass=True : $nmTerm ! ip: " . $tmp['HOST']); + $rec['MAJORDOMO_OBJECT_METHOD'] = 'TerminalDataProcessing'; + $rec['MAJORDOMO_OBJECT_NAME'] = $nmTerm; + $postdata['MAJORDOMO_OBJECT_METHOD'] = 'TerminalDataProcessing'; + $postdata['MAJORDOMO_OBJECT_NAME'] = $nmTerm; + } SQLUpdate($table_name, $rec); // update sql - if($this->debug == 1) debmes('mpt: ' . $tmp['HOST']); } else { if($this->debug == 1) debmes('mpt edit no recid insert'); $new_rec=1; - $nmTerm = $tmp['NAME']; if($this->debug == 1) debmes('mpt edit add object: ' . $nmTerm); if ($this->config['CREATE_CLASS'] == 1) { diff --git a/templates/mdmPiTerminal/action_admin.html b/templates/mdmPiTerminal/action_admin.html index 2a964c0..2edd577 100644 --- a/templates/mdmPiTerminal/action_admin.html +++ b/templates/mdmPiTerminal/action_admin.html @@ -12,7 +12,7 @@ Создавать класс 'Terminals', объекты и методы автоматически
- +
diff --git a/templates/mdmPiTerminal/mpt_edit.html b/templates/mdmPiTerminal/mpt_edit.html index 57c1127..6a8b9a5 100644 --- a/templates/mdmPiTerminal/mpt_edit.html +++ b/templates/mdmPiTerminal/mpt_edit.html @@ -74,7 +74,7 @@ Сигнал о распознавании ключевого слова:
- +
@@ -84,7 +84,7 @@ Сигнал перед сообщением:
- +
@@ -94,7 +94,7 @@ Сигнал перед началом распознавания речи:
- +
@@ -112,7 +112,7 @@ Тихий запуск
- +
@@ -122,7 +122,7 @@ Старт без приветствия
- +
@@ -143,9 +143,9 @@ @@ -166,7 +166,7 @@ Глушить музыку
- +
@@ -176,7 +176,7 @@ Сигнал перед распознованием
- +
@@ -188,16 +188,16 @@

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

-
+
-
+
- [#if CREATE_CLASS<>"true"#] + [#if CREATE_CLASS<>"1"#] [#module name="linkedobject" object_field="majordomo_object_name" method_field="majordomo_object_method"#] [#endif#] @@ -217,7 +217,7 @@

Proxy

Использовать прокси
- +
@@ -226,7 +226,7 @@

Proxy

proxy_monkey_patching
- +
@@ -244,7 +244,7 @@

MPD

- +
@@ -265,14 +265,14 @@

MPD

- +
- +
@@ -528,7 +528,7 @@

Amazon AWS

Использовать AWS SDK (boto3) для коммуникации вместо нативной реализации
- +
@@ -834,7 +834,7 @@

RHVoice

} -
+ [#if OK#]
<#LANG_DATA_SAVED#>
[#endif OK#] @@ -883,21 +883,21 @@

Настройки обновления

- +
- +
- +
From 4a8e06fcf02d322358837292f33bf9b4859084bf Mon Sep 17 00:00:00 2001 From: Lanket Date: Sun, 6 Jan 2019 04:22:04 +0300 Subject: [PATCH 36/42] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20=D0=B2=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=B6=D0=BE=D1=80=20sendToMpt($command,=20$data,?= =?UTF-8?q?=20$target)=20$command=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D1=83?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B1=D1=8B=D1=82=D1=8C=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BD=D0=BE=20api=20=D0=BC?= =?UTF-8?q?=D0=B0=D0=B6=D0=BE=D1=80=D0=B0=20tts=20...=20=D0=B8=D0=BB=D0=B8?= =?UTF-8?q?=20api=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20settings=20...=20=D0=BF=D0=BE=D0=B4=D1=80=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=B5=D0=B5=20=D0=BE=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0=D1=85=20=D0=B2=20=D0=B2=D0=B8=D0=BA=D0=B8=20=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0=20https://github.com?= =?UTF-8?q?/Aculeasis/mdmTerminal2/wiki=20$data=20=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BC=D0=BE=D0=B3=D1=83=D1=82=20=D0=B1=D1=8B?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BA=D0=B0=D0=BA=20=D0=BC=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D0=B8=D0=B2=D0=BE=D0=BC=20=D1=82=D0=B0=D0=BA=20=D0=B8=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D1=8B=D0=BC=20json=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=20=D0=B8=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=BC=20$target=20=D1=81=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D0=BE=D0=B5=20=D0=B8=D0=BC=D1=8F?= =?UTF-8?q?=20=D1=82=D0=B5=D1=80=D0=BC=D0=B8=D0=BD=D0=B0=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=B8=D0=B1=D0=BE=20=D0=B5=D0=B3=D0=BE=20ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/module_mdmPiTerminal.lib.php | 16 ++++++++++++++++ modules/mdmPiTerminal/mdmPiTerminal.class.php | 2 +- modules/mdmPiTerminal/mpt_send.inc.php | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 lib/module_mdmPiTerminal.lib.php diff --git a/lib/module_mdmPiTerminal.lib.php b/lib/module_mdmPiTerminal.lib.php new file mode 100644 index 0000000..1be3a14 --- /dev/null +++ b/lib/module_mdmPiTerminal.lib.php @@ -0,0 +1,16 @@ +send_mpt($command, $data, $target); + return $res; +} +?> \ No newline at end of file diff --git a/modules/mdmPiTerminal/mdmPiTerminal.class.php b/modules/mdmPiTerminal/mdmPiTerminal.class.php index fb6704e..54131e0 100644 --- a/modules/mdmPiTerminal/mdmPiTerminal.class.php +++ b/modules/mdmPiTerminal/mdmPiTerminal.class.php @@ -17,7 +17,7 @@ class mdmPiTerminal extends module { * @access private */ function mdmPiTerminal() { - $this->debug = 1; + $this->debug = 0; $this->name="mdmPiTerminal"; $this->title="MDM VoiceAssistant"; $this->module_category="<#LANG_SECTION_DEVICES#>"; diff --git a/modules/mdmPiTerminal/mpt_send.inc.php b/modules/mdmPiTerminal/mpt_send.inc.php index df64709..7aaf9f9 100644 --- a/modules/mdmPiTerminal/mpt_send.inc.php +++ b/modules/mdmPiTerminal/mpt_send.inc.php @@ -20,6 +20,19 @@ } //$in= $command.':'.$senddata; + if (!filter_var($target, FILTER_VALIDATE_IP)) { + $tmp = SQLSelectOne("SELECT HOST FROM terminals where NAME = '$target'"); + if($tmp['HOST']) + { + $target = $tmp['HOST']; + } + else + { + return FALSE; + } + + } + if($this->debug == 1) debmes("mpt send to = $target : $senddata"); $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); if ($socket) { @@ -29,4 +42,5 @@ } } socket_close($socket); + return TRUE; 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 37/42] 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 38/42] 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 39/42] 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 40/42] 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 41/42] 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 42/42] 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