* fix i2c

* fix libi2c (again?)

* qt 5.12.8

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: c5c875bad9
commatwo_master
robbederks 5 years ago committed by GitHub
parent d5990d0ef7
commit 394a3f4d86
  1. 5
      selfdrive/common/i2c.cc
  2. 5
      selfdrive/sensord/SConscript
  3. 1
      selfdrive/ui/SConscript

@ -12,7 +12,10 @@
#ifdef QCOM2 #ifdef QCOM2
// TODO: decide if we want to isntall libi2c-dev everywhere // TODO: decide if we want to isntall libi2c-dev everywhere
#include <linux/i2c-dev.h> extern "C" {
#include <linux/i2c-dev.h>
#include <i2c/smbus.h>
}
I2CBus::I2CBus(uint8_t bus_id){ I2CBus::I2CBus(uint8_t bus_id){
char bus_name[20]; char bus_name[20];

@ -17,4 +17,7 @@ else:
'sensors/lsm6ds3_gyro.cc', 'sensors/lsm6ds3_gyro.cc',
'sensors/lsm6ds3_temp.cc', 'sensors/lsm6ds3_temp.cc',
] ]
env.Program('_sensord', ['sensors_qcom2.cc'] + sensors, LIBS=[common, cereal, messaging, 'capnp', 'zmq', 'kj']) libs = [common, cereal, messaging, 'capnp', 'zmq', 'kj']
if arch == "larch64":
libs.append('i2c')
env.Program('_sensord', ['sensors_qcom2.cc'] + sensors, LIBS=libs)

@ -27,6 +27,7 @@ if arch in ["x86_64", "Darwin", "larch64"]:
f"/usr/include/{real_arch}-linux-gnu/qt5/QtDBus", f"/usr/include/{real_arch}-linux-gnu/qt5/QtDBus",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtMultimedia", f"/usr/include/{real_arch}-linux-gnu/qt5/QtMultimedia",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.5.1/QtGui", f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.5.1/QtGui",
f"/usr/include/{real_arch}-linux-gnu/qt5/QtGui/5.12.8/QtGui",
] ]
qt_env.Tool('qt') qt_env.Tool('qt')

Loading…
Cancel
Save