fix driver camera AE (commaai#2426)

wirelessnet2 · Oct 30, 2020 · cb551fe · cb551fe
1 parent 26bccbd
commit cb551fe
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -1,5 +1,6 @@
-Version 0.7.10 (2020-10-26)
+Version 0.7.10 (2020-10-29)
 ========================
+ * Grey panda is deprecated, upgrade to comma two or black panda
  * NEOS update: update to Python 3.8.2 and lower CPU frequency
  * Improved thermals due to reduced CPU frequency
  * Update SNPE to 1.41.0

diff --git a/installer/updater/update.json b/installer/updater/update.json
@@ -1,7 +1,7 @@
 {
-  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-ba3ecb158edc760beda0d32e0eea4311031e460afa97fc180dc83f76cf512694.zip",
-  "ota_hash": "ba3ecb158edc760beda0d32e0eea4311031e460afa97fc180dc83f76cf512694",
-  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-e35dc1939dab4c6c2cbae3f225b07515f1a5c02afb232dc22e93f17c9840499f.img",
+  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-e85f507777cb6b22f88ba1c8be6bbaa2630c484b971344b645fca2d1c461cd47.zip",
+  "ota_hash": "e85f507777cb6b22f88ba1c8be6bbaa2630c484b971344b645fca2d1c461cd47",
+  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-db31ffe79dfd60be966fba6d1525a5081a920062b883644dc8f5734bcc6806bb.img",
   "recovery_len": 15926572,
-  "recovery_hash": "e35dc1939dab4c6c2cbae3f225b07515f1a5c02afb232dc22e93f17c9840499f"
+  "recovery_hash": "db31ffe79dfd60be966fba6d1525a5081a920062b883644dc8f5734bcc6806bb"
 }
diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh
@@ -27,8 +27,6 @@ function two_init {
   [ -d "/proc/irq/733" ] && echo 3 > /proc/irq/733/smp_affinity_list # USB for LeEco
   [ -d "/proc/irq/736" ] && echo 3 > /proc/irq/736/smp_affinity_list # USB for OP3T
 
-  # restrict unbound kworkers to first two cores
-  #find /sys/devices/virtual/workqueue -name cpumask  -exec sh -c 'echo 3 > {}' ';'
 
   # Check for NEOS update
   if [ $(< /VERSION) != "$REQUIRED_NEOS_VERSION" ]; then

diff --git a/launch_env.sh b/launch_env.sh
@@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1
 export VECLIB_MAXIMUM_THREADS=1
 
 if [ -z "$REQUIRED_NEOS_VERSION" ]; then
-  export REQUIRED_NEOS_VERSION="15"
+  export REQUIRED_NEOS_VERSION="15-1"
 fi
 
 if [ -z "$PASSIVE" ]; then

diff --git a/selfdrive/camerad/cameras/camera_common.cc b/selfdrive/camerad/cameras/camera_common.cc
@@ -293,7 +293,8 @@ void set_exposure_target(CameraState *c, const uint8_t *pix_ptr, bool front, int
         uint8_t lum = pix_ptr[(y * b->yuv_width) + x];
         lum_binning[lum]++;
       } else {
-        const uint8_t *pix = &pix_ptr[y * b->rgb_width * 3 + x * 3];
+        // TODO: should get rid of RGB here
+        const uint8_t *pix = &pix_ptr[y * b->rgb_stride + x * 3];
         unsigned int lum = (unsigned int)(pix[0] + pix[1] + pix[2]);
         lum_binning[std::min(lum / 3, 255u)]++;
       }

diff --git a/selfdrive/ui/android/ui.cc b/selfdrive/ui/android/ui.cc
@@ -59,6 +59,10 @@ static void handle_display_state(UIState *s, bool user_input) {
     int display_mode = s->awake ? HWC_POWER_MODE_NORMAL : HWC_POWER_MODE_OFF;
     LOGW("setting display mode %d", display_mode);
     framebuffer_set_power(s->fb, display_mode);
+
+    if (s->awake) {
+      system("service call window 18 i32 1");
+    }
   }
 }