pull/32112/head
Comma Device 1 year ago
parent cb0524081f
commit 2dd8b322b9
  1. 2
      common/transformations/camera.py
  2. 8
      selfdrive/ui/ui.h

@ -49,7 +49,7 @@ class DeviceCameraConfig:
_ar_ox_fisheye = CameraConfig(1928, 1208, 567.0) # focal length probably wrong? magnification is not consistent across frame
_os_fisheye = CameraConfig(2688, 1520, 567.0 / 2 * 3)
_ar_ox_config = DeviceCameraConfig(CameraConfig(1928, 1208, 2648.0), _ar_ox_fisheye, _ar_ox_fisheye)
_os_config = DeviceCameraConfig(CameraConfig(2688, 1520, 2648.0 * 2 / 3), _os_fisheye, _os_fisheye)
_os_config = DeviceCameraConfig(CameraConfig(2688, 1520, 2648.0 / 2 * 3), _os_fisheye, _os_fisheye)
_neo_config = DeviceCameraConfig(CameraConfig(1164, 874, 910.0), CameraConfig(816, 612, 650.0), _NoneCameraConfig())
DEVICE_CAMERAS = {

@ -27,13 +27,13 @@ typedef cereal::CarControl::HUDControl::AudibleAlert AudibleAlert;
const float MIN_DRAW_DISTANCE = 10.0;
const float MAX_DRAW_DISTANCE = 100.0;
constexpr mat3 DEFAULT_CALIBRATION = {{ 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0 }};
constexpr mat3 FCAM_INTRINSIC_MATRIX = (mat3){{2648.0, 0.0, 1928.0 / 2,
0.0, 2648.0, 1208.0 / 2,
constexpr mat3 FCAM_INTRINSIC_MATRIX = (mat3){{2648.0 * 1.5, 0.0, 2688.0 / 2,
0.0, 2648.0 * 1.5, 1520.0 / 2,
0.0, 0.0, 1.0}};
// tici ecam focal probably wrong? magnification is not consistent across frame
// Need to retrain model before this can be changed
constexpr mat3 ECAM_INTRINSIC_MATRIX = (mat3){{567.0, 0.0, 1928.0 / 2,
0.0, 567.0, 1208.0 / 2,
constexpr mat3 ECAM_INTRINSIC_MATRIX = (mat3){{567.0 * 1.5, 0.0, 2688.0 / 2,
0.0, 567.0 * 1.5, 1520.0 / 2,
0.0, 0.0, 1.0}};

Loading…
Cancel
Save