42b262c437
Refactored voicePromptUtils.h and voicePromptUtils.c
2022-10-28 08:30:46 +02:00
c5f109efa5
Refactored voicePrompts.c
2022-10-28 08:30:46 +02:00
df5341e103
Refactored voicePrompts.h, aligned function names of voice prompt API to OpenRTX coding style
2022-10-28 08:30:46 +02:00
5840f459fa
Renamed UIStrings.h/.c to ui_strings.h/.c and refactored their content
2022-10-28 08:30:46 +02:00
8eca684a7d
Voice prompts bugfixes:
...
- added missing initialization of codec2 in voice prompts code
- discarding the voice prompt header as we only support 3200 bit rate
- fixed wrong offset in pick vpQueueStringTableEntry
- fixed bug in vpInit causing voiceprompts to hang
2022-10-28 08:30:46 +02:00
5bb7fc96a8
Renamed a few variables for case consistency, reimplemented vpTick and call from same place as ui_updateFSM to continue playing voice prompts.
2022-10-28 08:30:46 +02:00
befc892068
When reading codec2 data, pad out to a multiple of 8 bytes with 0s so that when frames are pushed from the buffer, we don't get garbage at the ends of prompts which are not an exact multiple of 8 bytes.
2022-10-28 08:30:46 +02:00
69b023dd4a
First cut at implementation of vpPlay.
2022-10-28 08:30:46 +02:00
6b83af622c
Corrected vpDataOffset, now use ftell to obtain file offset after reading in header and toc. Added better verification that the TOC was actually read.
2022-10-28 08:30:46 +02:00
e09ce7e95a
Added function implementation to read voiceprompts.vpc header, then read in the table of contents into ram, and then on request, read the codec2 data into the codec2 buffer given an offset and length into the data.
2022-10-28 08:30:46 +02:00
1f71789a9d
Apply clang-format
2022-10-28 08:30:46 +02:00
29de1d36d4
Added a couple of comments and added whitespace between a couple of functions. No code changes.
2022-10-28 08:30:46 +02:00
bec9ec0218
Added call to ReleaseFunctionLatchIfNeeded to status event branch of fsm so that the function latch will be released when needed without having to wait for a key press.
2022-10-28 08:30:46 +02:00
9038745b6f
extracted logic for testing if the function key is latched into its own function for readability.
2022-10-28 08:30:46 +02:00
bc7ce57f9b
Reworked function latch. Now, the latch is silently released on the next key press event which is outside the timeout.
2022-10-28 08:30:46 +02:00
da935ff710
Added function menu latch.
...
1. If the moni key is long pressed by itself (no digit), function key latches.
2. It remains latched for 3 seconds.
3. If a subsequent key is pressed during this time, the timer is restarted at 3 seconds again, allowing the user to say increase the ctcss code while keeping the function latched.
4. If no key is pressed, the timer is allowed to lapse and the function unlatched.
2022-10-28 08:30:46 +02:00
895a5ce780
Fixed error in AnnounceMenuIfNeeded, it was speaking the name twice rather than the name and value.
2022-10-28 08:30:46 +02:00
611bd3d142
Fixed error in announceText(): wrong flags were passed to vpQueueString
2022-10-28 08:30:46 +02:00
d57700c607
removed old comment and unnecessary code.
2022-10-28 08:30:46 +02:00
6e4af40346
hooked up warning messages. May need tweaking.
...
Msg may repeat on keyup.
2022-10-28 08:30:46 +02:00
1f36e9b9d8
Added voice prompt to warn that during backup/restore no voice prompts will be available.
...
Note that this is stil not hooked up.
2022-10-28 08:30:46 +02:00
7cd3f1d49a
Added announceSettingsTimeDate and hooked up to f1 on that screen.
2022-10-28 08:30:46 +02:00
29bde26f4f
Added announceBackupScreen() and announceRestoreScreen()
2022-10-28 08:30:46 +02:00
b1c07e3d3f
Added speech for About screen.
2022-10-28 08:30:46 +02:00
8527b8a6ef
Add GPS voiceprompts announcing
...
Removed flag parameters from summary and GPSInfo,
hooked up the GPS info so that if the GPS screen is active,
long hold f1 will read the GPS summary and f1 will repeat the last
voice prompt like on the VFO and channel screens.
2022-10-28 08:30:46 +02:00
c0371dad2a
Added pauses between lots of info in summary for comprehensibility.
2022-10-28 08:30:46 +02:00
46e3900462
corrected gps summary to use a stingized float for the compass bearing.
...
Also fixed another warning.
2022-10-28 08:30:46 +02:00
c24af62000
added more to GPS summary and fixed a couple of warnings.
2022-10-28 08:30:46 +02:00
4b604e255f
Added a few more voice prompts for the GPS screen: latitude, longitude, north, south, east,west, speed, altitude.
2022-10-28 08:30:46 +02:00
0a4ed4009c
Added announceGPSInfo so we can read something meaningful for the GPS screen (not yet hooked up).
2022-10-28 08:30:46 +02:00
c3667313ba
Extracted announceM17Info logic to its own function.
2022-10-28 08:30:46 +02:00
339131a5b7
Added M17 dst_addr to channel summary.
...
Added zone name to channel summary if called from memmory mode.
2022-10-28 08:30:46 +02:00
74ab9cbbf6
Fixed voice menu, it will now display as: Voice off, Voice Beep, or Voice 1 through 3.
2022-10-28 08:30:46 +02:00
206e827aeb
Implement three levels of verbosity
...
Implemented the three levels of verbosity, besides none and beep:
1. Low: menus will speak but frequency and channel changes will just beep.
2. Medium: everything will speak but extra descriptions are eliminated except where ambiguity might occur.
3. High: Like medium except extra descriptions are spoken unles rapidly keying through menus in which case only the value will be spoken.
2022-10-28 08:30:46 +02:00
16abf941d4
Added Voice menu to settings.
...
The Voice menu has two options:
Level: off, beep, level 1, level 2, level 3,
Phonetic: off, on.
2022-10-28 08:30:46 +02:00
2102c15602
Hook up voice prompts in main startup routine
...
1. Call vpCacheInit() from the main startup routine.
2. If voice prompts are successfully loaded, and the hash key is held down, and the vp level is less than low, vp level is set to high.
3. If voice prompts are not loaded, and the level was set to something higher than beep, it is set to beep so that at a minimum, the user gets some beep feedback. If it was already set to off, nothing is changed.
2022-10-28 08:30:46 +02:00
62ae110a19
Added more to the channel/vfo summary for M17 and DMR.
...
1. added contact name,
2. added timeslot and color code.
3. added new voice prompts.
2022-10-28 08:30:46 +02:00
07d971ecfb
Hooked up repeat last voice prompt and summary to f1 if vpLevel is higher than beep.
2022-10-28 08:30:46 +02:00
8fab0b1e8c
Added vpLevel and vpPhoneticSpell to settings.
...
These take up 4 bits with 4 bits reserved for on the fly voice rate.
Not yet hooked up to menus.
2022-10-28 08:30:46 +02:00
50b29065ae
Adjusted long comment to wrap.
2022-10-28 08:30:46 +02:00
a5985dd55d
Added custom dictionary support for common words used in Channel names and contact names (ported from AccessibleGD77).
...
Added 9 custom word prompts. (One unused).
2022-10-28 08:30:46 +02:00
537a20eef5
Add prompts for brightness and squelch
...
Added support for announcing macros for adjusting brightness and squelch.
Added voiceprompt for squelch.
2022-10-28 08:30:46 +02:00
e74eccfffd
Added support for macro 6 announcing the cycling of radio mode.
2022-10-28 08:30:46 +02:00
d19e0d57ec
Added bandwidth and power announcements
...
Added bandwidth and power announcement for both macro and summary.
Added new voice prompts for bandwidth and power.
2022-10-28 08:30:46 +02:00
5a8044437c
Added CTCSS tone announcement to channel/vfo summary.
2022-10-28 08:30:46 +02:00
68926a72c4
Began work on the macros screen.
...
Toggling tone or enabling/disabling (macros 1 and 2) now supported.
Added new voice prompt for tone.
2022-10-28 08:30:46 +02:00
4098baa5a8
When speaking a menu and its value, only speak the name if a prompt is not in progress.
2022-10-28 08:30:46 +02:00
0ab179a701
use constant for string length for prior menu name and value.
...
Also reset prior value if name changes.
2022-10-28 08:30:46 +02:00
0a410fe336
Speak only when values change
...
Changed the function which determines if we should speak the new menu
item to make it also check if a menu item's value changes.
2022-10-28 08:30:46 +02:00
39cbfbe66f
Added a function which will look up a string in our string table and, if found, returns its offset and use it in order to locate the equivalent voice prompt.
...
Added logic to see if the current menu index has changed.
Added a function to speak the current menu item and its value if the menu index changes.
2022-10-28 08:30:46 +02:00
e691f37f88
Extracted and added a few more strings to the string table and created voice prompts for those strings.
2022-10-28 08:30:46 +02:00
46fab4642b
Make VFO accessible through voice prompts
...
Added calls to various voice prompt functions in the UI so that VFO is basically accessible.
1. When entering digits in VFO mode.
2. When digits exceed 3, point will be announced.
3. When user enters sufficient digits to move from RX field to TX field, or if user presses Enter to move to TX field.
4. When both rx and tx frequencies have been completed.
2022-10-28 08:30:46 +02:00
af74978600
If voice prompts can't be loaded then set vpLevel to vpNone.
2022-10-28 08:30:46 +02:00
ad07a517bc
Added voice prompt verbosity levels: off, beep, low, medium and high.
2022-10-28 08:30:46 +02:00
d68f01ffbc
Insert voice prompt utility function in UI code
...
Began calling voice prompt utility functions from places such as:
1. arrowing up and down in VFO mode (read new frequencies)
2. up and down in memory mode: read new channel name.
3. up and down in VFO input mode: announce receive or transmit,
4. when starting to enter a frequency: announce receive and the first digit.
2022-10-28 08:30:46 +02:00
27d1329ac7
Added a few prompts for M17 and DMR used on the UIMode screen but which do not need strings in the strings table as they are displayed in abbreviated form.
2022-10-28 08:30:46 +02:00
2373d8374c
more string extraction. moved prompt_fm and prompt_dmr to string table as they are needed by the UI.
2022-10-28 08:30:46 +02:00
fd5c5b4979
Got voice prompts code compiling. (certain blocks are commented out until we get codec2 decode figured out).
2022-10-28 08:30:46 +02:00
901db10c87
Next round of changes to add literals to string table and voice prompt wordlists.
2022-10-28 08:30:46 +02:00
bc5289453e
Round one of adding strings to string table and wordlists.
2022-10-28 08:30:46 +02:00
10ddd88f69
Cleanup code to adhere more to coding standard.
...
Got it compiling.
2022-10-28 08:30:46 +02:00
c0a04c5564
Adding voicePromptUtils.h/c which will contain the actual functions which call the building blocks to speak radio functions.
2022-10-28 08:30:46 +02:00
cdda2a5b90
Added voice prompt for channel.
2022-10-28 08:30:46 +02:00
af76afb521
Added vpQueueFrequency to speak frequency with proper handling of decimal place and addition of MHz.
2022-10-28 08:30:46 +02:00
88619dc682
Refactored symbol handling to clean up code.
2022-10-28 08:30:46 +02:00
1d7432ae3b
Reworked all symbols so that they can be processes via a lookup rather than by individual tests. Added more flags so we can optionally speak different categories of symbols.
2022-10-28 08:30:46 +02:00
d5568b8ab3
Adding voice prompts skeleton.
2022-10-28 08:30:46 +02:00
7e660f2fe8
Starting to refactor UI to use a string table in preparation for adding voice prompt support.
2022-10-28 08:30:46 +02:00
bf8a257c2b
Implemented reference counting inside codec2 management module, allowing for multiple calls of codec_init()
2022-10-28 08:30:46 +02:00
44abedce4c
Changed stack size of codec2 thread when running under linux to prevent stack smashing from codec2_decode. Stack size is set to the default value from the OS
2022-10-28 08:30:46 +02:00
58c1c3bbd6
Implemented circular buffer mode in linux output stream driver.
2022-10-28 08:30:46 +02:00
b3a861a47c
Usability improvements
...
Remove DMR from macro menu until we actually support it.
Remove print of M17 source callsign
Bank and channel visualization is more compact to make room for
additional data on a single screen.
Refactor mode screen to fit all data into a single screen.
2022-10-28 08:30:46 +02:00
37c9e0dbc3
macro menu mode change: catch invalid states
2022-10-18 14:07:48 +02:00
25d6c20ef0
Reorder macro menu functions
...
Swapped brightness and tone increase and decrease to be more intuitive.
2022-09-27 22:35:50 +02:00
5ff74aaaa7
Add FM tone decrease Macro
...
Reorganize macro menu buttons to enable tone decrease and eliminate
channel save as it was not yet implemented.
2022-09-27 22:35:50 +02:00
d395afd370
Fix missing splashscreen
...
Fix a bug where the splashscreen was not showing on radios with GPS
enabled.
2022-09-27 22:35:50 +02:00
6a9ce50f6b
Usability improvements
...
Remove DMR from macro menu until we actually support it.
Remove print of M17 source callsign
Bank and channel visualization is more compact to make room for
additional data on a single screen.
Refactor mode screen to fit all data into a single screen.
2022-09-27 22:35:50 +02:00
91d608cc6b
Small reorganization of threads and tasks
2022-09-08 09:11:00 +02:00
94baec6981
Changed the granularity of VFO frequency input mode from tens to hundreds: this reduces the number of digits to be inserted to seven and avoids the line to overflow towards the bottom
2022-09-02 07:54:32 +02:00
b5fc9b252d
Moved code of compensating filter for MDx PWM-based DAC to a dedicated class.
2022-08-28 12:17:04 +02:00
d11bb903b1
Made public the M17Modulator.stop() function, added macro to enable the transmission of an M17 EOT frame (disabled by default).
2022-08-28 12:00:36 +02:00
fa33f15417
Implemented M17 EOT marker
2022-08-28 11:59:31 +02:00
a22aceb576
Reorganized code for M17 transmission: removed M17Transmitter class, use M17FrameEncoder to assemble LSF and data frames, modified API of M17Modulator class.
2022-08-28 11:59:31 +02:00
48cd81ee7c
Changed to 'static' some variables inside UI module
2022-08-28 11:49:10 +02:00
b26d783429
Small optimisation of UI management: perform an update and render of the graphics only when necessary
2022-08-28 11:49:03 +02:00
ea6863e077
UI: Add Ubuntu font license text
2022-08-15 08:17:44 +02:00
a5a0de1428
UI: Build time font selection
2022-08-15 08:17:37 +02:00
e24007b743
UI: Add additional font, Ubuntu Regular
2022-08-15 08:12:16 +02:00
e2137eae23
Implemented CRC of persistent data (settings and VFO state) in MDx devices
2022-08-11 17:02:04 +02:00
84d66ca1b3
Changed parameters of ui_pushEvent(): now it accepts event type and payload instead of a single element, this cleans the code up a little bit
2022-08-10 18:05:02 +02:00
f1dbfbfe1f
Fixed compilation warnings
2022-08-04 22:22:56 +02:00
5ebdb36ffb
Resetting M17 frame decoder when demodulator transitions from unlocked to locked state
2022-07-22 22:54:57 +02:00
9c2091c060
Changed M17 RX behaviour so that received stream data is forwarded to codec2 decode only when a full valid LSF is received.
2022-07-21 22:14:55 +02:00
54af6bf429
Made decode functions in M17Viterbi class return the final decode cost
2022-07-21 22:03:48 +02:00
1bb574c4fa
Reorganised graphics module and moved graphics.h from interfaces to core folder
2022-07-18 21:30:43 +02:00
073440ef1a
Removed unnecessary build dependencies when project is being configured for linux target
2022-07-18 18:48:26 +02:00
dea0ecbf29
fix double-free when codec_terminate is called multiple times
2022-07-17 22:28:03 +02:00
bb5891aca5
Fixed setPixel swapping red and blue
2022-07-11 15:54:17 +02:00
844e0619e2
Fixed bug in check for M17 phase inversion causing MD3x0 UHF not to demodulate the signal anymore
2022-07-11 15:35:59 +02:00
eda835ee0b
Tightened locking conditions for M17 demodulator: now lock is acquired only when there is an exact syncword match (zero hamming distance)
2022-07-11 10:37:58 +02:00
Silvano Seva
Niccolò Izzo
vk7js
tarxvf
Jacob McSwain
edgetriggered
Alain Carlucci
AlexandreRouma