mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-27 17:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/commaai/openpilot into devel

Browse Source
This commit is contained in:
dragonpilot
2020-02-21 12:14:26 +10:00
parent 9d8d1adb48 98c8888cf7
commit da73baeb69
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/apk.py
+1 -2
View File
@@ -33,10 +33,9 @@ def start_frame():
def set_package_permissions():
pm_grant("ai.comma.plus.offroad", "android.permission.ACCESS_FINE_LOCATION")
pm_grant("ai.comma.plus.offroad", "android.permission.READ_PHONE_STATE")
pm_grant("ai.comma.plus.offroad", "android.permission.READ_EXTERNAL_STORAGE")
appops_set("ai.comma.plus.offroad", "SU", "allow")
appops_set("ai.comma.plus.offroad", "WIFI_SCAN", "allow")
appops_set("ai.comma.plus.offroad", "READ_EXTERNAL_STORAGE", "allow")
appops_set("ai.comma.plus.offroad", "WRITE_EXTERNAL_STORAGE", "allow")
def appops_set(package, op, mode):
system(f"LD_LIBRARY_PATH= appops set {package} {op} {mode}")
selfdrive/camerad/cameras/camera_qcom.c
+3 -3
View File
@@ -1711,7 +1711,7 @@ static void parse_autofocus(CameraState *s, uint8_t *d) {
int16_t max_focus = -32767;
int avg_focus = 0;
// force to max if not able to determine focus for long
const int patience_cnt = 100;
const int patience_cnt = 20;
static int nan_cnt = 0;
/*printf("FOCUS: ");
@@ -1757,7 +1757,7 @@ static void parse_autofocus(CameraState *s, uint8_t *d) {
nan_cnt = 0;
}
} else {
s->focus_err = avg_focus;
s->focus_err = max_focus;
nan_cnt = 0;
}
// printf("fe=%f\n", s->focus_err);
@@ -2084,7 +2084,6 @@ static void* ops_thread(void* arg) {
if (cmsg.type == CAMERA_MSG_AUTOEXPOSE) {
if (cmsg.camera_num == 0) {
do_autoexposure(&s->rear, cmsg.grey_frac);
do_autofocus(&s->rear);
} else {
do_autoexposure(&s->front, cmsg.grey_frac);
}
@@ -2187,6 +2186,7 @@ void cameras_run(DualCameraState *s) {
// fwrite(d, c->ss[buffer].bufs[buf_idx].len, sizeof(uint8_t), df);
// fclose(df);
parse_autofocus(c, d);
do_autofocus(&s->rear);
}
c->ss[buffer].qbuf_info[buf_idx].dirty_buf = 1;
ioctl(c->isp_fd, VIDIOC_MSM_ISP_ENQUEUE_BUF, &c->ss[buffer].qbuf_info[buf_idx]);