diff --git a/hu/hu.proto b/hu/hu.proto index 9a72d7da..f7adac67 100644 --- a/hu/hu.proto +++ b/hu/hu.proto @@ -583,7 +583,7 @@ message AudioFocusRequest { AUDIO_FOCUS_GAIN = 1; AUDIO_FOCUS_GAIN_TRANSIENT = 2; - AUDIO_FOCUS_UNKNOWN = 3; + AUDIO_FOCUS_GAIN_NAVI = 3; AUDIO_FOCUS_RELEASE = 4; } required AUDIO_FOCUS focus_type = 1; diff --git a/mazda/callbacks.cpp b/mazda/callbacks.cpp index 49d4ed44..a3e7979c 100644 --- a/mazda/callbacks.cpp +++ b/mazda/callbacks.cpp @@ -40,6 +40,8 @@ int MazdaEventCallbacks::MediaPacket(int chan, uint64_t timestamp, const byte *b int MazdaEventCallbacks::MediaStart(int chan) { if (chan == AA_CH_MIC) { + // We ignored transient requests to avoid capturing phone calls so we handle the request here + audioMgrClient->audioMgrRequestAudioFocus(AudioManagerClient::FocusType::TRANSIENT); printf("SHAI1 : Mic Started\n"); micInput.Start(g_hu); } @@ -90,7 +92,7 @@ void MazdaEventCallbacks::AudioFocusRequest(int chan, const HU::AudioFocusReques //The chan passed here is always AA_CH_CTR but internally we pass the channel AA means if (request.focus_type() == HU::AudioFocusRequest::AUDIO_FOCUS_RELEASE) { audioMgrClient->audioMgrReleaseAudioFocus(); - } else if (request.focus_type() == HU::AudioFocusRequest::AUDIO_FOCUS_GAIN || request.focus_type() == HU::AudioFocusRequest::AUDIO_FOCUS_UNKNOWN) { + } else if (request.focus_type() == HU::AudioFocusRequest::AUDIO_FOCUS_GAIN || request.focus_type() == HU::AudioFocusRequest::AUDIO_FOCUS_GAIN_NAVI) { audioMgrClient->audioMgrRequestAudioFocus(AudioManagerClient::FocusType::PERMANENT); //assume media } diff --git a/mazda/main.cpp b/mazda/main.cpp index c087be6d..d5774210 100644 --- a/mazda/main.cpp +++ b/mazda/main.cpp @@ -107,6 +107,9 @@ static void gps_thread_func(std::condition_variable& quitcv, std::mutex& quitmut location->set_accuracy(static_cast(data.horizontalAccuracy * 1E3)); +#ifdef NAV_DEBUG + printf("GPS data: %d %d %f %f %d %f %f %f %f \n",data.positionAccuracy, data.uTCtime, data.latitude, data.longitude, data.altitude, data.heading, data.velocity, data.horizontalAccuracy, data.verticalAccuracy); +#endif s.hu_aap_enc_send_message(0, AA_CH_SEN, HU_SENSOR_CHANNEL_MESSAGE::SensorEvent, sensorEvent); }); }