mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-20 18:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp_hf: fix HFP_SUBEVENT_SPEAKER_VOLUME and HFP_SUBEVENT_MICROPHONE_VOLUME definitions

Browse Source 
Both have no status field
This commit is contained in:
Matthias Ringwald 2020-01-07 22:14:59 +01:00
parent 9b9bd84a4f
commit b24771d95e
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/btstack_defines.h
View File

@ -1590,17 +1590,15 @@ typedef uint8_t sm_key_t[16];
#define HFP_SUBEVENT_RING 0x13
/**
* @format 111
* @format 11
* @param subevent_code
* @param status
* @param gain
*/
#define HFP_SUBEVENT_SPEAKER_VOLUME 0x14
/**
* @format 111
* @format 11
* @param subevent_code
* @param status
* @param gain
*/
#define HFP_SUBEVENT_MICROPHONE_VOLUME 0x15

22
src/btstack_event.h
View File

@ -4034,15 +4034,6 @@ static inline const char * hfp_subevent_transmit_dtmf_codes_get_dtmf(const uint8
/**
* @brief Get field status from event HFP_SUBEVENT_SPEAKER_VOLUME
* @param event packet
* @return status
* @note: btstack_type 1
*/
static inline uint8_t hfp_subevent_speaker_volume_get_status(const uint8_t * event){
return event[3];
}
/**
* @brief Get field gain from event HFP_SUBEVENT_SPEAKER_VOLUME
* @param event packet
@ -4050,18 +4041,9 @@ static inline uint8_t hfp_subevent_speaker_volume_get_status(const uint8_t * eve
* @note: btstack_type 1
*/
static inline uint8_t hfp_subevent_speaker_volume_get_gain(const uint8_t * event){
return event[4];
}
/**
* @brief Get field status from event HFP_SUBEVENT_MICROPHONE_VOLUME
* @param event packet
* @return status
* @note: btstack_type 1
*/
static inline uint8_t hfp_subevent_microphone_volume_get_status(const uint8_t * event){
return event[3];
}
/**
* @brief Get field gain from event HFP_SUBEVENT_MICROPHONE_VOLUME
* @param event packet
@ -4069,7 +4051,7 @@ static inline uint8_t hfp_subevent_microphone_volume_get_status(const uint8_t *
* @note: btstack_type 1
*/
static inline uint8_t hfp_subevent_microphone_volume_get_gain(const uint8_t * event){
return event[4];
return event[3];
}
/**

2
test/hfp/Makefile
View File

@ -52,7 +52,7 @@ CFLAGS = -g -Wall -Wmissing-prototypes -Wnarrowing
# CFLAGS += -Werror
CFLAGS += -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/src/classic -I${POSIX_ROOT} -I${BTSTACK_ROOT}/include
# CFLAGS += -D OCTAVE_OUTPUT
CFLAGS += -fprofile-arcs -ftest-coverage
CFLAGS += -fprofile-arcs -ftest-coverage -fsanitize=address
LDFLAGS_CPPUTEST += -lCppUTest -lCppUTestExt
EXAMPLES = hfp_ag_parser_test hfp_ag_client_test hfp_hf_parser_test hfp_hf_client_test cvsd_plc_test pklg_cvsd_test

6
test/hfp/hfp_hf_client_test.c
View File

@ -454,13 +454,11 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
(const char *) hfp_subevent_number_for_voice_tag_get_number(event));
break;
case HFP_SUBEVENT_SPEAKER_VOLUME:
printf("Speaker volume: status %u, gain %u\n",
hfp_subevent_speaker_volume_get_status(event),
printf("Speaker volume: gain %u\n",
hfp_subevent_speaker_volume_get_gain(event));
break;
case HFP_SUBEVENT_MICROPHONE_VOLUME:
printf("Microphone volume: status %u, gain %u\n",
hfp_subevent_microphone_volume_get_status(event),
printf("Microphone volume: gain %u\n",
hfp_subevent_microphone_volume_get_gain(event));
break;
case HFP_SUBEVENT_CALLING_LINE_IDENTIFICATION_NOTIFICATION: