mawei
/
openpilot
mirror of https://github.com/1okko/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix typo AR0321 -> AR0231 (#26993)

This commit is contained in:
Adeeb Shihadeh 2023-01-17 19:52:06 -08:00 committed by GitHub
parent e5931ed762
commit ef42652368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -152,7 +152,7 @@ pipeline {
stage('camerad-ar') { stage('camerad-ar') {
agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
steps { steps {
phone_steps("tici-ar0321", [ phone_steps("tici-ar0231", [
["build", "cd selfdrive/manager && ./build.py"], ["build", "cd selfdrive/manager && ./build.py"],
["test camerad", "python system/camerad/test/test_camerad.py"], ["test camerad", "python system/camerad/test/test_camerad.py"],
["test exposure", "python system/camerad/test/test_exposure.py"], ["test exposure", "python system/camerad/test/test_exposure.py"],

2
cereal

@ -1 +1 @@
Subproject commit c0d9abf6f7c7de140c41af10e322e226d900ef99 Subproject commit 6b91a52d3d7bd62507f26ac1321338d4cfd2dc03

2
selfdrive/ui/ui.cc
View File

@ -163,7 +163,7 @@ static void update_state(UIState *s) {
scene.longitudinal_control = sm["carParams"].getCarParams().getOpenpilotLongitudinalControl(); scene.longitudinal_control = sm["carParams"].getCarParams().getOpenpilotLongitudinalControl();
} }
if (sm.updated("wideRoadCameraState")) { if (sm.updated("wideRoadCameraState")) {
float scale = (sm["wideRoadCameraState"].getWideRoadCameraState().getSensor() == cereal::FrameData::ImageSensor::AR0321) ? 6.0f : 1.0f; float scale = (sm["wideRoadCameraState"].getWideRoadCameraState().getSensor() == cereal::FrameData::ImageSensor::AR0231) ? 6.0f : 1.0f;
scene.light_sensor = std::max(100.0f - scale * sm["wideRoadCameraState"].getWideRoadCameraState().getExposureValPercent(), 0.0f); scene.light_sensor = std::max(100.0f - scale * sm["wideRoadCameraState"].getWideRoadCameraState().getExposureValPercent(), 0.0f);
} }
scene.started = sm["deviceState"].getDeviceState().getStarted() && scene.ignition; scene.started = sm["deviceState"].getDeviceState().getStarted() && scene.ignition;

2
system/camerad/cameras/camera_common.cc
View File

@ -167,7 +167,7 @@ void fill_frame_data(cereal::FrameData::Builder &framed, const FrameMetadata &fr
framed.setExposureValPercent(perc); framed.setExposureValPercent(perc);
if (c->camera_id == CAMERA_ID_AR0231) { if (c->camera_id == CAMERA_ID_AR0231) {
framed.setSensor(cereal::FrameData::ImageSensor::AR0321); framed.setSensor(cereal::FrameData::ImageSensor::AR0231);
} else if (c->camera_id == CAMERA_ID_OX03C10) { } else if (c->camera_id == CAMERA_ID_OX03C10) {
framed.setSensor(cereal::FrameData::ImageSensor::OX03C10); framed.setSensor(cereal::FrameData::ImageSensor::OX03C10);
} }

2
system/camerad/test/test_camerad.py
View File

@ -10,7 +10,7 @@ from selfdrive.manager.process_config import managed_processes
from system.hardware import TICI from system.hardware import TICI
TEST_TIMESPAN = 30 TEST_TIMESPAN = 30
LAG_FRAME_TOLERANCE = {log.FrameData.ImageSensor.ar0321: 0.5, # ARs use synced pulses for frame starts LAG_FRAME_TOLERANCE = {log.FrameData.ImageSensor.ar0231: 0.5, # ARs use synced pulses for frame starts
log.FrameData.ImageSensor.ox03c10: 1.0} # OXs react to out-of-sync at next frame log.FrameData.ImageSensor.ox03c10: 1.0} # OXs react to out-of-sync at next frame
CAMERAS = ('roadCameraState', 'driverCameraState', 'wideRoadCameraState') CAMERAS = ('roadCameraState', 'driverCameraState', 'wideRoadCameraState')