Skip to content

don't check for ZCM2 pin on raspberry pi #401

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

Merged
thp merged 4 commits into from
Mar 25, 2020
Merged

don't check for ZCM2 pin on raspberry pi #401

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fc9330
don't check for ZCM2 pin on raspberry pi
adangert Jan 27, 2020
b6012cf
changed checking hostname to checking secure simple pairing
adangert Mar 24, 2020
c389e13
changed from running the command with popen to using hci_lib calls
adangert Mar 24, 2020
fdf6868
removed array include, added comments
adangert Mar 24, 2020
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: 12 additions & 2 deletions src/platform/psmove_port_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,9 +774,19 @@ psmove_port_register_psmove(const char *addr, const char *host, enum PSMove_Mode

// start agent for automatically entering the PIN code if the ZCM2 requests
// it (only required once, during initial setup)
if (model == Model_ZCM2) {
if (model == Model_ZCM2){
bluetoothd.force_restart();
run_pin_agent();

//check if secure simple pairing is enabled in the host adapter
uint8_t ssp = 0;
int dd = hci_open_dev(hci_devid(host));
hci_read_simple_pairing_mode(dd, &ssp, -1);
hci_close_dev(dd);

//If it is not enabled, then run the pin agent to send 0000
if(ssp == 0){
run_pin_agent();
}
}

return PSMove_True;
Expand Down