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.

Sign up for GitHub

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

Make based-connect work with QC35 Series 2 and new firmware #14

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make based-connect work with QC35 Series 2 and new firmware #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afecba6
Add Polish, russion to voice prompt languages
danners May 13, 2021
135a4d2
Device status: make it work
danners May 13, 2021
a3c008f
Add Self-voice setting
danners May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions based.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,7 @@ int get_device_status(int sock, char name[MAX_NAME_LEN + 1], enum PromptLanguage
*level = NC_DNE;
}

static const uint8_t ack2[] = { 0x01, 0x01, 0x06, 0x00 };
uint8_t buffer2[sizeof(ack2)];
return read_check(sock, buffer2, sizeof(buffer2), ack2, NULL);
return status;
}

int set_pairing(int sock, enum Pairing pairing) {
Expand All @@ -333,6 +331,16 @@ int set_pairing(int sock, enum Pairing pairing) {
return write_check(sock, send, sizeof(send), ack, sizeof(ack));
}

int set_self_voice(int sock, enum SelfVoice selfvoice) {
static uint8_t send[] = { 0x01, 0x0b, 0x02, 0x02, 0x01, ANY, 0x38 };
static uint8_t ack[] = { 0x01, 0x0b, 0x03, 0x03, 0x01, ANY, 0x0f};

send[5] = selfvoice;
ack[5] = selfvoice;
return write_check(sock, send, sizeof(send), ack, sizeof(ack));
}


int get_firmware_version(int sock, char version[VER_STR_LEN]) {
static const uint8_t send[] = { 0x00, 0x05, 0x01, 0x00 };
static const uint8_t ack[] = { 0x00, 0x05, 0x03, 0x05 };
Expand Down
14 changes: 13 additions & 1 deletion based.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define MAX_NUM_DEVICES 8
#define MAX_BT_PACK_LEN 0x1000
#define VER_STR_LEN 6
#define VP_MASK 0x20
#define VP_MASK 0x7F

enum NoiseCancelling {
NC_HIGH = 0x01,
Expand All @@ -38,9 +38,13 @@ enum PromptLanguage {
PL_PT = 0x27,
PL_ZH = 0x28,
PL_KO = 0x29,
PL_PL = 0x2B,
PL_RU = 0x2A,
PL_NL = 0x2e,
PL_JA = 0x2f,
PL_SV = 0x32


};

enum Pairing {
Expand All @@ -59,6 +63,13 @@ enum DevicesConnected {
DC_TWO = 0x03
};

enum SelfVoice {
SV_OFF = 0x0,
SV_HIGH = 0x1,
SV_MEDIUM = 0x2,
SV_LOW = 0x3,
};

struct Device {
bdaddr_t address;
enum DeviceStatus status;
Expand All @@ -77,6 +88,7 @@ int set_noise_cancelling(int sock, enum NoiseCancelling level);
int get_device_status(int sock, char name[MAX_NAME_LEN + 1], enum PromptLanguage *language,
enum AutoOff *minutes, enum NoiseCancelling *level);
int set_pairing(int sock, enum Pairing pairing);
int set_self_voice(int sock, enum SelfVoice selfVoice);
int get_firmware_version(int sock, char version[VER_STR_LEN]);
int get_serial_number(int sock, char serial[0x100]);
int get_battery_level(int sock, unsigned int *level);
Expand Down
46 changes: 42 additions & 4 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ static void usage() {
"\t\tRemove the device at address from the pairing list.\n"
"\t--device-id\n"
"\t\tPrint the device id followed by the index revision.\n"
"\t-e, --self-voice\n"
"\t\tChange the self voice level.\n"
"\t\tlevel: high, medium, low, off\n"
, program_name);
}

Expand Down Expand Up @@ -89,7 +92,11 @@ static int do_set_prompt_language(int sock, const char *arg) {
pl = PL_ZH;
} else if (strcmp(arg, "ko") == 0) {
pl = PL_KO;
} else if (strcmp(arg, "nl") == 0) {
} else if (strcmp(arg, "pl") == 0) {
pl = PL_PL;
} else if (strcmp(arg, "ru") == 0) {
pl = PL_RU;
} else if (strcmp(arg, "nl") == 0) {
pl = PL_NL;
} else if (strcmp(arg, "ja") == 0) {
pl = PL_JA;
Expand Down Expand Up @@ -191,7 +198,7 @@ static int do_get_device_status(int sock) {
char *print;
printf("Name: %s\n", name);

switch (pl | VP_MASK) {
switch (pl & VP_MASK) {
case PL_EN:
print = "en";
break;
Expand Down Expand Up @@ -225,8 +232,15 @@ static int do_get_device_status(int sock) {
case PL_SV:
print = "sv";
break;
case PL_RU:
print = "ru";
break;
case PL_PL:
print = "pl";
break;
default:
return 1;
print = "unknown";
break;
}
printf("Language: %s\n", print);
printf("Voice Prompts: %s\n", pl & VP_MASK ? "on" : "off");
Expand Down Expand Up @@ -275,6 +289,26 @@ static int do_set_pairing(int sock, const char *arg) {
return set_pairing(sock, p);
}

static int do_set_self_voice(int sock, const char *arg) {
enum SelfVoice p;

if (strcmp(arg, "high") == 0) {
p = SV_HIGH;
} else if (strcmp(arg, "medium") == 0) {
p = SV_MEDIUM;
} else if (strcmp(arg, "low") == 0) {
p = SV_LOW;
} else if (strcmp(arg, "off") == 0) {
p = SV_OFF;
} else {
fprintf(stderr, "Invalid self voice argument: %s\n", arg);
usage();
return 1;
}

return set_self_voice(sock, p);
}

static int do_get_firmware_version(int sock) {
char version[VER_STR_LEN];
int status = get_firmware_version(sock, version);
Expand Down Expand Up @@ -420,7 +454,7 @@ static int do_send_packet(int sock, const char *arg) {
}

int main(int argc, char *argv[]) {
static const char *short_opt = "hn:l:v:o:c:dp:fsba";
static const char *short_opt = "hn:l:v:o:c:e:dp:fsba";
static const struct option long_opt[] = {
{ "help", no_argument, NULL, 'h' },
{ "name", required_argument, NULL, 'n' },
Expand All @@ -438,6 +472,7 @@ int main(int argc, char *argv[]) {
{ "disconnect-device", required_argument, NULL, 3 },
{ "remove-device", required_argument, NULL, 4 },
{ "device-id", no_argument, NULL, 5 },
{ "self-voice", required_argument, NULL, 'e' },
{ "send-packet", required_argument, NULL, 1 },
{ 0, 0, 0, 0 }
};
Expand Down Expand Up @@ -535,6 +570,9 @@ int main(int argc, char *argv[]) {
case 'a':
status = do_get_paired_devices(sock);
break;
case 'e':
status = do_set_self_voice(sock, optarg);
break;
case 2:
status = do_connect_device(sock, optarg);
break;
Expand Down