Commit cba886b0 authored by nextime's avatar nextime

Fixed thermostat

parent e3f610d2
...@@ -31,3 +31,6 @@ exten => _[a-z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal) ...@@ -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].,n,Goto(domotika_out,${EXTEN},1)
exten => _[A-Z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal) exten => _[A-Z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
exten => _[A-Z].,n,Goto(domotika_out,${EXTEN},1) exten => _[A-Z].,n,Goto(domotika_out,${EXTEN},1)
exten => _+.,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
exten => _+.,n,Goto(domotika_out,${EXTEN},1)
...@@ -27,3 +27,6 @@ exten => _[a-z].,1,Dial(SIP/pstn/${EXTEN},,r) ...@@ -27,3 +27,6 @@ exten => _[a-z].,1,Dial(SIP/pstn/${EXTEN},,r)
exten => _[a-z].,n,Hangup() exten => _[a-z].,n,Hangup()
exten => _X.,1,Dial(SIP/pstn/${EXTEN},,r) exten => _X.,1,Dial(SIP/pstn/${EXTEN},,r)
exten => _X.,n,Hangup() exten => _X.,n,Hangup()
exten => _+39.,1,Dial(SIP/pstn/${EXTEN:3},,r)
exten => _+39.,n,Hangup()
...@@ -792,6 +792,10 @@ def initializeAutoDetection(): ...@@ -792,6 +792,10 @@ def initializeAutoDetection():
def checkSpeechActions(speech): def checkSpeechActions(speech):
return SpeechActions.find(where=['speech_string=? AND active>0', speech]) return SpeechActions.find(where=['speech_string=? AND active>0', speech])
def getOtherSpeech(speech):
s=speech.replace(" ","%")+"%"
def insertNotify(source, user, msg, expire=0): def insertNotify(source, user, msg, expire=0):
n=Notifications() n=Notifications()
n.source=source n.source=source
......
...@@ -1326,7 +1326,7 @@ class domotikaService(service.Service): ...@@ -1326,7 +1326,7 @@ class domotikaService(service.Service):
if(len(command)>1): if(len(command)>1):
opts=command[1] opts=command[1]
for opt in opts.split(','): for opt in opts.split(','):
optp=opt.split('=')[0] optp=opt.split('=')
if len(optp)>1 and optp[0] in topt.keys(): if len(optp)>1 and optp[0] in topt.keys():
optk=optp[0] optk=optp[0]
optv=optp[1] optv=optp[1]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment