sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openpilot is an open source driver assistance system. openpilot performs the functions of Automated Lane Centering and Adaptive Cruise Control for over 200 supported car makes and models.
2482 Commits
37 Branches
82 Tags
6.3 GiB
openpilot_comma/selfdrive/ui/sound.hpp

25 lines
980 B
Raw Normal View History Unescape

Sound refactor (#1589) * Soud refactor * remove files from files_common * add timeout to set_volumn * add param volume to init * done * test.cc * fix typo * add repeat param instead of loop * revert submodule * add member function currentSound * remove function create_player from class member * fix build error fix repeat * rename CHECK_RESULT to ReturnOnError * set currentSound_ before posible err * use std::map to initialize sound table cleanup cleanup cleanup fix bug in stop change paramater name * done * remove function CreatePlayer, create player in init() * resolve conflict * remove sound test * rebase * remove whitespace * Apply great review suggestion * use player's SLVolumeItf interface to set volume * use float * leave the volume control the way it is old-commit-hash: 8cacc14b3180e831ed4fa0782102f973efe8851f
5 years ago
#pragma once
#include <map>
UI: move c-capnp to c++ (#1455) * ui:move c-capnp to c++ * move Subsockets into vector * rename reader to msg include cereal/gen/cpp/log.capnp * fix some errors restore some changes restore previous * cleanup codes cleanup codes * remove unused variable alert_size * handle capnproto's enum in a robust way add break to default * switch -> std:map * use static std::map instead of switch do cleanup * fix wrong variable name * use FlatArrayMessageReader instead of custom MessageReader remove messagehelp.h Revert "use FlatArrayMessageReader instead of custom MessageReader" This reverts commit 57d8b6b1e2b4bad908246f35eb068535b1627167. use FlatArrayMessageReader instead of custom MessageReader add header file remove capnp_c lib,add kj lib include serialize.h fix remove duplicate includes old-commit-hash: ee725534bb1ae2335705562e9f1eb176e5cd91fd
5 years ago
#include "cereal/gen/cpp/log.capnp.h"
selfdrive/ui old-commit-hash: aeb2fff068e13c5d99f350a92373eb905e1a1522
5 years ago
Sound refactor (#1589) * Soud refactor * remove files from files_common * add timeout to set_volumn * add param volume to init * done * test.cc * fix typo * add repeat param instead of loop * revert submodule * add member function currentSound * remove function create_player from class member * fix build error fix repeat * rename CHECK_RESULT to ReturnOnError * set currentSound_ before posible err * use std::map to initialize sound table cleanup cleanup cleanup fix bug in stop change paramater name * done * remove function CreatePlayer, create player in init() * resolve conflict * remove sound test * rebase * remove whitespace * Apply great review suggestion * use player's SLVolumeItf interface to set volume * use float * leave the volume control the way it is old-commit-hash: 8cacc14b3180e831ed4fa0782102f973efe8851f
5 years ago
typedef cereal::CarControl::HUDControl::AudibleAlert AudibleAlert;
selfdrive/ui old-commit-hash: aeb2fff068e13c5d99f350a92373eb905e1a1522
5 years ago
QT UI: sounds (#2078) * move android into own dir * fix name * maybe this works? qt ui doesn't work on mac * fix that * pc sound works * fix pc build * lowercase * that needs to be real_arch * split into classes * fix typo in lib * Fix cycle alerts * Add qt multimedia libs to install scripts * Add ui/android folder * Fix android build * Raise exception if sound init fails * add missing return Co-authored-by: Willem Melching <willem.melching@gmail.com> Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: acd1bde496904fbc0d97f4d89e630358c4d11f7f
5 years ago
static std::map<AudibleAlert, std::pair<const char *, int>> sound_map {
// AudibleAlert, (file path, loop count)
{AudibleAlert::CHIME_DISENGAGE, {"../assets/sounds/disengaged.wav", 0}},
{AudibleAlert::CHIME_ENGAGE, {"../assets/sounds/engaged.wav", 0}},
{AudibleAlert::CHIME_WARNING1, {"../assets/sounds/warning_1.wav", 0}},
{AudibleAlert::CHIME_WARNING2, {"../assets/sounds/warning_2.wav", 0}},
{AudibleAlert::CHIME_WARNING2_REPEAT, {"../assets/sounds/warning_2.wav", 3}},
infinite sound (#2372) * make sound infinite loopable * Update selfdrive/ui/android/sl_sound.cc * fix loop * fix test threshold * more fix Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com> Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: 53bd3050ee90ca18445ddc41b837f5f927cc0c6a
5 years ago
{AudibleAlert::CHIME_WARNING_REPEAT, {"../assets/sounds/warning_repeat.wav", -1}},
QT UI: sounds (#2078) * move android into own dir * fix name * maybe this works? qt ui doesn't work on mac * fix that * pc sound works * fix pc build * lowercase * that needs to be real_arch * split into classes * fix typo in lib * Fix cycle alerts * Add qt multimedia libs to install scripts * Add ui/android folder * Fix android build * Raise exception if sound init fails * add missing return Co-authored-by: Willem Melching <willem.melching@gmail.com> Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: acd1bde496904fbc0d97f4d89e630358c4d11f7f
5 years ago
{AudibleAlert::CHIME_ERROR, {"../assets/sounds/error.wav", 0}},
{AudibleAlert::CHIME_PROMPT, {"../assets/sounds/error.wav", 0}}
};
selfdrive/ui old-commit-hash: aeb2fff068e13c5d99f350a92373eb905e1a1522
5 years ago
QT UI: sounds (#2078) * move android into own dir * fix name * maybe this works? qt ui doesn't work on mac * fix that * pc sound works * fix pc build * lowercase * that needs to be real_arch * split into classes * fix typo in lib * Fix cycle alerts * Add qt multimedia libs to install scripts * Add ui/android folder * Fix android build * Raise exception if sound init fails * add missing return Co-authored-by: Willem Melching <willem.melching@gmail.com> Co-authored-by: Comma Device <device@comma.ai> old-commit-hash: acd1bde496904fbc0d97f4d89e630358c4d11f7f
5 years ago
class Sound {
public:
virtual bool play(AudibleAlert alert) = 0;
virtual void stop() = 0;
virtual void setVolume(int volume) = 0;
Sound refactor (#1589) * Soud refactor * remove files from files_common * add timeout to set_volumn * add param volume to init * done * test.cc * fix typo * add repeat param instead of loop * revert submodule * add member function currentSound * remove function create_player from class member * fix build error fix repeat * rename CHECK_RESULT to ReturnOnError * set currentSound_ before posible err * use std::map to initialize sound table cleanup cleanup cleanup fix bug in stop change paramater name * done * remove function CreatePlayer, create player in init() * resolve conflict * remove sound test * rebase * remove whitespace * Apply great review suggestion * use player's SLVolumeItf interface to set volume * use float * leave the volume control the way it is old-commit-hash: 8cacc14b3180e831ed4fa0782102f973efe8851f
5 years ago
};