diff --git a/client_config.yml b/client_config.yml index 5ec33d3..373c9a7 100644 --- a/client_config.yml +++ b/client_config.yml @@ -10,6 +10,6 @@ voice: input_mixer: 'Mic' output_mixer: 'PCM' input_volume: 100 - output_volume: 30 + output_volume: 60 file_address: "http://hugveycmd.local:8888" output_driver: pulseaudio diff --git a/hugvey/panopticon.py b/hugvey/panopticon.py index c904e36..4247190 100644 --- a/hugvey/panopticon.py +++ b/hugvey/panopticon.py @@ -28,7 +28,7 @@ web_dir = os.path.join(os.path.split(__file__)[0], '..', 'www') def getWebSocketHandler(central_command): class WebSocketHandler(tornado.websocket.WebSocketHandler): - CORS_ORIGINS = ['localhost'] + CORS_ORIGINS = ['localhost', 'hugveycmd.local'] connections = set() def check_origin(self, origin): diff --git a/install_server.sh b/install_server.sh index 5843f2f..e4cc115 100755 --- a/install_server.sh +++ b/install_server.sh @@ -1,6 +1,6 @@ -apt-get update +#apt-get update -apt-get install -y munin-node bc supervisor +#apt-get install -y munin-node bc supervisor cp installation/rpi-internal-temp /usr/share/munin/plugins ln -sf /usr/share/munin/plugins/rpi-internal-temp /etc/munin/plugins/rpi-internal-temp rm /etc/munin/plugins/irqstats @@ -25,6 +25,9 @@ systemctl --system enable pulseaudio.service systemctl --system start pulseaudio.service usermod -a -G pulse-access pi +# install wifi networks +cp installation/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf + # Added chown=pi:pi cp installation/supervisord.conf /etc/supervisor/supervisord.conf ln -s /home/pi/hugvey/supervisor.conf /etc/supervisor/conf.d/hugvey.conf diff --git a/installation/wpa_supplicant.conf b/installation/wpa_supplicant.conf index c3076c5..241f02f 100644 --- a/installation/wpa_supplicant.conf +++ b/installation/wpa_supplicant.conf @@ -1,28 +1,12 @@ ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev update_config=1 -country=NL +country=BE network={ - ssid="r3" - psk="5qoWGZ0z" -} - -network={ - ssid="Digibox-8892" - psk="ODMZ7?423V63ODRG" -} - -network={ - ssid="PACT" - psk="zollverein" -} -network={ - ssid="Hugvey" + ssid="Hugvey_5G" psk="YouAreNotVeryTalkativeToday" } - network={ - ssid="Nanterre-Amandiers" - key_mgmt=NONE + ssid="Hugvey2_5G" + psk="YouAreNotVeryTalkativeToday" } - diff --git a/pd/loopaudio.pd b/pd/loopaudio.pd index 226d149..ed249b8 100644 --- a/pd/loopaudio.pd +++ b/pd/loopaudio.pd @@ -1,4 +1,4 @@ -#N canvas 976 211 660 592 10; +#N canvas 307 277 660 592 10; #X obj 131 277 dac~; #X obj 131 227 readsf~; #X obj 209 209 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 @@ -26,13 +26,13 @@ #X msg 330 117 0; #X obj 208 345 oscformat /loop; #X msg 356 434 connect 192.168.1.174 7400; -#X msg 132 170 open /mnt/stash/hugvey/score38_loop_40s_extra.wav \, -1; +#X msg 132 170 open /mnt/stash/hugvey/sound/score40_loop_plus40s.wav +\, 1; #X connect 1 0 0 0; #X connect 1 0 0 1; #X connect 1 1 2 0; -#X connect 2 0 22 0; #X connect 2 0 12 0; +#X connect 2 0 22 0; #X connect 4 0 5 0; #X connect 6 0 4 0; #X connect 7 0 8 0; diff --git a/www/index.html b/www/index.html index bc9d860..c6ff202 100644 --- a/www/index.html +++ b/www/index.html @@ -27,7 +27,7 @@ @click="loadNarrative(lang.code, lang.file)"> {{lang.code}} - +