From 767da62653a7b0e112a37f14cad8f5e4537e3c32 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 18 Apr 2022 14:24:37 -0700 Subject: [PATCH] cleanup release files --- Jenkinsfile | 15 ++-- release/files_common | 23 ----- selfdrive/camerad/cameras/camera_qcom.h | 106 ------------------------ 3 files changed, 6 insertions(+), 138 deletions(-) delete mode 100644 selfdrive/camerad/cameras/camera_qcom.h diff --git a/Jenkinsfile b/Jenkinsfile index 18fd50acc0e9e64..06a3a53428be1b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,18 +50,15 @@ pipeline { } stages { - stage('build release') { + stage('build release3') { + agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } when { branch 'devel-staging' } - - stage('release3') { - agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } - steps { - phone_steps("tici", [ - ["build release3-staging & dashcam3-staging", "PUSH=1 $SOURCE_DIR/release/build_release.sh"], - ]) - } + steps { + phone_steps("tici", [ + ["build release3-staging & dashcam3-staging", "PUSH=1 $SOURCE_DIR/release/build_release.sh"], + ]) } } diff --git a/release/files_common b/release/files_common index ff7669084e89373..5c30e7e12d9ca98 100644 --- a/release/files_common +++ b/release/files_common @@ -65,8 +65,6 @@ release/* tools/lib/* -installer/updater/updater - selfdrive/version.py selfdrive/__init__.py @@ -260,14 +258,6 @@ selfdrive/hardware/__init__.py selfdrive/hardware/base.h selfdrive/hardware/base.py selfdrive/hardware/hw.h -selfdrive/hardware/eon/__init__.py -selfdrive/hardware/eon/androidd.py -selfdrive/hardware/eon/shutdownd.py -selfdrive/hardware/eon/hardware.h -selfdrive/hardware/eon/hardware.py -selfdrive/hardware/eon/neos.py -selfdrive/hardware/eon/neos.json -selfdrive/hardware/eon/updater selfdrive/hardware/tici/__init__.py selfdrive/hardware/tici/hardware.py selfdrive/hardware/tici/amplifier.py @@ -299,7 +289,6 @@ selfdrive/locationd/models/live_kf.cc selfdrive/locationd/calibrationd.py selfdrive/logcatd/SConscript -selfdrive/logcatd/logcatd_android.cc selfdrive/logcatd/logcatd_systemd.cc selfdrive/proclogd/SConscript @@ -329,7 +318,6 @@ selfdrive/loggerd/xattr_cache.py selfdrive/sensord/SConscript selfdrive/sensord/libdiag.h -selfdrive/sensord/sensors_qcom.cc selfdrive/sensord/sensors_qcom2.cc selfdrive/sensord/sensors/*.cc selfdrive/sensord/sensors/*.h @@ -363,8 +351,6 @@ selfdrive/ui/qt/offroad/*.h selfdrive/ui/qt/offroad/*.qml selfdrive/ui/qt/widgets/*.cc selfdrive/ui/qt/widgets/*.h -selfdrive/ui/qt/spinner_aarch64 -selfdrive/ui/qt/text_aarch64 selfdrive/ui/replay/*.cc selfdrive/ui/replay/*.h @@ -376,11 +362,8 @@ selfdrive/camerad/snapshot/* selfdrive/camerad/include/* selfdrive/camerad/cameras/camera_common.h selfdrive/camerad/cameras/camera_common.cc -selfdrive/camerad/cameras/camera_qcom.cc -selfdrive/camerad/cameras/camera_qcom.h selfdrive/camerad/cameras/camera_replay.cc selfdrive/camerad/cameras/camera_replay.h -selfdrive/camerad/cameras/debayer.cl selfdrive/camerad/cameras/sensor_i2c.h selfdrive/camerad/cameras/sensor2_i2c.h @@ -477,19 +460,13 @@ third_party/libyuv/lib/** third_party/libyuv/larch64/** third_party/snpe/include/** -third_party/snpe/aarch64** third_party/snpe/larch64** third_party/snpe/dsp** third_party/acados/x86_64/** -third_party/acados/aarch64/** third_party/acados/larch64/** third_party/acados/include/** -third_party/android_frameworks_native/** -third_party/android_hardware_libhardware/** -third_party/android_system_core/** - scripts/update_now.sh scripts/stop_updater.sh diff --git a/selfdrive/camerad/cameras/camera_qcom.h b/selfdrive/camerad/cameras/camera_qcom.h deleted file mode 100644 index 87bbe4b7e726183..000000000000000 --- a/selfdrive/camerad/cameras/camera_qcom.h +++ /dev/null @@ -1,106 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "cereal/messaging/messaging.h" -#include "cereal/visionipc/visionbuf.h" -#include "selfdrive/camerad/cameras/camera_common.h" -#include "selfdrive/camerad/imgproc/utils.h" -#include "selfdrive/camerad/include/msm_cam_sensor.h" -#include "selfdrive/camerad/include/msmb_camera.h" -#include "selfdrive/camerad/include/msmb_isp.h" -#include "selfdrive/camerad/include/msmb_ispif.h" -#include "selfdrive/common/mat.h" -#include "selfdrive/common/util.h" - -#define FRAME_BUF_COUNT 4 -#define METADATA_BUF_COUNT 4 - -#define NUM_FOCUS 8 - -#define LP3_AF_DAC_DOWN 366 -#define LP3_AF_DAC_UP 634 -#define LP3_AF_DAC_M 440 -#define LP3_AF_DAC_3SIG 52 - -#define FOCUS_RECOVER_PATIENCE 50 // 2.5 seconds of complete blur -#define FOCUS_RECOVER_STEPS 240 // 6 seconds - -typedef struct CameraState CameraState; - -typedef int (*camera_apply_exposure_func)(CameraState *s, int gain, int integ_lines, uint32_t frame_length); - -typedef struct StreamState { - struct msm_isp_buf_request buf_request; - struct msm_vfe_axi_stream_request_cmd stream_req; - struct msm_isp_qbuf_info qbuf_info[FRAME_BUF_COUNT]; - VisionBuf *bufs; -} StreamState; - -typedef struct CameraState { - int camera_num; - int camera_id; - - int fps; - CameraInfo ci; - - unique_fd csid_fd; - unique_fd csiphy_fd; - unique_fd sensor_fd; - unique_fd isp_fd; - - struct msm_vfe_axi_stream_cfg_cmd stream_cfg; - - StreamState ss[3]; - CameraBuf buf; - - std::mutex frame_info_lock; - FrameMetadata frame_metadata[METADATA_BUF_COUNT]; - int frame_metadata_idx; - - // exposure - uint32_t pixel_clock, line_length_pclk; - uint32_t frame_length; - unsigned int max_gain; - float cur_exposure_frac, cur_gain_frac; - int cur_gain, cur_integ_lines; - - float measured_grey_fraction; - float target_grey_fraction; - - std::atomic digital_gain; - camera_apply_exposure_func apply_exposure; - - // rear camera only,used for focusing - unique_fd actuator_fd; - std::atomic focus_err; - std::atomic lens_true_pos; - std::atomic self_recover; // af recovery counter, neg is patience, pos is active - uint16_t cur_step_pos; - uint16_t cur_lens_pos; - int16_t focus[NUM_FOCUS]; - uint8_t confidence[NUM_FOCUS]; -} CameraState; - - -typedef struct MultiCameraState { - unique_fd ispif_fd; - unique_fd msmcfg_fd; - unique_fd v4l_fd; - uint16_t lapres[(ROI_X_MAX-ROI_X_MIN+1)*(ROI_Y_MAX-ROI_Y_MIN+1)]; - - VisionBuf focus_bufs[FRAME_BUF_COUNT]; - VisionBuf stats_bufs[FRAME_BUF_COUNT]; - - CameraState road_cam; - CameraState driver_cam; - - SubMaster *sm; - PubMaster *pm; - LapConv *lap_conv; -} MultiCameraState; - -void actuator_move(CameraState *s, uint16_t target); -int sensor_write_regs(CameraState *s, struct msm_camera_i2c_reg_array* arr, size_t size, int data_type);