whole new family (#23157)

* family two

* more volume

* repeating dm sound

* update tests
old-commit-hash: 1501c2e376
commatwo_master
Adeeb Shihadeh 3 years ago committed by GitHub
parent cabd6c6b95
commit 9c702c779e
  1. 4
      selfdrive/assets/sounds/disengage.wav
  2. 4
      selfdrive/assets/sounds/engage.wav
  3. 4
      selfdrive/assets/sounds/prompt.wav
  4. 4
      selfdrive/assets/sounds/prompt_distracted.wav
  5. 4
      selfdrive/assets/sounds/refuse.wav
  6. 4
      selfdrive/assets/sounds/warning_immediate.wav
  7. 4
      selfdrive/assets/sounds/warning_soft.wav
  8. 2
      selfdrive/hardware/tici/hardware.h
  9. 2
      selfdrive/ui/soundd/sound.h
  10. 16
      selfdrive/ui/tests/test_soundd.py

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4b1294c17f2c19a390d1d5f09c0ef887496e46b5494fe7e94289c5b536e1e014 oid sha256:1f061777d66d8d856a5fcb17378416f959088885ed770181355195ad15de881b
size 155804 size 68628

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ad87ff4f54b3b058a00d6dd2142b881c583be5124940cd90ec91a6c714ec4567 oid sha256:6b54a85cc09b8ee79fce23d48209205d2e70510eed4c5a86fa400fe3f7caebfd
size 92172 size 63120

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b9e126f394f2412a6edda83fa739d472e4bb921300e5eeecb2e3e122cd4e8f8d oid sha256:c9ffc442480bcb415a0ca2940d06610f4b12ab463aede0deca6f50c984b64234
size 152148 size 64634

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:91d9cec33aca78464627855696c248d042417da1d8ff6f6e947c35f003e7a334 oid sha256:1810ad0418ac234f02dec005883c8f0e1c3e0e5ece7a3157803c5a66cb8e5adc
size 64702 size 85662

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b6c55e0295392a52a9432e0a4e383fc548deca610b3c8b11e2ee8a1c5e1e72d0 oid sha256:4af81cbf1d96a42cc351878b015298aee82874b46baaf1a615ca91ec36c0ced6
size 75610 size 83228

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b5e3b2d20d604902eb19fb773bce89fa6fdc9a7e0610ec6ac729fd1512455f98 oid sha256:7777a27d12fb0a6f3bdd1175ea7b6b9a6bf3bd63e245da1414eb3a4bb12eafaf
size 133412 size 153644

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cc0b574afbee712a971b7347dc01eadaf824b14b7365ae6b3e0639de8917a1cd oid sha256:67e636d072703e6b1233a12344c0a6304fd43d64dbb31c66b71c2c8870a339c1
size 76108 size 153764

@ -10,7 +10,7 @@
class HardwareTici : public HardwareNone { class HardwareTici : public HardwareNone {
public: public:
static constexpr float MAX_VOLUME = 0.9; static constexpr float MAX_VOLUME = 0.9;
static constexpr float MIN_VOLUME = 0.15; static constexpr float MIN_VOLUME = 0.3;
static bool TICI() { return true; } static bool TICI() { return true; }
static std::string get_os_version() { static std::string get_os_version() {
return "AGNOS " + util::read_file("/VERSION"); return "AGNOS " + util::read_file("/VERSION");

@ -13,7 +13,7 @@ const std::tuple<AudibleAlert, QString, int> sound_list[] = {
{AudibleAlert::PROMPT, "prompt.wav", 0}, {AudibleAlert::PROMPT, "prompt.wav", 0},
{AudibleAlert::PROMPT_REPEAT, "prompt.wav", QSoundEffect::Infinite}, {AudibleAlert::PROMPT_REPEAT, "prompt.wav", QSoundEffect::Infinite},
{AudibleAlert::PROMPT_DISTRACTED, "prompt_distracted.wav", 0}, {AudibleAlert::PROMPT_DISTRACTED, "prompt_distracted.wav", QSoundEffect::Infinite},
{AudibleAlert::WARNING_SOFT, "warning_soft.wav", QSoundEffect::Infinite}, {AudibleAlert::WARNING_SOFT, "warning_soft.wav", QSoundEffect::Infinite},
{AudibleAlert::WARNING_IMMEDIATE, "warning_immediate.wav", 10}, {AudibleAlert::WARNING_IMMEDIATE, "warning_immediate.wav", 10},

@ -15,14 +15,14 @@ AudibleAlert = car.CarControl.HUDControl.AudibleAlert
SOUNDS = { SOUNDS = {
# sound: total writes # sound: total writes
AudibleAlert.none: 0, AudibleAlert.none: 0,
AudibleAlert.engage: 197, AudibleAlert.engage: 184,
AudibleAlert.disengage: 230, AudibleAlert.disengage: 186,
AudibleAlert.refuse: 189, AudibleAlert.refuse: 194,
AudibleAlert.prompt: 230, AudibleAlert.prompt: 184,
AudibleAlert.promptRepeat: 520, AudibleAlert.promptRepeat: 487,
AudibleAlert.promptDistracted: 187, AudibleAlert.promptDistracted: 508,
AudibleAlert.warningSoft: 499, AudibleAlert.warningSoft: 471,
AudibleAlert.warningImmediate: 496, AudibleAlert.warningImmediate: 470,
} }
def get_total_writes(): def get_total_writes():

Loading…
Cancel
Save