piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(audio): long timer announced as "1 hour 60" before hour rollover (#7784)

Browse Source 
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
3djc
2026-09-16 12:47:00 +10:00
committed by GitHub
co-authored by Claude Opus 5
parent e066572340
commit d1b2826a91
17 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations/tts/tts_cn.cpp
+4 -4
View File
@@ -108,16 +108,16 @@ I18N_PLAY_FUNCTION(cn, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_cz.cpp
+4 -4
View File
@@ -169,16 +169,16 @@ I18N_PLAY_FUNCTION(cz, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, FEMALE);
}
radio/src/translations/tts/tts_da.cpp
+4 -4
View File
@@ -104,16 +104,16 @@ I18N_PLAY_FUNCTION(da, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_de.cpp
+4 -4
View File
@@ -149,16 +149,16 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_en.cpp
+4 -4
View File
@@ -107,16 +107,16 @@ I18N_PLAY_FUNCTION(en, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_es.cpp
+4 -4
View File
@@ -155,16 +155,16 @@ I18N_PLAY_FUNCTION(es, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
if (hours > 1) {
PLAY_NUMBER(hours, 0, 0);
radio/src/translations/tts/tts_fr.cpp
+4 -4
View File
@@ -139,16 +139,16 @@ I18N_PLAY_FUNCTION(fr, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (IS_PLAY_TIME() && hours == 0) {
PUSH_NUMBER_PROMPT(FR_PROMPT_MINUIT);
} else if (IS_PLAY_TIME() && hours == 12) {
radio/src/translations/tts/tts_he.cpp
+4 -4
View File
@@ -108,16 +108,16 @@ I18N_PLAY_FUNCTION(he, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_hu.cpp
+4 -4
View File
@@ -108,16 +108,16 @@ I18N_PLAY_FUNCTION(hu, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_it.cpp
+4 -4
View File
@@ -158,16 +158,16 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_nl.cpp
+4 -4
View File
@@ -110,16 +110,16 @@ I18N_PLAY_FUNCTION(nl, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_pl.cpp
+4 -4
View File
@@ -215,16 +215,16 @@ I18N_PLAY_FUNCTION(pl, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, ZENSKI);
}
radio/src/translations/tts/tts_pt.cpp
+4 -4
View File
@@ -143,16 +143,16 @@ I18N_PLAY_FUNCTION(pt, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
if (hours > 2) {
PLAY_NUMBER(hours, 0, 0);
radio/src/translations/tts/tts_ru.cpp
+4 -4
View File
@@ -170,16 +170,16 @@ I18N_PLAY_FUNCTION(ru, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_se.cpp
+4 -4
View File
@@ -103,16 +103,16 @@ I18N_PLAY_FUNCTION(se, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}
radio/src/translations/tts/tts_sk.cpp
+4 -4
View File
@@ -165,16 +165,16 @@ I18N_PLAY_FUNCTION(sk, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, ZENSKY);
}
radio/src/translations/tts/tts_ua.cpp
+4 -4
View File
@@ -169,16 +169,16 @@ I18N_PLAY_FUNCTION(ua, playDuration, int seconds PLAY_DURATION_ATT)
seconds = -seconds;
}
if (IS_PLAY_LONG_TIMER()) {
seconds += 30;
}
int hours, minutes;
hours = seconds / 3600;
seconds = seconds % 3600;
minutes = seconds / 60;
seconds = seconds % 60;
if (IS_PLAY_LONG_TIMER() && seconds >= 30) {
minutes += 1;
}
if (hours > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(hours, UNIT_HOURS, 0);
}