From 5f60c516bb6c75f2f2dd4d89c30c09b6ab65adc6 Mon Sep 17 00:00:00 2001
From: E Thomas <ethomas997@etsphere.com>
Date: Mon, 26 Mar 2018 04:00:42 -0400
Subject: [PATCH] Add 'speakObjsQueue' for phonetic calls

Queue for phonetic calls.

Also adds commas to phonetic calls for pauses between name / lap / time.
---
 src/delta5server/server.py           |  2 +-
 src/delta5server/templates/race.html | 36 ++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/delta5server/server.py b/src/delta5server/server.py
index 631d9b5..3f9a5f7 100644
--- a/src/delta5server/server.py
+++ b/src/delta5server/server.py
@@ -796,7 +796,7 @@ def heartbeat_thread_function():
     '''Emits current rssi data.'''
     while True:
         SOCKET_IO.emit('heartbeat', INTERFACE.get_heartbeat_json())
-        gevent.sleep(0.500)
+        gevent.sleep(0.100)
 
 def ms_from_race_start():
     '''Return milliseconds since race start.'''
diff --git a/src/delta5server/templates/race.html b/src/delta5server/templates/race.html
index 3a7d9f1..5363709 100644
--- a/src/delta5server/templates/race.html
+++ b/src/delta5server/templates/race.html
@@ -3,6 +3,10 @@
 <audio id="buzzer" src="./static/audio/buzzer.mp3" type="audio/mp3"></audio>
 
 <script type="text/javascript" charset="utf-8">
+
+	var speakObjsQueue = [];
+	var checkSpeakQueueFlag = true;
+
 	$(document).ready(function () {
 		var socket = io.connect(location.protocol + '//' + document.domain + ':' + location.port);
 
@@ -36,9 +40,27 @@
 			}
 		});
 
+		var heatbeatCounter = 0;
+
 		socket.on('heartbeat', function (msg) {
-			for (i = 0; i < msg.current_rssi.length; i++) {
-				$('.current_rssi_' + i).html(msg.current_rssi[i]);
+			if (speakObjsQueue.length > 0) {
+				var isSpeakingFlag = $().articulate('isSpeaking');
+				if (checkSpeakQueueFlag) {
+					if (!isSpeakingFlag) {
+						var obj = speakObjsQueue.shift();
+						if (speakObjsQueue.length > 0)
+							checkSpeakQueueFlag = false;
+						doSpeak(obj);
+					}
+				}  //make sure previous speak has started before checking queue again
+				else if (isSpeakingFlag)
+					checkSpeakQueueFlag = true;
+			}
+			if (++heatbeatCounter >= 5) {   //do RSSI updates less often than speak-queue checks
+				heatbeatCounter = 0;
+				for (i = 0; i < msg.current_rssi.length; i++) {
+					$('.current_rssi_' + i).html(msg.current_rssi[i]);
+				}
 			}
 		});
 
@@ -91,7 +113,7 @@
 		});
 
 		socket.on('phonetic_data', function (msg) {
-			var $ttstest = msg.pilot + " lap " + msg.lap + " " + msg.phonetic;
+			var $ttstest = msg.pilot + ", lap " + msg.lap + ", " + msg.phonetic;
 			speak('<div class="speech">' + $ttstest + '</div> div.speech');				
 		})
 
@@ -175,7 +197,7 @@
 
 	var sellang = {{ lang_id }};
 
-	function speak(obj) {
+	function doSpeak(obj) {
 		switch (sellang) {
 			case 1:
 				$(obj).articulate('setVoice','name','Microsoft David Desktop - English (United States)').articulate('speak');
@@ -243,6 +265,12 @@
 	function ratefast(obj) {
 		$(obj).articulate('rate', 3.0);
 	};
+
+
+	function speak(obj) {
+		speakObjsQueue.push(obj);
+	};
+
 </script>
 {% endblock %} {% block content %}