Merge common/ and selfdrive/common (#24556)

* Merge common/ and selfdrive/common

* fix that

* fix version

* fix unit tests
old-commit-hash: cb8885cffb313bea258c012c3026461a22bf8135
This commit is contained in:
Adeeb Shihadeh
2022-05-18 14:11:57 -07:00
committed by GitHub
parent eea872ae98
commit f4675fc260
140 changed files with 288 additions and 287 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ rm -f panda/board/obj/panda.bin.signed
# include source commit hash and build date in commit
GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse HEAD)
DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
VERSION=$(cat $SOURCE_DIR/selfdrive/common/version.h | awk -F\" '{print $2}')
VERSION=$(cat $SOURCE_DIR/common/version.h | awk -F\" '{print $2}')
echo "[-] committing version $VERSION T=$SECONDS"
git add -f .
+2 -2
View File
@@ -41,8 +41,8 @@ cd $BUILD_DIR
rm -f panda/board/obj/panda.bin.signed
VERSION=$(cat selfdrive/common/version.h | awk -F[\"-] '{print $2}')
echo "#define COMMA_VERSION \"$VERSION-release\"" > selfdrive/common/version.h
VERSION=$(cat common/version.h | awk -F[\"-] '{print $2}')
echo "#define COMMA_VERSION \"$VERSION-release\"" > common/version.h
echo "[-] committing version $VERSION T=$SECONDS"
git add -f .
+24 -24
View File
@@ -125,34 +125,34 @@ selfdrive/clocksd/clocksd.cc
selfdrive/debug/*.py
selfdrive/common/SConscript
selfdrive/common/version.h
common/SConscript
common/version.h
selfdrive/common/swaglog.h
selfdrive/common/swaglog.cc
selfdrive/common/statlog.h
selfdrive/common/statlog.cc
selfdrive/common/util.cc
selfdrive/common/util.h
selfdrive/common/queue.h
selfdrive/common/clutil.cc
selfdrive/common/clutil.h
selfdrive/common/params.h
selfdrive/common/params.cc
selfdrive/common/watchdog.cc
selfdrive/common/watchdog.h
common/swaglog.h
common/swaglog.cc
common/statlog.h
common/statlog.cc
common/util.cc
common/util.h
common/queue.h
common/clutil.cc
common/clutil.h
common/params.h
common/params.cc
common/watchdog.cc
common/watchdog.h
selfdrive/common/modeldata.h
selfdrive/common/mat.h
selfdrive/common/timing.h
common/modeldata.h
common/mat.h
common/timing.h
selfdrive/common/visionimg.cc
selfdrive/common/visionimg.h
common/visionimg.cc
common/visionimg.h
selfdrive/common/gpio.cc
selfdrive/common/gpio.h
selfdrive/common/i2c.cc
selfdrive/common/i2c.h
common/gpio.cc
common/gpio.h
common/i2c.cc
common/i2c.h
selfdrive/controls/__init__.py