Moved boardd loopback config to envvar.

pull/114/head
Jessy Diamond Exum 8 years ago
parent 9a9dc3ab23
commit 38aa03e0f7
  1. 13
      selfdrive/boardd/boardd.cc
  2. 2
      selfdrive/boardd/test_boardd_loopback.py

@ -23,8 +23,6 @@
#include "common/swaglog.h" #include "common/swaglog.h"
#include "common/timing.h" #include "common/timing.h"
//#define DEBUG_WITH_PANDA_LOOPBACK
int do_exit = 0; int do_exit = 0;
libusb_context *ctx = NULL; libusb_context *ctx = NULL;
@ -33,6 +31,7 @@ pthread_mutex_t usb_lock;
bool spoofing_started = false; bool spoofing_started = false;
bool fake_send = false; bool fake_send = false;
bool loopback_can = false;
// double the FIFO size // double the FIFO size
#define RECV_SIZE (0x1000) #define RECV_SIZE (0x1000)
@ -54,9 +53,9 @@ bool usb_connect() {
err = libusb_claim_interface(dev_handle, 0); err = libusb_claim_interface(dev_handle, 0);
if (err != 0) { return false; } if (err != 0) { return false; }
#ifdef DEBUG_WITH_PANDA_LOOPBACK if(loopback_can) {
libusb_control_transfer(dev_handle, 0xc0, 0xe5, 1, 0, NULL, 0, TIMEOUT); libusb_control_transfer(dev_handle, 0xc0, 0xe5, 1, 0, NULL, 0, TIMEOUT);
#endif }
// power off ESP // power off ESP
libusb_control_transfer(dev_handle, 0xc0, 0xd9, 0, 0, NULL, 0, TIMEOUT); libusb_control_transfer(dev_handle, 0xc0, 0xd9, 0, 0, NULL, 0, TIMEOUT);
@ -337,6 +336,10 @@ int main() {
fake_send = true; fake_send = true;
} }
if(getenv("BOARDD_LOOPBACK")){
loopback_can = true;
}
// init libusb // init libusb
err = libusb_init(&ctx); err = libusb_init(&ctx);
assert(err == 0); assert(err == 0);

@ -1,4 +1,4 @@
"""Enable the DEBUG_WITH_PANDA_LOOPBACK define in boardd.cc before test.""" """Run boardd with the BOARDD_LOOPBACK envvar before running this test."""
import os import os
import random import random

Loading…
Cancel
Save