diff --git a/selfdrive/ui/qt/widgets/cameraview.cc b/selfdrive/ui/qt/widgets/cameraview.cc index 38824aa8db..173ad033a6 100644 --- a/selfdrive/ui/qt/widgets/cameraview.cc +++ b/selfdrive/ui/qt/widgets/cameraview.cc @@ -41,6 +41,7 @@ const char frame_fragment_shader[] = "out vec4 colorOut;\n" "void main() {\n" " colorOut = texture(uTexture, vTexCoord);\n" + " colorOut.rgb = pow(colorOut.rgb, vec3(1.0/1.4));\n" "}\n"; #else const char frame_fragment_shader[] = diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index ff570453a1..d192dcf1b6 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -307,7 +307,7 @@ void Device::setAwake(bool on) { void Device::resetInteractiveTimeout(int timeout) { if (timeout == -1) { - timeout = (ignition_on ? 10 : 30); + timeout = (ignition_on ? 3600 : 3600); } interactive_timeout = timeout * UI_FREQ; } @@ -335,7 +335,7 @@ void Device::updateBrightness(const UIState &s) { if (brightness != last_brightness) { if (!brightness_future.isRunning()) { - brightness_future = QtConcurrent::run(Hardware::set_brightness, brightness); + // brightness_future = QtConcurrent::run(Hardware::set_brightness, brightness); last_brightness = brightness; } } diff --git a/system/camerad/cameras/real_debayer.cl b/system/camerad/cameras/real_debayer.cl index 634805631f..c8857c92d9 100644 --- a/system/camerad/cameras/real_debayer.cl +++ b/system/camerad/cameras/real_debayer.cl @@ -144,9 +144,9 @@ __kernel void debayer10(const __global uchar * in, __global uchar * out) rgb.x = (k02*vb.s2+k04*vb.s0)/(k02+k04); // R_G1 rgb.y = vb.s1; // G1(R) rgb.z = (k01*va.s1+k03*vc.s1)/(k01+k03); // B_G1 - rgb.x = 0.0; - rgb.y = 1.0; - rgb.z = 0.0; + rgb.x = gid_x / 1928.0 / 10.0; + rgb.y = rgb.x; + rgb.z = rgb.x; rgb_out[0] = convert_uchar3_sat(color_correct(clamp(rgb, 0.0, 1.0)) * 255.0); const float k11 = get_k(va.s1, vc.s1, va.s3, vc.s3);