Merge branch 'master' into sync-priv-20231108

# Conflicts:
#	panda
#	selfdrive/car/subaru/interface.py
#	selfdrive/locationd/torqued.py
This commit is contained in:
Jason Wen
2023-11-12 01:00:33 -05:00
25 changed files with 109 additions and 62 deletions
+1 -1
View File
@@ -26,7 +26,7 @@
#define CAMERA_ID_OX03C10 9
#define CAMERA_ID_MAX 10
const int YUV_BUFFER_COUNT = 40;
const int YUV_BUFFER_COUNT = 20;
enum CameraType {
RoadCam = 0,