Optimizations and Cleanup (#42)

* sensor.c optimization permanently remove AI related buffer and functions

* disable unused image processing code

* enable grayscale mode on GC2145 sensor

Author: odudex

components/micropython/port/src/omv/boards/MAIX/imlib_config.h

@@ -12,6 +12,8 @@
 #include "py/mpconfig.h"
 #include "global_config.h"
 
+// #define OMV_OPTIONAL_I
+// #define OMV_OPTIONAL_II
 #if CONFIG_MAIXPY_OMV_MINIMUM
 
 #ifndef CONFIG_MAIXPY_OMV_CONV_YUV_FAST
@@ -66,46 +68,46 @@
 #define IMLIB_ENABLE_MODE
 
 // Enable midpoint()
-#define IMLIB_ENABLE_MIDPOINT
+// #define IMLIB_ENABLE_MIDPOINT
 
 // Enable morph()
-#define IMLIB_ENABLE_MORPH
+// #define IMLIB_ENABLE_MORPH
 
 // Enable Gaussian
-#define IMLIB_ENABLE_GAUSSIAN
+// #define IMLIB_ENABLE_GAUSSIAN
 
 // Enable Laplacian
-#define IMLIB_ENABLE_LAPLACIAN
+// #define IMLIB_ENABLE_LAPLACIAN
 
 // Enable bilateral()
-#define IMLIB_ENABLE_BILATERAL
+// #define IMLIB_ENABLE_BILATERAL
 
 // Enable cartoon()
-#define IMLIB_ENABLE_CARTOON
+// #define IMLIB_ENABLE_CARTOON
 
 // Enable remove_shadows()
-#define IMLIB_ENABLE_REMOVE_SHADOWS
+// #define IMLIB_ENABLE_REMOVE_SHADOWS
 
 // Enable linpolar()
-#define IMLIB_ENABLE_LINPOLAR
+// #define IMLIB_ENABLE_LINPOLAR
 
 // Enable logpolar()
-#define IMLIB_ENABLE_LOGPOLAR
+// #define IMLIB_ENABLE_LOGPOLAR
 
 // Enable chrominvar()
-#define IMLIB_ENABLE_CHROMINVAR
+// #define IMLIB_ENABLE_CHROMINVAR
 
 // Enable illuminvar()
-#define IMLIB_ENABLE_ILLUMINVAR
+// #define IMLIB_ENABLE_ILLUMINVAR
 
 // Enable invariant table
 //#define IMLIB_ENABLE_INVARIANT_TABLE
 
 // Enable rotation_corr()
-#define IMLIB_ENABLE_ROTATION_CORR
+//#define IMLIB_ENABLE_ROTATION_CORR
 
 // Enable phasecorrelate()
-#define IMLIB_ENABLE_FIND_DISPLACEMENT
+// #define IMLIB_ENABLE_FIND_DISPLACEMENT
 
 // rotation_corr() is required by phasecorrelate()
 #if defined(IMLIB_ENABLE_FIND_DISPLACEMENT)\
@@ -114,13 +116,13 @@
 #endif
 
 // Enable get_similarity()
-#define IMLIB_ENABLE_GET_SIMILARITY
+// #define IMLIB_ENABLE_GET_SIMILARITY
 
 // Enable find_lines()
-#define IMLIB_ENABLE_FIND_LINES
+// #define IMLIB_ENABLE_FIND_LINES
 
 // Enable find_line_segments()
-#define IMLIB_ENABLE_FIND_LINE_SEGMENTS
+// #define IMLIB_ENABLE_FIND_LINE_SEGMENTS
 
 // find_lines() is required by the old find_line_segments()
 #if defined(IMLIB_ENABLE_FIND_LINE_SEGMENTS)\
@@ -129,39 +131,39 @@
 #endif
 
 // Enable find_circles()
-#define IMLIB_ENABLE_FIND_CIRCLES
+// #define IMLIB_ENABLE_FIND_CIRCLES
 
 // Enable find_rects()
-#define IMLIB_ENABLE_FIND_RECTS
+// #define IMLIB_ENABLE_FIND_RECTS
 
 // Enable find_qrcodes() (14 KB)
 #if CONFIG_MAIXPY_OMV_QRCODES
     #define IMLIB_ENABLE_QRCODES
 #endif
 
 // Enable find_apriltags() (64 KB)
-#define IMLIB_ENABLE_APRILTAGS
+// #define IMLIB_ENABLE_APRILTAGS
 
 // Enable find_datamatrices() (26 KB)
-#define IMLIB_ENABLE_DATAMATRICES
+// #define IMLIB_ENABLE_DATAMATRICES
 
 // Enable find_barcodes() (42 KB)
-#define IMLIB_ENABLE_BARCODES
+// #define IMLIB_ENABLE_BARCODES
 
 // Enable LENET (200+ KB).
-#define IMLIB_ENABLE_LENET
+// #define IMLIB_ENABLE_LENET
 
 // Enable CMSIS NN
-#define IMLIB_ENABLE_CNN
+// #define IMLIB_ENABLE_CNN
 
 // Enable FAST (20+ KBs).
-#define IMLIB_ENABLE_FAST
+// #define IMLIB_ENABLE_FAST
 
 // Enable find_hog()
-#define IMLIB_ENABLE_HOG
+// #define IMLIB_ENABLE_HOG
 
 // Enable selective_search()
-#define IMLIB_ENABLE_SELECTIVE_SEARCH
+// #define IMLIB_ENABLE_SELECTIVE_SEARCH
 
 #ifndef CONFIG_MAIXPY_OMV_CONV_YUV_FAST
     #define IMLIB_ENABLE_YUV_LAB_FUNC

components/micropython/port/src/omv/framebuffer.c

@@ -86,9 +86,9 @@ void fb_update_jpeg_buffer()
                 src.h=MAIN_FB()->h;
                 src.bpp=MAIN_FB()->bpp;
 #if CONFIG_MAIXPY_OMV_DOUBLE_BUFF
-                src.pixels=MAIN_FB()->pix_ai[g_sensor_buff_index_out];
+                src.pixels=MAIN_FB()->pixels[g_sensor_buff_index_out];
 #else
-                src.pixels=MAIN_FB()->pix_ai;
+                src.pixels=MAIN_FB()->pixels;
 #endif
             }
             else

components/micropython/port/src/omv/gc2145.c

@@ -63,10 +63,47 @@ static int gc2145_write_reg(sensor_t *sensor, uint8_t reg_addr, uint16_t reg_dat
     return cambus_writeb(sensor->slv_addr, reg_addr, (uint8_t)reg_data);
 }
 
+static int set_reg_bits(uint8_t slv_addr, uint8_t reg_addr, uint8_t mask, uint8_t shift, uint8_t value)
+{
+    uint8_t reg_data;
+    if (cambus_readb(slv_addr, reg_addr, &reg_data) != 0) {
+        return -1;
+    }
+    reg_data &= ~(mask << shift);
+    reg_data |= ((value & mask) << shift);
+    return cambus_writeb(slv_addr, reg_addr, reg_data);
+}
+
 static int gc2145_set_pixformat(sensor_t *sensor, pixformat_t pixformat)
 {
-    // TODO:
-    return 0;
+    int ret = 0;
+    
+    // Switch to page 0
+    ret |= cambus_writeb(sensor->slv_addr, 0xfe, 0x00);
+    
+    switch (pixformat) {
+        case PIXFORMAT_RGB565:
+            // RGB565 mode (value 6 in bits 4:0 of register 0x84)
+            ret |= set_reg_bits(sensor->slv_addr, 0x84, 0x1f, 0, 6);
+            break;
+            
+        case PIXFORMAT_YUV422:
+        case PIXFORMAT_GRAYSCALE:
+            ret |= set_reg_bits(sensor->slv_addr, 0x84, 0x1f, 0, 0);
+        
+            // Disable specific ISP modules that cause interlaced artifacts in colored regions
+            ret |= cambus_writeb(sensor->slv_addr, 0xfe, 0x02); // Switch to page 2
+            ret |= cambus_writeb(sensor->slv_addr, 0xd1, 0x00); // Disable YCP color saturation 
+            ret |= cambus_writeb(sensor->slv_addr, 0xd2, 0x00); // Disable YCP color saturation
+            ret |= cambus_writeb(sensor->slv_addr, 0xfe, 0x00); // Back to page 0 
+               
+            break;
+            
+        default:
+            return -1;
+    }
+    
+    return ret;
 }
 
 static int gc2145_set_framesize(sensor_t *sensor, framesize_t framesize)