Commit Graph

299 Commits

Author SHA1 Message Date
Silvano Seva ae8bba88b6 Updated voice prompt for UTC timezone to support also half hour values, thanks to Joe VK7JS. 2022-10-31 18:04:08 +01:00
Silvano Seva ce1dc202ae Added support for half-hour timezones, moved datetime_t struct fields from bitfields to full 8-bit variables, added function to adjust the off-range fields of a datetime_t struct. 2022-10-31 11:41:54 +01:00
Silvano Seva f26afc42e5 Small reorganization and cleanup of splash screen code, fixed bug causing audio path for voice prompts never being released at vp end 2022-10-31 08:41:31 +01:00
vk7js d5d49fbbb2 Refactored to decouple vp_init from speaking of splash screen. 2022-10-31 08:41:31 +01:00
vk7js 438c224a2a Fixed announcement of initial digit when entering rx freq in VFO mode. It once worked but somehow got clobbered along the way. 2022-10-31 08:41:31 +01:00
vk7js 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
vk7js f61313638f Cancel function key latch if ptt is pressed (without playing the latch off beep). 2022-10-31 08:41:31 +01:00
vk7js 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
vk7js 7cc287643e Added Broadcast to string table for use with voice prompts. Cleaned up hash key announcement. 2022-10-28 09:47:43 +02:00
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js dc285ab023 Moved beep definitions into header beeps.h. 2022-10-28 08:30:47 +02:00
vk7js 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
vk7js 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
vk7js 91d19e809e Fixed issue of menus not reading at vp level 1. 2022-10-28 08:30:47 +02:00
vk7js 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
vk7js 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
vk7js 70ba324ef3 Fixed menu announcements so that menu item names are always spoken. 2022-10-28 08:30:47 +02:00
vk7js 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
vk7js f8bfc7fb13 Added mechanism for specifying exactly what is read in the summary. 2022-10-28 08:30:47 +02:00
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 9a250ec994 Added speech feedback to settings/display/timer menu. 2022-10-28 08:30:46 +02:00
vk7js 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
Silvano Seva e5de5b96a3 Fixed announcement of power level both in settings menu and channel summary 2022-10-28 08:30:46 +02:00
vk7js 0452bd0f10 Added voice feedback for setting the time and date. 2022-10-28 08:30:46 +02:00
vk7js ac7a2b94a9 Adjusted vp_anounceBuffer to distinguish between a callsign buffer and a regular name buffer. 2022-10-28 08:30:46 +02:00
vk7js a1d782b16c Fixed backspacing text input so that it reads the char backspaced correctly. 2022-10-28 08:30:46 +02:00
vk7js 11132e4949 Speak original callsign if escape is pressed to cancel edit from m17settings edit mode. 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 5ed0121780 Fixed announcement of channel number/name in summary and when changing channel. 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 04e7f044ff Added announcement of Brightness when changing from the Settings/Display menu. 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 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
vk7js 8cb9272881 Added vp_announceScreen to automatically announce informational screens such as VFO, channel, ... 2022-10-28 08:30:46 +02:00
Silvano Seva 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
Silvano Seva 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
Silvano Seva 99408a5455 Added function to announce generic on/off toggle settings. 2022-10-28 08:30:46 +02:00
Silvano Seva 33867ec009 Fixed speaking of voice prompt level when changing from the menu. 2022-10-28 08:30:46 +02:00
Silvano Seva a40cba2430 Added missing entry in VP table and fixed off-by-one for string table lookups. 2022-10-28 08:30:46 +02:00
Silvano Seva cf842306c2 Partially refactored UI code 2022-10-28 08:30:46 +02:00
Silvano Seva 42b262c437 Refactored voicePromptUtils.h and voicePromptUtils.c 2022-10-28 08:30:46 +02:00
Silvano Seva df5341e103 Refactored voicePrompts.h, aligned function names of voice prompt API to OpenRTX coding style 2022-10-28 08:30:46 +02:00
Silvano Seva 5840f459fa Renamed UIStrings.h/.c to ui_strings.h/.c and refactored their content 2022-10-28 08:30:46 +02:00
Niccolò Izzo 1f71789a9d Apply clang-format 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 6e4af40346 hooked up warning messages. May need tweaking.
Msg may repeat on keyup.
2022-10-28 08:30:46 +02:00
vk7js 7cd3f1d49a Added announceSettingsTimeDate and hooked up to f1 on that screen. 2022-10-28 08:30:46 +02:00
vk7js b1c07e3d3f Added speech for About screen. 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 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
vk7js c24af62000 added more to GPS summary and fixed a couple of warnings. 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js e74eccfffd Added support for macro 6 announcing the cycling of radio mode. 2022-10-28 08:30:46 +02:00
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 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
vk7js 901db10c87 Next round of changes to add literals to string table and voice prompt wordlists. 2022-10-28 08:30:46 +02:00
vk7js 10ddd88f69 Cleanup code to adhere more to coding standard.
Got it compiling.
2022-10-28 08:30:46 +02:00
vk7js d5568b8ab3 Adding voice prompts skeleton. 2022-10-28 08:30:46 +02:00
vk7js 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
Niccolò Izzo 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
tarxvf 37c9e0dbc3 macro menu mode change: catch invalid states 2022-10-18 14:07:48 +02:00
Niccolò Izzo 25d6c20ef0 Reorder macro menu functions
Swapped brightness and tone increase and decrease to be more intuitive.
2022-09-27 22:35:50 +02:00
Niccolò Izzo 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
Niccolò Izzo 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
Silvano Seva 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
Silvano Seva 48cd81ee7c Changed to 'static' some variables inside UI module 2022-08-28 11:49:10 +02:00
Silvano Seva 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
Silvano Seva 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
Silvano Seva f1dbfbfe1f Fixed compilation warnings 2022-08-04 22:22:56 +02:00
Silvano Seva fa58b99c9e Fixed text blink in settings restore menu 2022-07-11 10:09:18 +02:00
Silvano Seva 5f40ceceb3 Added field to state data structure containing the current operating state of the device. Implemented clean shutdown of all the threads. 2022-07-02 10:47:19 +02:00
Silvano Seva 4528e102a2 Moved the UI event queue inside the UI engine itself, UI FSM update now becomes a periodic task 2022-07-02 10:28:28 +02:00
Silvano Seva 40337e7c97 Removed radio model name from UI info page 2022-07-02 10:28:28 +02:00
Silvano Seva 2fc89bf583 Renamed 'HAS_GPS' and 'HAS_RTC' to, respectively, 'GPS_PRESENT' and 'RTC_PRESENT' 2022-07-02 10:28:28 +02:00
Silvano Seva 6d10f52b5b Clean termination of all the threads on device shutdown 2022-07-02 10:28:28 +02:00