Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
domotikad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
domotika
domotikad
Commits
cba886b0
Commit
cba886b0
authored
Sep 09, 2015
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed thermostat
parent
e3f610d2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletion
+11
-1
domotika_internal.dialplan
asterisk/utils/defaults/domotika_internal.dialplan
+3
-0
domotika_out.dialplan
asterisk/utils/defaults/domotika_out.dialplan
+3
-0
dmdb.py
domotika/db/dmdb.py
+4
-0
domotika.py
domotika/domotika.py
+1
-1
No files found.
asterisk/utils/defaults/domotika_internal.dialplan
View file @
cba886b0
...
...
@@ -31,3 +31,6 @@ exten => _[a-z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
exten => _[a-z].,n,Goto(domotika_out,${EXTEN},1)
exten => _[A-Z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
exten => _[A-Z].,n,Goto(domotika_out,${EXTEN},1)
exten => _+.,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
exten => _+.,n,Goto(domotika_out,${EXTEN},1)
asterisk/utils/defaults/domotika_out.dialplan
View file @
cba886b0
...
...
@@ -27,3 +27,6 @@ exten => _[a-z].,1,Dial(SIP/pstn/${EXTEN},,r)
exten => _[a-z].,n,Hangup()
exten => _X.,1,Dial(SIP/pstn/${EXTEN},,r)
exten => _X.,n,Hangup()
exten => _+39.,1,Dial(SIP/pstn/${EXTEN:3},,r)
exten => _+39.,n,Hangup()
domotika/db/dmdb.py
View file @
cba886b0
...
...
@@ -792,6 +792,10 @@ def initializeAutoDetection():
def
checkSpeechActions
(
speech
):
return
SpeechActions
.
find
(
where
=
[
'speech_string=? AND active>0'
,
speech
])
def
getOtherSpeech
(
speech
):
s
=
speech
.
replace
(
" "
,
"
%
"
)
+
"
%
"
def
insertNotify
(
source
,
user
,
msg
,
expire
=
0
):
n
=
Notifications
()
n
.
source
=
source
...
...
domotika/domotika.py
View file @
cba886b0
...
...
@@ -1326,7 +1326,7 @@ class domotikaService(service.Service):
if
(
len
(
command
)
>
1
):
opts
=
command
[
1
]
for
opt
in
opts
.
split
(
','
):
optp
=
opt
.
split
(
'='
)
[
0
]
optp
=
opt
.
split
(
'='
)
if
len
(
optp
)
>
1
and
optp
[
0
]
in
topt
.
keys
():
optk
=
optp
[
0
]
optv
=
optp
[
1
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment