Speech: add pitch,sing,mouth,throat parameters; Factor out reciter to be self contained and use dynamically allocated memory.

Author: markshannon

inc/genhdr/qstrdefs.generated.h

@@ -698,6 +698,11 @@ QDEF(MP_QSTR_size, (const byte*)"\x20\x04" "size")
 QDEF(MP_QSTR_is_playing, (const byte*)"\x04\x0a" "is_playing")
 QDEF(MP_QSTR_speech, (const byte*)"\x6d\x06" "speech")
 QDEF(MP_QSTR_say, (const byte*)"\xae\x03" "say")
+QDEF(MP_QSTR_pronounce, (const byte*)"\x94\x09" "pronounce")
+QDEF(MP_QSTR_sing, (const byte*)"\xb6\x04" "sing")
+QDEF(MP_QSTR_throat, (const byte*)"\x31\x06" "throat")
+QDEF(MP_QSTR_mouth, (const byte*)"\x6e\x05" "mouth")
+QDEF(MP_QSTR_speed, (const byte*)"\x62\x05" "speed")
 QDEF(MP_QSTR_radio, (const byte*)"\xd4\x05" "radio")
 QDEF(MP_QSTR_config, (const byte*)"\x4f\x06" "config")
 QDEF(MP_QSTR_send_bytes, (const byte*)"\xbf\x0a" "send_bytes")

inc/microbit/mpconfigport.h

@@ -125,7 +125,8 @@ extern const struct _mp_obj_module_t speech_module;
     uint8_t *radio_buf; \
     void *pwm_next_event; \
     void *audio_buffer; \
-    void *audio_source;
+    void *audio_source; \
+    void *speech_data;
 
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>

inc/microbit/qstrdefsport.h

@@ -422,7 +422,12 @@ Q(is_playing)
 
 Q(speech)
 Q(say)
-
+Q(pronounce)
+Q(sing)
+Q(pitch)
+Q(throat)
+Q(mouth)
+Q(speed)
 Q(radio)
 Q(reset)
 Q(config)

source/lib/sam/main.c

@@ -60,9 +60,9 @@ int sam_main(int argc, char **argv)
 	int i;
 	int phonetic = 0;
 
-	char input[256];
+	reciter_memory rec_mem;
 
-	for(i=0; i<256; i++) input[i] = 0;
+	for(i=0; i<256; i++) rec_mem.input[i] = 0;
 
 	if (argc <= 1)
 	{
@@ -75,8 +75,8 @@ int sam_main(int argc, char **argv)
 	{
 		if (argv[i][0] != '-')
 		{
-			strncat(input, argv[i], 256);
-			strncat(input, " ", 256);
+			strncat(rec_mem.input, argv[i], 256);
+			strncat(rec_mem.input, " ", 256);
 		} else
 		{
 			if (strcmp(&argv[i][1], "sing")==0)
@@ -120,24 +120,24 @@ int sam_main(int argc, char **argv)
 		i++;
 	} //while
 
-	for(i=0; input[i] != 0; i++)
-		input[i] = toupper((int)input[i]);
+	for(i=0; rec_mem.input[i] != 0; i++)
+		rec_mem.input[i] = toupper((int)rec_mem.input[i]);
 
 	if (debug)
 	{
-		if (phonetic) printf("phonetic input: %s\n", input);
-		else printf("text input: %s\n", input); 
+		if (phonetic) printf("phonetic input: %s\n", rec_mem.input);
+		else printf("text input: %s\n", rec_mem.input);
 	}
 
 	if (!phonetic)
 	{
-		strncat(input, "[", 256);
-		if (!TextToPhonemes(input)) return 1;
+		strncat(rec_mem.input, "[", 256);
+		if (!TextToPhonemes(&rec_mem)) return 1;
 		if (debug)
-			printf("phonetic input: %s\n", input);
-	} else strncat(input, "\x9b", 256);
+			printf("phonetic input: %s\n", rec_mem.input);
+	} else strncat(rec_mem.input, "\x9b", 256);
 
-	SetInput(input);
+	SetInput(rec_mem.input, strlen(rec_mem.input));
 	if (!SAMMain())
 	{
 		PrintUsage();