Installing files can help preventing errors.... #60

.vscode/tasks.json

@@ -10,7 +10,7 @@
             "args": [
                 "-j9",
                 "ENABLE_DEBUG=1",
-                "USE_GPSD=1",
+               // "USE_GPSD=1",
                 "all"
             ],
             "group": {

Common/APRSGPSDIdFrameProvider.cpp

@@ -83,7 +83,7 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std:
 #elif GPSD_API_MAJOR_VERSION <= 14
 	if(m_gpsdData.fix.status == STATUS_UNK)
         return false;
-#elif 
+#else
     #error Unsupported GPSD_API_MAJOR_VERSION
 #endif
 

Common/AudioUnit.cpp

@@ -72,6 +72,10 @@ void CAudioUnit::setLanguage(const std::string & dir, TEXT_LANG language)
 			ambeFileName = "fr_FR.ambe";
 			indxFileName = "fr_FR.indx";
 			break;
+		case TL_FRANCAIS_2:
+			ambeFileName = "fr_FR2.ambe";
+			indxFileName = "fr_FR2.indx";
+			break;
 		case TL_ESPANOL:
 			ambeFileName = "es_ES.ambe";
 			indxFileName = "es_ES.indx";

Common/Defs.h

@@ -91,6 +91,7 @@ enum TEXT_LANG {
 	TL_DEUTSCH,
 	TL_DANSK,
 	TL_FRANCAIS,
+	TL_FRANCAIS_2,
 	TL_ITALIANO,
 	TL_POLSKI,
 	TL_ENGLISH_US,

Common/RepeaterHandler.cpp

@@ -2468,6 +2468,7 @@ void CRepeaterHandler::writeLinkingTo(const std::string &callsign)
 			text = CStringUtils::string_format("Linker til %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = CStringUtils::string_format("Connexion a %s", callsign.c_str());
 			break;
 		case TL_ITALIANO:
@@ -2523,6 +2524,7 @@ void CRepeaterHandler::writeLinkedTo(const std::string &callsign)
 			text = CStringUtils::string_format("Linket til %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = CStringUtils::string_format("Connecte a %s", callsign.c_str());
 			break;
 		case TL_ITALIANO:
@@ -2578,6 +2580,7 @@ void CRepeaterHandler::writeNotLinked()
 			text = "Ikke forbundet";
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			break;
 		case TL_ITALIANO:
@@ -2636,6 +2639,7 @@ void CRepeaterHandler::writeIsBusy(const std::string& callsign)
 			tempText = CStringUtils::string_format("Optaget fra %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			tempText = CStringUtils::string_format("Occupe par %s", callsign.c_str());
 			break;
@@ -2704,6 +2708,7 @@ void CRepeaterHandler::ccsLinkMade(const std::string& callsign, DIRECTION direct
 			text = CStringUtils::string_format("Linket til %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = CStringUtils::string_format("Connecte a %s", callsign.c_str());
 			break;
 		case TL_ITALIANO:
@@ -2769,6 +2774,7 @@ void CRepeaterHandler::ccsLinkEnded(const std::string&, DIRECTION direction)
 			tempText = "CCS er afsluttet";
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			tempText = "CCS a pris fin";
 			break;
@@ -2848,6 +2854,7 @@ void CRepeaterHandler::ccsLinkFailed(const std::string& dtmf, DIRECTION directio
 			tempText = CStringUtils::string_format("%s unknown", dtmf.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			tempText = CStringUtils::string_format("%s inconnu", dtmf.c_str());
 			break;

DGWTimeServer/TimeServerConfig.cpp

@@ -112,7 +112,7 @@ bool CTimeServerConfig::loadTimeServer(const CConfig & cfg)
 	else if(format == "text")			m_timeServer.format = FORMAT_TEXT_TIME;
 
 	std::string lang;
-	ret = cfg.getValue("timeserver", "language", lang, "english_uk_1", {"english_uk_1", "english_uk_2", "english_us_1", "english_us_2", "deutsch_1", "deutsch_2", "francais", "nederlands", "svenska", "espanol", "norsk", "portugues"}) && ret;;
+	ret = cfg.getValue("timeserver", "language", lang, "english_uk_1", {"english_uk_1", "english_uk_2", "english_us_1", "english_us_2", "deutsch_1", "deutsch_2", "francais", "francais_2", "nederlands", "svenska", "espanol", "norsk", "portugues"}) && ret;;
 	if     (lang == "english_uk_1") m_timeServer.language = LANG_ENGLISH_UK_1;
 	else if(lang == "english_uk_2") m_timeServer.language = LANG_ENGLISH_UK_2;
 	else if(lang == "english_us_1") m_timeServer.language = LANG_ENGLISH_US_1;
@@ -120,6 +120,7 @@ bool CTimeServerConfig::loadTimeServer(const CConfig & cfg)
 	else if(lang == "deutsch_1"   ) m_timeServer.language = LANG_DEUTSCH_1;
 	else if(lang == "detusch_2"   ) m_timeServer.language = LANG_DEUTSCH_2;
 	else if(lang == "francais"    ) m_timeServer.language = LANG_FRANCAIS;
+	else if(lang == "francais_2"  ) m_timeServer.language = LANG_FRANCAIS_2;
 	else if(lang == "nederlands"  ) m_timeServer.language = LANG_NEDERLANDS;
 	else if(lang == "svenska"     ) m_timeServer.language = LANG_SVENSKA;
 	else if(lang == "espanol"     ) m_timeServer.language = LANG_ESPANOL;

DGWTimeServer/TimeServerDefs.h

@@ -29,6 +29,7 @@ enum LANGUAGE {
 	LANG_DEUTSCH_1,
 	LANG_DEUTSCH_2,
 	LANG_FRANCAIS,
+	LANG_FRANCAIS_2,
 	LANG_NEDERLANDS,
 	LANG_SVENSKA,
 	LANG_ESPANOL,

DGWTimeServer/TimeServerThread.cpp

@@ -186,6 +186,7 @@ void CTimeServerThread::sendTime(unsigned int hour, unsigned int min)
 			words = sendTimeDeDE2(hour, min);
 			break;
 		case LANG_FRANCAIS:
+		case LANG_FRANCAIS_2:
 			words = sendTimeFrFR(hour, min);
 			break;
 		case LANG_NEDERLANDS:
@@ -953,6 +954,10 @@ bool CTimeServerThread::loadAMBE()
 			ambeFileName = "TIME_fr_FR.ambe";
 			indxFileName = "TIME_fr_FR.indx";
 			break;
+		case LANG_FRANCAIS_2:
+			ambeFileName = "TIME_fr_FR2.ambe";
+			indxFileName = "TIME_fr_FR2.indx";
+			break;
 		case LANG_NEDERLANDS:
 			ambeFileName = "TIME_nl_NL.ambe";
 			indxFileName = "TIME_nl_NL.indx";
@@ -1093,6 +1098,7 @@ bool CTimeServerThread::send(const std::vector<std::string> &words, unsigned int
 			slowData = CStringUtils::string_format(("Es ist %02u:%02u Uhr"), hour, min);
 			break;
 		case LANG_FRANCAIS:
+		case LANG_FRANCAIS_2:
 			header.setMyCall2(("TIME"));
 			slowData = CStringUtils::string_format(("Il est %02u:%02u"), hour, min);
 			break;

DGWTimeServer/example.cfg

@@ -2,7 +2,7 @@
 callsign=       # call of the gateway to send time beacons without G letter
 address=    # address of the gateway, defaults to 127.0.0.1
 format=     # possible values are voice, text, defaults to voice. note that voice also sends text along.
-language=   # valid values: english_uk_1, english_uk_2, english_us_1, english_us_2, deutsch_1, deutsch_2, francais, nederlands, svenska, espanol, norsk, portugues. Defaults to english_uk_1
+language=   # valid values: english_uk_1, english_uk_2, english_us_1, english_us_2, deutsch, francais, francais_2, nederlands, svenska, espanol, norsk, portugues. Defaults to english_uk_1
 interval=   # valid values are 15, 30 and 60, defaults to 30
 
 [Paths]

DStarGateway/DStarGatewayConfig.cpp

@@ -348,12 +348,13 @@ bool CDStarGatewayConfig::loadGateway(const CConfig & cfg)
 
 	std::string lang;
 	ret = cfg.getValue("gateway", "language", lang, "english_uk",
-						{"english_uk", "deutsch", "dansk", "francais", "italiano", "polski",
+						{"english_uk", "deutsch", "dansk", "francais", "francais_2", "italiano", "polski",
 						"english_us", "espanol", "svenska", "nederlands_nl", "nederlands_be", "norsk", "portugues"}) && ret;;
 	if(lang == "english_uk")		m_gateway.language = TL_ENGLISH_UK;
 	else if(lang == "deutsch")		m_gateway.language = TL_DEUTSCH;
 	else if(lang == "dansk")		m_gateway.language = TL_DANSK;
 	else if(lang == "francais")		m_gateway.language = TL_FRANCAIS;
+	else if(lang == "francais_2")	m_gateway.language = TL_FRANCAIS_2;
 	else if(lang == "italiano") 	m_gateway.language = TL_ITALIANO;
 	else if(lang == "polski")		m_gateway.language = TL_POLSKI;
 	else if(lang == "english_us")	m_gateway.language = TL_ENGLISH_US;

Data/Makefile

@@ -13,6 +13,8 @@ install:
 	@install -g bin -o dstar -m 0664 TIME_en_US.indx  $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 TIME_fr_FR.ambe  $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 TIME_fr_FR.indx  $(DATA_DIR)
+	@install -g bin -o dstar -m 0664 TIME_fr_FR2.ambe  $(DATA_DIR)
+	@install -g bin -o dstar -m 0664 TIME_fr_FR2.indx  $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 TIME_se_SE.ambe  $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 TIME_se_SE.indx  $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 de_DE.ambe $(DATA_DIR)
@@ -27,6 +29,8 @@ install:
 	@install -g bin -o dstar -m 0664 es_ES.indx $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 fr_FR.ambe $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 fr_FR.indx $(DATA_DIR)
+	@install -g bin -o dstar -m 0664 fr_FR2.ambe $(DATA_DIR)
+	@install -g bin -o dstar -m 0664 fr_FR2.indx $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 it_IT.ambe $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 it_IT.indx $(DATA_DIR)
 	@install -g bin -o dstar -m 0664 no_NO.ambe $(DATA_DIR)

Data/TIME_fr_FR2.indx

@@ -0,0 +1,20 @@
+bonjour	0	66
+cinq	66	50
+deux	116	44
+dix	160	53
+et_demie	213	51
+et_quart	264	54
+heure	318	43
+heures	361	44
+huit	405	49
+il_est	454	45
+midi	499	49
+minuit	548	50
+moins_le_quart	598	64
+neuf	662	51
+onze	713	47
+quatre	760	48
+sept	808	46
+six	854	53
+trois	907	41
+une	948	45

Data/fr_FR2.indx

@@ -0,0 +1,44 @@
+0	0	57
+1	57	38
+2	95	44
+3	139	41
+4	180	47
+5	227	51
+6	278	53
+7	331	47
+8	378	49
+9	427	51
+alpha	478	50
+bravo	528	52
+charlie	580	50
+delta	630	51
+A	681	37
+B	718	45
+C	763	41
+D	804	42
+E	846	45
+F	891	47
+G	938	41
+H	979	49
+I	1028	39
+J	1067	42
+K	1109	39
+L	1148	44
+M	1192	45
+N	1237	44
+O	1281	42
+P	1323	37
+Q	1360	39
+R	1399	45
+S	1444	49
+T	1493	36
+U	1529	44
+V	1573	42
+W	1615	58
+X	1673	50
+Y	1723	56
+Z	1779	50
+linkedto	1829	58
+notlinked	1887	62
+linkingto	1949	91
+isbusy	2040	61

README.md

@@ -158,6 +158,8 @@ The testing framwework used is Google Test.
 
 # 6. Version History
 ## 6.1. Version 1.0
+- [**Improvement**] Add second French voice ([#60](https://github.com/F4FXL/DStarGateway/issues/60))
+- [**Improvement**] Clarify French "Linking to" announcement ([#60](https://github.com/F4FXL/DStarGateway/issues/60))
 - [**Improvement**] Improve threading handling ([#58](https://github.com/F4FXL/DStarGateway/issues/58))
 - [**Improvement**] Add Add an option to disable logging of ircddb traffic ([#59](https://github.com/F4FXL/DStarGateway/issues/59))
 - [**Bugfix**] Fix repeater not reverting to startup reflector after issueing a command through remote control. ([#57](https://github.com/F4FXL/DStarGateway/issues/57))