Speech: Update API to reflect documentation.

markshannon · markshannon · commit 07ff6cc67fe4 · 2016-07-17T09:52:28.000-07:00
diff --git a/inc/genhdr/qstrdefs.generated.h b/inc/genhdr/qstrdefs.generated.h
@@ -703,8 +703,9 @@ 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_debug, (const byte*)"\xd4\x05" "debug")
+QDEF(MP_QSTR_translate, (const byte*)"\x43\x09" "translate")
+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")
 QDEF(MP_QSTR_receive_bytes, (const byte*)"\x88\x0d" "receive_bytes")
diff --git a/inc/microbit/qstrdefsport.h b/inc/microbit/qstrdefsport.h
@@ -429,6 +429,8 @@ Q(throat)
 Q(mouth)
 Q(speed)
 Q(debug)
+Q(translate)
+
 Q(radio)
 Q(reset)
 Q(config)
diff --git a/source/microbit/modspeech.c b/source/microbit/modspeech.c
@@ -118,7 +118,7 @@ static mp_obj_t make_speech_iter(void) {
     return result;
 }
 
-static mp_obj_t pronounce(mp_obj_t words) {
+static mp_obj_t translate(mp_obj_t words) {
     mp_uint_t len, outlen;
     const char *txt = mp_obj_str_get_data(words, &len);
     // Reciter truncates *output* at about 120 characters.
@@ -145,11 +145,11 @@ static mp_obj_t pronounce(mp_obj_t words) {
     // Prevent input becoming invisible to GC due to tail-call optimisation.
     MP_STATE_PORT(speech_data) = NULL;
     return res;
-}MP_DEFINE_CONST_FUN_OBJ_1(pronounce_obj, pronounce);
+}MP_DEFINE_CONST_FUN_OBJ_1(translate_obj, translate);
 
 extern int debug;
 
-static mp_obj_t articulate(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, bool sing) {
+static mp_obj_t articulate(mp_obj_t phonemes, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, bool sing) {
 
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_pitch,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_PITCH} },
@@ -161,7 +161,7 @@ static mp_obj_t articulate(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t
 
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args-1, pos_args+1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     sam_memory *sam = m_new(sam_memory, 1);
     MP_STATE_PORT(speech_data) = sam;
@@ -175,7 +175,7 @@ static mp_obj_t articulate(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t
     debug = args[4].u_bool;
 
     mp_uint_t len;
-    const char *input = mp_obj_str_get_data(pos_args[0], &len);
+    const char *input = mp_obj_str_get_data(phonemes, &len);
     buf_start_pos = 0;
     speech_iterator_t *src = make_speech_iter();
     buf = src->buf;
@@ -203,12 +203,18 @@ static mp_obj_t articulate(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t
 }
 
 static mp_obj_t say(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    return articulate(n_args, pos_args, kw_args, false);
+    mp_obj_t phonemes = translate(pos_args[0]);
+    return articulate(phonemes, n_args-1, pos_args+1, kw_args, false);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(say_obj, 1, say);
 
+static mp_obj_t pronounce(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return articulate(pos_args[0], n_args-1, pos_args+1, kw_args, false);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(pronounce_obj, 1, pronounce);
+
 static mp_obj_t sing(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    return articulate(n_args, pos_args, kw_args, true);
+    return articulate(pos_args[0], n_args-1, pos_args+1, kw_args, true);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(sing_obj, 1, sing);
 
@@ -217,6 +223,7 @@ static const mp_map_elem_t _globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_say), (mp_obj_t)&say_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sing), (mp_obj_t)&sing_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_pronounce), (mp_obj_t)&pronounce_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_translate), (mp_obj_t)&translate_obj },
 };
 static MP_DEFINE_CONST_DICT(_globals, _globals_table);
 
