c6a40a9625
Ensure proper syncronization between codec2 decode thread and output stream when the former is started
2022-10-31 08:41:31 +01:00
0692bea269
Partial fix for speaker pop when a voiceprompt begins
2022-10-31 08:41:31 +01:00
5ee3a2e9f0
Reorganised codec_pushFrame and codec_popFrame functions for true non-blocking behaviour
2022-10-31 08:41:31 +01:00
9d021b7557
Fixed bug in M17 modulator and demodulator making them not releasing their audio paths on termination thus locking up the thread on M17 mode re-entering.
2022-10-31 08:41:31 +01:00
12932db37c
Refinement to last checkin: only clear function latch without beep for PTT, not for open squelch.
2022-10-31 08:41:31 +01:00
f61313638f
Cancel function key latch if ptt is pressed (without playing the latch off beep).
2022-10-31 08:41:31 +01:00
793a76d1ea
When PTT is pressed, stop any voice prompt or beep in process.
2022-10-31 08:41:13 +01:00
f9228ec23c
Halved the additional output gain for MD3x0 radios inside codec2 module to avoid sound distortion when voice prompts are played.
2022-10-28 09:47:47 +02:00
71a15c2cfb
Fixed bug in voice prompts audio path management causing no audio output in case of rapid key sequences. Improved managment of audio path release in voice prompts module.
2022-10-28 09:47:47 +02:00
2c1401de86
Moved voiceprompts audio management to audio path system
2022-10-28 09:47:47 +02:00
4411e0f3e8
Implemented audio path management API in GDx and Mod17 audio drivers, removed old audio management API
2022-10-28 09:47:47 +02:00
21481072e7
Moved audio management in M17 opmode handler to audio path system
2022-10-28 09:47:47 +02:00
edf864337a
Moved audio management in FM opmode handler to audio path system
2022-10-28 09:47:47 +02:00
3c65f8834a
Added to radio driver interface two functions to enable and disable AF output towards the speaker
2022-10-28 09:47:47 +02:00
25caffde6b
Linked audio path manager with low-level interface API to setup and release the audio paths. Minor refactoring of audio path manager code.
2022-10-28 09:47:47 +02:00
6d9ad2b947
Implementation of audio path manager
2022-10-28 09:47:47 +02:00
a7521ccc5f
Added functions to setup, release and check compatibility of audio paths to audio.h
2022-10-28 09:47:47 +02:00
ad3390696e
Moved audio_path header file from interfaces to core, moved enums of audio source, sink and priority to audio.h
2022-10-28 09:47:47 +02:00
ec6519425c
Added call to vp_announceCTCSS to macro moni+2 branch because increasesto code were not speaking, only decreases.
2022-10-28 09:47:47 +02:00
5fb11322ac
Code cleanup and refactoring of voice prompts code
2022-10-28 09:47:47 +02:00
c7c9c3afc5
Fixed issue of m17 destination not being spoken in summary (long hold f1) if set to broadcast.
2022-10-28 09:47:47 +02:00
7cc287643e
Added Broadcast to string table for use with voice prompts. Cleaned up hash key announcement.
2022-10-28 09:47:43 +02:00
3ea4431b35
Added support for the speaking of callsign when you hit hash key.
...
Fixed issue of callsign and M17 settings strings being in the wrong order in the string table causing the voice prompts to be switched.
2022-10-28 08:30:47 +02:00
c2f349c93d
More improvements to auto GPS screen readout
...
Read fix quality and type changes.
Read satellite count changes.
Reduced minimum time between readouts to 8 seconds.
say km/h instead of kmh for speed.
2022-10-28 08:30:47 +02:00
cf45f7ee81
Fixed missing gps updates due to recording an update even when one wasn't detected, this meant countdown would restart errantly.
2022-10-28 08:30:47 +02:00
dbc86ea392
Give leeway for nw/ne/sw/se within a few degrees like n/e/s/w.
2022-10-28 08:30:47 +02:00
8c9f034b93
Adjusted sensitivity of auto announcement for GPS data. Now only announce for altitude changes of at least 5m, speed changes of at least 1 KM/h and direction changes of at least 1 degree.
2022-10-28 08:30:47 +02:00
7cc0c6455c
Now better handle directions, and speak prior to other info as most important.
...
Handle 8 cardinal points north, east, south, west, north east, south east, south west and north west.
2022-10-28 08:30:47 +02:00
4ba9b3ec34
Fixed memory overrun caused by buffer being too small.
...
Also fixed satellite count which got broken when I changed the GPS info flags to add more.
2022-10-28 08:30:47 +02:00
fbc4e380b3
Moved latitude and longitude to after direction in announcement because these are less meaningful than the other parameters.
2022-10-28 08:30:47 +02:00
f1639159bf
fixed issue of auto announcement clobbering manual request for summary.
...
Fixed a couple of issues with direction announcement.
2022-10-28 08:30:47 +02:00
4edef678c1
fixed south and west.
2022-10-28 08:30:47 +02:00
4e1689df51
Cleaned up GPS direction info so we say north, east, south, west when the tmg is within a close enough range.
2022-10-28 08:30:47 +02:00
5829df6dd3
Now read speed, altitude and direction changes on the GPS screen automatically with a forced minimum of 10 seconds between readings to avoid a bit of hysterisis .
...
Can still get full summary on long hold f1.
2022-10-28 08:30:47 +02:00
3ba094f633
Minor cleanup of beep code.
2022-10-28 08:30:47 +02:00
104f18d9e9
Added vp_beepSeries to play a melody.
...
Now play melody on power up if vp level set to Beep.
2022-10-28 08:30:47 +02:00
dc285ab023
Moved beep definitions into header beeps.h.
2022-10-28 08:30:47 +02:00
d8fa0465fb
Fixed following bug:
...
1. hit enter to go to banks menu.
2. hit escape.
3. hit enter again and radio does not announce banks menu because it was the last menu active.
Now reset the menu tracking variables on Escape.
2022-10-28 08:30:47 +02:00
da7dfe63b2
Avoid calling beep if we know the voice will announce something since it will be
...
canceled and most likely generate an unwanted click.
2022-10-28 08:30:47 +02:00
91d19e809e
Fixed issue of menus not reading at vp level 1.
2022-10-28 08:30:47 +02:00
eb89f5a55a
Now play generic beep on any key press as well as different tones when navigating the menu, when menu item wraps, and when function key latches and unlatches if voice prompt level is set to beep.
2022-10-28 08:30:47 +02:00
a1e302b19d
Got beeps working so long as you don't have ctcss set.
...
Reduced durations to sensible values.
2022-10-28 08:30:47 +02:00
3c20a5282e
Fixed nasty popping between every voice prompt and after every silence.
...
When retrieving the codec2 data, ensure it is an exact multiple of codec2 frames and always discard the very last frame.
2022-10-28 08:30:47 +02:00
80f6fe2289
Stopping audio codec at the and of each voice prompt
2022-10-28 08:30:47 +02:00
0298aa897b
Implemented beeps on MD-UV3x0 platform driver.
2022-10-28 08:30:47 +02:00
32fd910e64
Fixed warnings.
2022-10-28 08:30:47 +02:00
70ba324ef3
Fixed menu announcements so that menu item names are always spoken.
2022-10-28 08:30:47 +02:00
b39ab4f0d5
Added "Used heap" to voice prompts for Info screen.
2022-10-28 08:30:47 +02:00
6a56fe3d3a
Fixed satellite count readout.
2022-10-28 08:30:47 +02:00
a71a06c57a
1. Renamed beepTick to beep_tick for consistency.
...
2. Made beep_tick static.
3. call beep_tick from top of vp_tick because in its prior location it might
not actually be called.
2022-10-28 08:30:47 +02:00
a081964ac8
Fixed Backup and Restore menus as follows:
...
1. Fixed issue of voice not reading backup or restore messages but instead
stuttering indefinitely.
2. Can now press cancel to exit the menu so long as you haven't pressed PTT to
start the process.
2022-10-28 08:30:47 +02:00
f8bfc7fb13
Added mechanism for specifying exactly what is read in the summary.
2022-10-28 08:30:47 +02:00
495b721231
Fixed setting of CTCSS and tone so that one can rapidly change tone without hearing the word "tone", "receive tone," "transmit tone" etc prior to each tone value.
2022-10-28 08:30:47 +02:00
d622080cfe
Do a better job of determining when to say Menu.
...
In info screen, avoid very rapid announcements of battery fluctuations.
For same menu name, only read value changes once per second for automatic reading.
2022-10-28 08:30:47 +02:00
c9ce41a999
Initial beep implementation.
...
Function latch will play high beep when latched and low beep when latch times out.
Menus will play a high beep when you arrow through them and a low beep when you reach the first item.
All keys should play a generic beep sound but this has not been implemented yet.
2022-10-28 08:30:46 +02:00
95b7707d87
Implemented speech feedback for setting UTC timezone.
...
Added speaking of negative sign for vp_queueInteger (plus is assumed if not negative).
2022-10-28 08:30:46 +02:00
9a250ec994
Added speech feedback to settings/display/timer menu.
2022-10-28 08:30:46 +02:00
0138d843b1
Improved time/date entry:
...
1. Now give format as dd/mm/yy before date and hh:mm before time.
2. Say the slash immediately after the 2nd and 4th digits are entered in the date and the colon immediately after the 2nd digit of the time.
3. Removed speaking of the 2nd colon in the time since seconds input is disallowed.
2022-10-28 08:30:46 +02:00
e5de5b96a3
Fixed announcement of power level both in settings menu and channel summary
2022-10-28 08:30:46 +02:00
0452bd0f10
Added voice feedback for setting the time and date.
2022-10-28 08:30:46 +02:00
ac7a2b94a9
Adjusted vp_anounceBuffer to distinguish between a callsign buffer and a regular name buffer.
2022-10-28 08:30:46 +02:00
a1d782b16c
Fixed backspacing text input so that it reads the char backspaced correctly.
2022-10-28 08:30:46 +02:00
11132e4949
Speak original callsign if escape is pressed to cancel edit from m17settings edit mode.
2022-10-28 08:30:46 +02:00
c0eba3866e
Added voice feedback for the M17 Settings Menu:
...
1. Added vp_announceBuffer to speak a prompt, edit mode and string buffer.
2. Added logic to the vp_announceScreen for m17Settings read-only mode.
3. Added logic for handling edit mode.
4. Removed vpCaps flag from several places because it is irrelevant when input only supports caps.
2022-10-28 08:30:46 +02:00
579ce7baa5
Removed the word "banks" from channel summary since name of bank or "all channels" is sufficient by itself.
2022-10-28 08:30:46 +02:00
5ed0121780
Fixed announcement of channel number/name in summary and when changing channel.
2022-10-28 08:30:46 +02:00
30e8671044
If there is no GPS fix, do not announce lat, long, ...
2022-10-28 08:30:46 +02:00
9f52c98c2f
Removed unnecessary trailing zeros from lat/long announcement.
2022-10-28 08:30:46 +02:00
2139f5e391
Refactored to add generic function for speaking int settings. Made brightness and contrast prompt use this.
2022-10-28 08:30:46 +02:00
04e7f044ff
Added announcement of Brightness when changing from the Settings/Display menu.
2022-10-28 08:30:46 +02:00
1e87493183
When enter is pressed to change an item's value and edit mode is enabled, indicate this so that the user knows they can actually change the value.
...
Updated voiceprompts.vpc with edit prompt.
2022-10-28 08:30:46 +02:00
52479d10b5
Minor cleanup
...
Added Accessibility menu name to string table for voice prompt announcement.
Removed unnecessary comment.
2022-10-28 08:30:46 +02:00
9f5a45954d
When GPS is disabled, and you choose the GPS menu item, announce GPS off rather than nothing.
2022-10-28 08:30:46 +02:00
8cb9272881
Added vp_announceScreen to automatically announce informational screens such as VFO, channel, ...
2022-10-28 08:30:46 +02:00
158b38d113
Clearing buffer index and length of codec2 data when the reproduction of a voice prompt is completed
2022-10-28 08:30:46 +02:00
cad026f902
Renamed vp_clearCurrPrompt() to vp_flush(), added a vp_stop() function allowing to stop an in-progress voice prompt but without flushing the data buffer
2022-10-28 08:30:46 +02:00
d81a4220d1
Fixed voice prompt bugs
...
Fixed following voice prompt bugs:
1. Now say OpenRTX when powering on if vp enabled to let user know radio is on.
2. When switching back to VFO or channel mode from menus, now anounce VFO info or channel info.
3. When entering first digit of frequency in VFO input mode, say it.
4. Refixed issue of concatenating menus rather than clearing menu.
2022-10-28 08:30:46 +02:00
1383e3d61e
Reset prompt buffer position to zero once VP had finished speaking so that another play would replay the buffer
2022-10-28 08:30:46 +02:00
99408a5455
Added function to announce generic on/off toggle settings.
2022-10-28 08:30:46 +02:00
33867ec009
Fixed speaking of voice prompt level when changing from the menu.
2022-10-28 08:30:46 +02:00
7a78ece920
Fixed announcement of ctcss tones, now the decimal point gets announced.
2022-10-28 08:30:46 +02:00
a40cba2430
Added missing entry in VP table and fixed off-by-one for string table lookups.
2022-10-28 08:30:46 +02:00
10dcf04a92
Fixed concurrency issue inside audio codec module: after calling codec_stop() the codec resulted free before the effective shutdown of the internal thread, causing codec_decode() to lock inside the outputStream_start() in case of a fast sequence of decode - stop - decode
2022-10-28 08:30:46 +02:00
d0d603901e
Implemented storage of voice prompts data inside the binary executable image. Voice prompts data is placed in .rodata section at link time
2022-10-28 08:30:46 +02:00
cf842306c2
Partially refactored UI code
2022-10-28 08:30:46 +02:00
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
Silvano Seva
vk7js
Niccolò Izzo