Skip to content

Commit

Permalink
troubleshooting dmonitoring
Browse files Browse the repository at this point in the history
  • Loading branch information
Comma Device committed Apr 8, 2020
1 parent 25a9977 commit 7843848
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 5 additions & 3 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ if arch == "aarch64":
"#phonelibs/snpe/include",
]
libpath = [
"#phonelibs/snpe/aarch64-android-clang3.8",
"/usr/lib",
"/data/data/com.termux/files/usr/lib",
"/system/vendor/lib64",
"/system/comma/usr/lib",
"#phonelibs/nanovg",
"#phonelibs/snpe/aarch64",
"#phonelibs/libyuv/lib",
]

Expand Down Expand Up @@ -159,7 +159,7 @@ env = Environment(
"#phonelibs/json11",
"#phonelibs/eigen",
"#phonelibs/curl/include",
"#phonelibs/opencv/include",
#"#phonelibs/opencv/include",
"#phonelibs/libgralloc/include",
"#phonelibs/android_frameworks_native/include",
"#phonelibs/android_hardware_libhardware/include",
Expand Down Expand Up @@ -218,7 +218,9 @@ def abspath(x):

#zmq = 'zmq'
# still needed for apks
zmq = FindFile("libzmq.so", libpath)
zmq = FindFile("libzmq.a", libpath)
if is_tbp:
zmq = FindFile("libzmq.so", libpath)
Export('env', 'arch', 'zmq', 'SHARED', 'webcam', 'is_tbp')

# cereal and messaging are shared with the system
Expand Down
4 changes: 2 additions & 2 deletions panda/board/safety/safety_tesla.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const struct lookup_t TESLA_LOOKUP_MAX_ANGLE = {
{500., 500., 500.}};

const AddrBus TESLA_TX_MSGS[] = {//chassis CAN
{0x045,0}, {0x209,0}, {0x219,0}, {0x214,0}, {0x229,0}, {0x239,0}, {0x249,0},
{0x045,0}, {0x209,0}, {0x219,0}, {0x229,0}, {0x239,0}, {0x249,0},
{0x2B9,0}, {0x309,0}, {0x329,0}, {0x349,0}, {0x369,0}, {0x379,0}, {0x389,0},
{0x399,0}, {0x3A9,0}, {0x3B1,0}, {0x3D9,0}, {0x3E9,0}, {0x400,0}, {0x488,0},
{0x409,0}, {0x551,0}, {0x539,0}, {0x554,0}, {0x556,0}, {0x557,0}, {0x559,0},
Expand All @@ -34,7 +34,7 @@ const AddrBus TESLA_TX_MSGS[] = {//chassis CAN
{0x199,1}, {0x1A9,1}, {0x209,1}, {0x219,1}, {0x2A9,1}, {0x2B9,1}, {0x2D9,1},
{0x641,1},
//epas CAN
{0x214,2}, {0x488,2}, {0x551,2},};
{0x488,2}, {0x551,2},};

// TODO: do checksum and counter checks. Add correct timestep, 0.1s for now.
AddrCheckStruct tesla_rx_checks[] = {
Expand Down
2 changes: 1 addition & 1 deletion selfdrive/camerad/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ void cl_init(VisionState *s) {
&s->device_id, &num_devices);
assert(err == 0);

//cl_print_info(platform_id, s->device_id);
cl_print_info(platform_id, s->device_id);
printf("\n");

s->context = clCreateContext(NULL, 1, &s->device_id, NULL, NULL, &err);
Expand Down

0 comments on commit 7843848

Please sign in to comment.