Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: plurals and indefinite articles in German TTS, plus #3920

Merged

Conversation

mha1
Copy link
Contributor

@mha1 mha1 commented Aug 10, 2023

fix for no voice output for unit radian and fix for missing LUA constant for unit dbm

German TTS:

  • fixed use of plurals and indefinite articles depending on unit (radio and LUA)
  • use case: playValue(telem_sensor_capacity) -> wrong output, not using plurals where necessary
  • use case: LUA playNumber for various units, e.g. not using plural for two minutes ("zwei Minute" -> "zwei Mintuten")

no voice output for unit radian, all languages:

  • fixed reference to non-existing wav file radian0.wav/radian1.wav to existing rad0.wav/rad1.wav
  • use case LUA playNumber(n, UNIT_RADIANS, no outout of unit for all languages

missing LUA constant for unit dbm:

  • added LUA constant UNIT_DBM
  • use case LUA playNumber(n, UNIT_DBM), luac fails.

- fixed no LUA constant for unit dbm
- fixed use plurals and indefinite articles in German TTS
@raphaelcoeffic raphaelcoeffic changed the title Fix plurals and indefinete articels in German TTS, plus ... Fix plurals and indefinete articles in German TTS, plus ... Aug 24, 2023
@raphaelcoeffic raphaelcoeffic changed the title Fix plurals and indefinete articles in German TTS, plus ... Fix plurals and indefinite articles in German TTS, plus ... Aug 24, 2023
@pfeerick
Copy link
Member

Actually, your radian fix would break EdgeTX/edgetx-sdcard-sounds@363b38b, so I'll need to now revert that, as this will make old packs work without changes.

I'll assume you have tested the audio since it's native language for your 😁

@pfeerick pfeerick changed the title Fix plurals and indefinite articles in German TTS, plus ... fix: plurals and indefinite articles in German TTS, plus Aug 26, 2023
@pfeerick pfeerick added the bug 🪲 Something isn't working label Aug 26, 2023
@pfeerick pfeerick added this to the 2.10 milestone Aug 26, 2023
@pfeerick pfeerick merged commit c2bebfb into EdgeTX:main Aug 26, 2023
@mha1
Copy link
Contributor Author

mha1 commented Aug 26, 2023

welcome back. why does the radian fix break etx?

tested? it compiled ok. just kidding, I did test it.

@pfeerick
Copy link
Member

pfeerick commented Aug 26, 2023

Um... have a look at the commit perhaps? rad#.wav -> radian#.wav in the sound pack after that commit... 🤭

@mha1
Copy link
Contributor Author

mha1 commented Aug 26, 2023

I did this on purpose because there is no rad#.wav files but radian#.wav in SOUNDS/SYSTEM.

@mha1
Copy link
Contributor Author

mha1 commented Aug 26, 2023

Sorry, actually it's the other way round. Current SOUNDS/SYSTEM audio files have rad#.wav files, but audio.cpp is looking for 'radian'. This is the reason why there is no spoken unit radians in any language. I changed audio.cpp to look for 'rad' instead of 'radian' to match the real file names.

@pfeerick
Copy link
Member

pfeerick commented Aug 27, 2023 via email

@mha1
Copy link
Contributor Author

mha1 commented Aug 27, 2023

gotcha, wasn't looking at the sdcard-sounds commit. you fixed the problem at the other end.

@mha1
Copy link
Contributor Author

mha1 commented Aug 27, 2023

and sorry for my tunnel vision. always feeling guilty I misread you as my fix needs to be reverted. reverting any of the two would do but yeah, mine is backwards compatible.

@pfeerick
Copy link
Member

pfeerick commented Aug 27, 2023 via email

3djc pushed a commit that referenced this pull request Sep 1, 2023
- fixed no LUA constant for unit dbm
- fixed use plurals and indefinite articles in German TTS
pfeerick added a commit to EdgeTX/edgetx-sdcard-sounds that referenced this pull request Oct 27, 2023
This reverts commit 363b38b.

Is no longer necessary after EdgeTX/edgetx#3920
@pfeerick pfeerick deleted the PR_Chore_cleanup_playValue_and_german_plurals branch October 27, 2023 08:44
pfeerick pushed a commit that referenced this pull request Oct 27, 2023
- fixed no LUA constant for unit dbm
- fixed use plurals and indefinite articles in German TTS
MRC3742 pushed a commit to MRC3742/edgetx that referenced this pull request Dec 22, 2023
- fixed no LUA constant for unit dbm
- fixed use plurals and indefinite articles in German TTS
pfeerick added a commit to ulfhedlund/edgetx-sdcard-sounds that referenced this pull request Feb 14, 2024
https://github.com/EdgeTX/edgetx/blob/07e0bfa4bd77c1b49ad38f3c6f82a8b2ae15a5c7/radio/src/audio.cpp#L167

Firmware and sound pack were out of sync prior to EdgeTX/edgetx#3920 and firmware was updated to use the filename used in the sound pack since the sound pack is less likely to be updated.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🪲 Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants