From 347283cb32877aba5a6454a1e2e0d28a38595e5d Mon Sep 17 00:00:00 2001
From: "kjell.kernen@gmail.com"
 <kjell.kernen@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 30 Aug 2013 17:36:46 +0000
Subject: [PATCH] Support for Swedish voice. Built for and tested on Taranis. I
 have kept the voice file names and numbering identical to the English voice
 files. The reason is that I want to make transitions between the the
 languages possible without the need to reprogram existing models.

---
 src/Makefile                |  2 +-
 src/gui/menu_general.cpp    |  4 +++-
 src/translations/tts_se.cpp | 33 +++++++++++----------------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 490879b0a..f0f48bf23 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -680,7 +680,7 @@ TARGET = opentx
 
 # List C++ source files here. (C dependencies are automatically generated.)
 ifeq ($(PCB), $(filter $(PCB), SKY9X TARANIS))
-  TTS_SRC = translations/tts_cz.cpp translations/tts_de.cpp translations/tts_en.cpp translations/tts_es.cpp translations/tts_fr.cpp translations/tts_it.cpp translations/tts_pt.cpp translations/tts_sk.cpp
+  TTS_SRC = translations/tts_cz.cpp translations/tts_de.cpp translations/tts_en.cpp translations/tts_es.cpp translations/tts_fr.cpp translations/tts_it.cpp translations/tts_pt.cpp translations/tts_sk.cpp translations/tts_se.cpp
 else
   STD_TTS_SRC = translations/tts_$(shell sh -c "echo $(TTS) | tr '[:upper:]' '[:lower:]'").cpp
   TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi")
diff --git a/src/gui/menu_general.cpp b/src/gui/menu_general.cpp
index 21441f902..97bbc90fc 100644
--- a/src/gui/menu_general.cpp
+++ b/src/gui/menu_general.cpp
@@ -49,6 +49,7 @@ extern LanguagePack deLanguagePack;
 extern LanguagePack itLanguagePack;
 extern LanguagePack ptLanguagePack;
 extern LanguagePack skLanguagePack;
+extern LanguagePack seLanguagePack;
 
 LanguagePack * languagePacks[] = {
   // alphabetical order
@@ -59,7 +60,8 @@ LanguagePack * languagePacks[] = {
   &deLanguagePack,
   &itLanguagePack,
   &ptLanguagePack,
-  &skLanguagePack,
+  &skLanguagePack,
+  &seLanguagePack,
   NULL
 };
 #endif
diff --git a/src/translations/tts_se.cpp b/src/translations/tts_se.cpp
index e48f6ebb9..848e9e344 100644
--- a/src/translations/tts_se.cpp
+++ b/src/translations/tts_se.cpp
@@ -37,7 +37,7 @@
 
 #include "../opentx.h"
 
-enum EnglishPrompts {
+enum SwedishPrompts {
   SE_PROMPT_NUMBERS_BASE = 0,
   SE_PROMPT_ZERO = SE_PROMPT_NUMBERS_BASE+0,       //02-99
   SE_PROMPT_HUNDRED = SE_PROMPT_NUMBERS_BASE+100,  //100,200 .. 900
@@ -73,21 +73,7 @@ enum EnglishPrompts {
 
 #if defined(VOICE)
 
-#if defined(CPUARM)
-  #define SE_PUSH_UNIT_PROMPT(p, u) se_pushUnitPrompt((p), (u), id)
-#else
-  #define SE_PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u))
-#endif
-
-I18N_PLAY_FUNCTION(en, pushUnitPrompt, int16_t number, uint8_t unitprompt)
-{
-  if (number == 1)
-    PUSH_NUMBER_PROMPT(unitprompt);
-  else
-    PUSH_NUMBER_PROMPT(unitprompt+1);
-}
-
-I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
+I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
 {
   if (number < 0) {
     PUSH_NUMBER_PROMPT(SE_PROMPT_MINUS);
@@ -124,9 +110,9 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
       number = qr.quot;
     }
   }
-
-  int16_t tmp = number;
-
+  
+  int16_t tmpNumber = number;
+  
   if (number >= 1000) {
     PLAY_NUMBER(number / 1000, 0, 0);
     PUSH_NUMBER_PROMPT(SE_PROMPT_THOUSAND);
@@ -145,11 +131,14 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
   }
   
   if (unit) {
-    SE_PUSH_UNIT_PROMPT(tmp, (SE_PROMPT_UNITS_BASE+((unit-1)*2)));
+    if  (tmpNumber == 1 ) 
+      PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+((unit-1)*2));   // Singular prompts
+    else
+      PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+((unit-1)*2)+1); // Plural prompts
   }
 }
 
-I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds)
+I18N_PLAY_FUNCTION(se, playDuration, int16_t seconds)
 {
   if (seconds < 0) {
     PUSH_NUMBER_PROMPT(SE_PROMPT_MINUS);
@@ -175,6 +164,6 @@ I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds)
   }
 }
 
-LANGUAGE_PACK_DECLARE_DEFAULT(se, "Swedish");
+LANGUAGE_PACK_DECLARE(se, "Swedish");
 
 #endif