diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt index 635ffce05..4587e8673 100644 --- a/radio/src/lua/CMakeLists.txt +++ b/radio/src/lua/CMakeLists.txt @@ -11,6 +11,6 @@ macro(add_lua_export_target target) add_custom_target(lua_export_${target} DEPENDS lua_exports_${target}.inc) endmacro(add_lua_export_target) -add_lua_export_target(taranis -DPCBTARANIS -DLUA -DVIRTUALINPUTS) -add_lua_export_target(taranis_x9e -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS) -add_lua_export_target(horus -DPCBHORUS -DLUA -DVIRTUALINPUTS) +add_lua_export_target(taranis -DCPUARM -DPCBTARANIS -DLUA -DVIRTUALINPUTS) +add_lua_export_target(taranis_x9e -DCPUARM -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS) +add_lua_export_target(horus -DCPUARM -DPCBHORUS -DLUA -DVIRTUALINPUTS) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index e30e0385e..1911bce93 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -129,7 +129,11 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) && defined(REV9E) +#if defined(PCBHORUS) + #define TR_RETA123 "SVPK12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "SVPK123LR" +#elif defined(PCBTARANIS) && defined(REV9E) #define TR_RETA123 "SVPK1234LRLR" #elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "SVPK123LR" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 94db7068c..ab53125fe 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -134,7 +134,11 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) && defined(REV9E) +#if defined(PCBHORUS) + #define TR_RETA123 "SHGQ12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "SHGQ123LR" +#elif defined(PCBTARANIS) && defined(REV9E) #define TR_RETA123 "SHGQ1234LRLR" #elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "SHGQ123LR" @@ -941,9 +945,9 @@ #define TR_CRITICALALARM INDENT "Kritisch-Alarm" #define TR_ENABLE_POPUP "Freigabe Popup-Fenster" #define TR_DISABLE_POPUP "Sperren Popup-Fenster" -#define TR_POPUP "Popup" -#define TR_MIN "Min" -#define TR_MAX "Max" +#define TR_POPUP "Popup" +#define TR_MIN "Min" +#define TR_MAX "Max" #define TR_CURVE_PRESET "Gerade 0 11 22 33 45" #define TR_PRESET "Preset" #define TR_MIRROR "Spiegeln" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index ab02eaec2..24a60de65 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -129,7 +129,13 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) || defined(REVX) +#if defined(PCBHORUS) + #define TR_RETA123 "RETA12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "RETA123LR" +#elif defined(PCBTARANIS) && defined(REV9E) + #define TR_RETA123 "RETA1234LRLR" +#elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "RETA123LR" #elif defined(PCBSKY9X) #define TR_RETA123 "RETA123a" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 0e6494ef7..6008d6423 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -129,7 +129,13 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) || defined(REVX) +#if defined(PCBHORUS) + #define TR_RETA123 "RETA12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "RETA123LR" +#elif defined(PCBTARANIS) && defined(REV9E) + #define TR_RETA123 "RETA1234LRLR" +#elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "RETA123LR" #elif defined(PCBSKY9X) #define TR_RETA123 "RETA123a" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 0d1cd151a..34dc1cb0b 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -129,7 +129,11 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) && defined(REV9E) +#if defined(PCBHORUS) + #define TR_RETA123 "DPGA12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "DPGA123LR" +#elif defined(PCBTARANIS) && defined(REV9E) #define TR_RETA123 "DPGA1234LRLR" #elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "DPGA123LR" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index e3d5c8d56..43d1e86df 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -132,7 +132,11 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) && defined(REV9E) +#if defined(PCBHORUS) + #define TR_RETA123 "DEMA12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "DEMA123LR" +#elif defined(PCBTARANIS) && defined(REV9E) #define TR_RETA123 "DEMA123SDSD" #elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "DEMA123SD" @@ -939,9 +943,9 @@ #define TR_CRITICALALARM INDENT "Allarme Critico" #define TR_ENABLE_POPUP "Abilita Popup" #define TR_DISABLE_POPUP "Disabilita Popup" -#define TR_POPUP "Popup" -#define TR_MIN "Min" -#define TR_MAX "Max" +#define TR_POPUP "Popup" +#define TR_MIN "Min" +#define TR_MAX "Max" #define TR_CURVE_PRESET "Preimpostate..." #define TR_PRESET "Preimpostate" #define TR_MIRROR "Mirror" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 1e59c1115..ecdfbc777 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -132,7 +132,11 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) && defined(REV9E) +#if defined(PCBHORUS) + #define TR_RETA123 "RETA12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "RETA123LR" +#elif defined(PCBTARANIS) && defined(REV9E) #define TR_RETA123 "RETA1234LRLR" #elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "RETA123LR" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 01913a61e..59185cbaa 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -133,7 +133,11 @@ #define LEN_RETA123 "\001" -#if defined(PCBTARANIS) && defined(REV9E) +#if defined(PCBHORUS) + #define TR_RETA123 "KWGL12345LR" +#elif defined(PCBFLAMENCO) + #define TR_RETA123 "KWGL123LR" +#elif defined(PCBTARANIS) && defined(REV9E) #define TR_RETA123 "KWGL1234LRLR" #elif defined(PCBTARANIS) || defined(REVX) #define TR_RETA123 "KWGL123LR" diff --git a/radio/util/commit-tests.sh b/radio/util/commit-tests.sh index 20754bcf6..311a640ef 100755 --- a/radio/util/commit-tests.sh +++ b/radio/util/commit-tests.sh @@ -36,6 +36,7 @@ make -j2 gtests rm -rf * cmake -DCMAKE_BUILD_TYPE=Debug -DPCB=HORUS -DHELI=NO -DUSB=SERIAL -DCLI=YES -DDEBUG=YES .. make -j2 firmware.bin +cmake -DCMAKE_BUILD_TYPE=Debug -DPCB=HORUS -DHELI=NO -DUSB=SERIAL -DCLI=NO -DDEBUG=YES .. make -j2 simu #make gtests #./gtests