From 7843848df85fbaf7f0c9922a625d05e2336fef83 Mon Sep 17 00:00:00 2001
From: Comma Device <device@comma.ai>
Date: Wed, 8 Apr 2020 14:33:56 -0400
Subject: [PATCH] troubleshooting dmonitoring

---
 SConstruct                        | 8 +++++---
 panda/board/safety/safety_tesla.h | 4 ++--
 selfdrive/camerad/main.cc         | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index 531320b232cb04..50b7b9108db45b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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",
   ]
   
@@ -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",
@@ -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
diff --git a/panda/board/safety/safety_tesla.h b/panda/board/safety/safety_tesla.h
index 0b97abbd975d67..66b94ee08bcdbd 100644
--- a/panda/board/safety/safety_tesla.h
+++ b/panda/board/safety/safety_tesla.h
@@ -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}, 
@@ -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[] = {
diff --git a/selfdrive/camerad/main.cc b/selfdrive/camerad/main.cc
index 48322b0a6578d0..2cbcc12b96de05 100644
--- a/selfdrive/camerad/main.cc
+++ b/selfdrive/camerad/main.cc
@@ -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);