From f6398ea7864779f621f84df65ded7ee083e72c09 Mon Sep 17 00:00:00 2001
From: ambientocclusion <1399123+ambientocclusion@users.noreply.github.com>
Date: Sun, 11 Sep 2022 03:35:57 -0700
Subject: [PATCH 1/2] Multilang: add missing Japanese translations (#25727)
---
selfdrive/ui/translations/main_ja.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/selfdrive/ui/translations/main_ja.ts b/selfdrive/ui/translations/main_ja.ts
index d6bd9e74ed4aec..a0b2a99866f537 100644
--- a/selfdrive/ui/translations/main_ja.ts
+++ b/selfdrive/ui/translations/main_ja.ts
@@ -1170,7 +1170,7 @@ location set
Receive alerts to steer back into the lane when your vehicle drifts over a detected lane line without a turn signal activated while driving over 31 mph (50 km/h).
- 時速31マイル（50km）を超えるスピードで走行中、方向指示器を作動させずに検出された車線ライン上に車両が触れた場合、車線に戻るアラートを受信します。
+ 時速31マイル（50km）を超えるスピードで走行中、ウインカーを作動させずに検出された車線ライン上に車両が触れた場合、車線に戻るアラートを受信します。
@@ -1195,22 +1195,22 @@ location set
🌮 End-to-end longitudinal (extremely alpha) 🌮
-
+ 🌮 エンドツーエンドのアクセル制御 (超アルファ版) 🌮
Experimental openpilot longitudinal control
-
+ 実験段階のopenpilotによるアクセル制御
<b>WARNING: openpilot longitudinal control is experimental for this car and will disable AEB.</b>
-
+ <b>警告: openpilotによるアクセル制御は実験段階であり、AEBを無効化します。</b>
Let the driving model control the gas and brakes. openpilot will drive as it thinks a human would. Super experimental.
-
+ アクセルとブレーキの制御をopenpilotに任せます。openpilotが人間と同じように運転します。最初期の実験段階です。
From 29f9c536b410a45001beb63c73f3645a8299c222 Mon Sep 17 00:00:00 2001
From: Dean Lee
Date: Mon, 12 Sep 2022 04:56:38 +0800
Subject: [PATCH 2/2] camerad: build camerad on PC (#25726)
* compile camerad on PC
* scons cleanup
Co-authored-by: Adeeb Shihadeh
---
SConstruct | 3 ---
system/camerad/SConscript | 24 +++++++++-------------
system/camerad/cameras/camera_common.cc | 4 +---
system/camerad/cameras/camera_qcom2.cc | 1 -
system/camerad/main.cc | 15 ++++++++------
system/camerad/test/camera_test.h | 27 -------------------------
6 files changed, 20 insertions(+), 54 deletions(-)
delete mode 100644 system/camerad/test/camera_test.h
diff --git a/SConstruct b/SConstruct
index 8b32eba4ae51d7..178b0cc8722877 100644
--- a/SConstruct
+++ b/SConstruct
@@ -99,9 +99,6 @@ if arch == "larch64":
"#third_party/libyuv/larch64/lib",
"/usr/lib/aarch64-linux-gnu"
]
- cpppath += [
- "#system/camerad/include",
- ]
cflags = ["-DQCOM2", "-mcpu=cortex-a57"]
cxxflags = ["-DQCOM2", "-mcpu=cortex-a57"]
rpath += ["/usr/local/lib"]
diff --git a/system/camerad/SConscript b/system/camerad/SConscript
index 65f682dcce652f..ddc763b53d1240 100644
--- a/system/camerad/SConscript
+++ b/system/camerad/SConscript
@@ -1,22 +1,18 @@
Import('env', 'arch', 'cereal', 'messaging', 'common', 'gpucommon', 'visionipc')
-libs = ['m', 'pthread', common, 'jpeg', 'OpenCL', 'yuv', cereal, messaging, 'zmq', 'capnp', 'kj', visionipc, gpucommon]
+libs = ['m', 'pthread', common, 'jpeg', 'OpenCL', 'yuv', cereal, messaging, 'zmq', 'capnp', 'kj', visionipc, gpucommon, 'atomic']
-cameras = []
-if arch == "larch64":
- libs += ['atomic']
- cameras = ['cameras/camera_qcom2.cc']
+cenv = env.Clone()
+cenv['CPPPATH'].append('include/')
- env.Program('camerad', [
- 'main.cc',
- 'cameras/camera_common.cc',
- 'cameras/camera_util.cc',
- 'imgproc/utils.cc',
- cameras,
- ], LIBS=libs)
+camera_obj = cenv.Object(['cameras/camera_qcom2.cc', 'cameras/camera_common.cc', 'cameras/camera_util.cc'])
+cenv.Program('camerad', [
+ 'main.cc',
+ camera_obj,
+ ], LIBS=libs)
if GetOption("test") and arch == "x86_64":
- env.Program('test/ae_gray_test', [
+ cenv.Program('test/ae_gray_test', [
'test/ae_gray_test.cc',
- 'cameras/camera_common.cc',
+ camera_obj,
], LIBS=libs)
diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc
index 313af00b5a91ce..d033d8e6b4e8f2 100644
--- a/system/camerad/cameras/camera_common.cc
+++ b/system/camerad/cameras/camera_common.cc
@@ -18,11 +18,9 @@
#include "system/hardware/hw.h"
#include "msm_media_info.h"
+#include "system/camerad/cameras/camera_qcom2.h"
#ifdef QCOM2
#include "CL/cl_ext_qcom.h"
-#include "system/camerad/cameras/camera_qcom2.h"
-#else
-#include "system/camerad/test/camera_test.h"
#endif
ExitHandler do_exit;
diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc
index 2f674cb50c4432..b2432bdd724ed4 100644
--- a/system/camerad/cameras/camera_qcom2.cc
+++ b/system/camerad/cameras/camera_qcom2.cc
@@ -1304,4 +1304,3 @@ void cameras_run(MultiCameraState *s) {
cameras_close(s);
}
-
diff --git a/system/camerad/main.cc b/system/camerad/main.cc
index c1f38f2224e392..35a3329f300cdd 100644
--- a/system/camerad/main.cc
+++ b/system/camerad/main.cc
@@ -7,14 +7,17 @@
#include "system/hardware/hw.h"
int main(int argc, char *argv[]) {
- if (!Hardware::PC()) {
- int ret;
- ret = util::set_realtime_priority(53);
- assert(ret == 0);
- ret = util::set_core_affinity({6});
- assert(ret == 0 || Params().getBool("IsOffroad")); // failure ok while offroad due to offlining cores
+ if (Hardware::PC()) {
+ printf("camerad is not meant to run on PC\n");
+ return 0;
}
+ int ret;
+ ret = util::set_realtime_priority(53);
+ assert(ret == 0);
+ ret = util::set_core_affinity({6});
+ assert(ret == 0 || Params().getBool("IsOffroad")); // failure ok while offroad due to offlining cores
+
camerad_thread();
return 0;
}
diff --git a/system/camerad/test/camera_test.h b/system/camerad/test/camera_test.h
deleted file mode 100644
index c173f9b84caeee..00000000000000
--- a/system/camerad/test/camera_test.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// TODO: cleanup AE tests
-// needed by camera_common.cc
-void camera_autoexposure(CameraState *s, float grey_frac) {}
-void cameras_init(VisionIpcServer *v, MultiCameraState *s, cl_device_id device_id, cl_context ctx) {}
-void cameras_open(MultiCameraState *s) {}
-void cameras_run(MultiCameraState *s) {}
-
-typedef struct CameraState {
- int camera_num;
- CameraInfo ci;
-
- int fps;
- float digital_gain = 0;
-
- int camera_id;
-
- CameraBuf buf;
-} CameraState;
-
-typedef struct MultiCameraState {
- CameraState road_cam;
- CameraState driver_cam;
-
- PubMaster *pm = nullptr;
-} MultiCameraState;
-
-