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

feat: Timer Voice & Haptic option, show elapsed speak time value when countdown (#2711)

Browse Source 
* fix "odd" elapsed time announcement

* announce elapsed seconds

* Add support for "Beeps and Haptic" and "Voice and Haptic" for timer countdown.
This commit is contained in:
eshifri
2023-01-23 20:00:12 +10:00
committed by GitHub
parent 0b8e4c6003
commit 8e8e78671a
45 changed files with 243 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/yaml/yaml_datastructs_lr3pro.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+2 -1
View File
@@ -470,7 +470,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 8),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_t12.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_t8.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+2 -1
View File
@@ -442,7 +442,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+2 -1
View File
@@ -501,7 +501,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 8),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+2 -1
View File
@@ -499,7 +499,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 8),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x7.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+2 -1
View File
@@ -444,7 +444,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 8),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+2 -1
View File
@@ -483,7 +483,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 8),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+2 -1
View File
@@ -421,7 +421,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+2 -1
View File
@@ -431,7 +431,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+2 -1
View File
@@ -428,7 +428,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+2 -1
View File
@@ -432,7 +432,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};
radio/src/storage/yaml/yaml_datastructs_zorro.cpp
+2 -1
View File
@@ -436,7 +436,8 @@ static const struct YamlNode struct_TimerData[] = {
YAML_UNSIGNED( "persistent", 2 ),
YAML_SIGNED( "countdownStart", 2 ),
YAML_UNSIGNED( "showElapsed", 1 ),
YAML_PADDING( 7 ),
YAML_UNSIGNED( "extraHaptic", 1 ),
YAML_PADDING( 6 ),
YAML_STRING("name", 3),
YAML_END
};