Merge branch 'master' of ssh://wwwjail.house/usr/local/git/base/kiosk

diff --cc kiosk_secrets.py
index 87f06439c7dba3a73e66fd19aa99d12354d6f523,e43c354336a14dc1e3e723a683982188452a767a..c3d9771c9cc98ce2024a6ace2c551e856717ec88
--- 1/kiosk_secrets.py
--- 2/kiosk_secrets.py
+++ b/kiosk_secrets.py
@@@ -19,5 -19,6 +19,5 @@@ twitter_consumer_secret = "<you guesse
  twitter_access_token = "<your twitter app access token here>"
  twitter_access_token_secret = "<your twitter app access token secret>"
  
- # pvporcupine access key
- pvporcupine_access_key="<whatever>"
+ # wakeword detection
+ pvporcupine_key = "<your pvporcupine_key>"
 -

diff --cc listen.py
index 150145131b1099f56b18bd84e45db088ac387d65,62012b543be21f8dca95f054dd52264e04b62e0c..e431a0b199fa67073d315b42e8413187555ef1f1
--- 1/listen.py
--- 2/listen.py
+++ b/listen.py
@@@ -9,8 -9,9 +9,8 @@@ import pyaudi
  import speech_recognition as sr
  from pyutils import logging_utils
  
- from kiosk_secrets import pvporcupine_key
+ import kiosk_secrets as secrets
  
 -
  logger = logging.getLogger(__name__)