Merge pull request #717 from facchinm/giga_camera_example

Restructure Giga camera example

Author: facchinm

Diff for: .github/workflows/compile-examples.yml

@@ -140,11 +140,13 @@ jobs:
               - name: ArduinoBLE
               - name: ArduinoGraphics
               - name: Arduino_GigaDisplayTouch
+              - name: arducam_dvp
             additional-sketch-paths: |
               - libraries/PDM
               - libraries/MCUboot
               - libraries/Camera/examples/CameraCaptureRawBytes
               - libraries/Camera/examples/CameraMotionDetect
+              - libraries/Camera/examples/GigaCameraDisplay
               - libraries/Portenta_SDCARD
               - libraries/Portenta_SDRAM
               - libraries/Arduino_H7_Video

Diff for: libraries/Camera/examples/GigaCameraDisplay/GigaCameraDisplay.ino

@@ -1,28 +1,40 @@
-#include "camera.h"
-#include "Portenta_lvgl.h"
-#include "Portenta_Video.h"
+#include "arducam_dvp.h"
+#include "Arduino_H7_Video.h"
+#include "dsi.h"
+#include "SDRAM.h"
 
-#if 0
-#include "gc2145.h"
-GC2145 galaxyCore;
-Camera cam(galaxyCore);
-#define IMAGE_MODE CAMERA_RGB565
-#else
-#include "himax.h"
+// This example only works with Greyscale cameras (due to the palette + resize&rotate algo)
+#define ARDUCAM_CAMERA_HM01B0
+
+#ifdef ARDUCAM_CAMERA_HM01B0
+#include "Himax_HM01B0/himax.h"
 HM01B0 himax;
 Camera cam(himax);
 #define IMAGE_MODE CAMERA_GRAYSCALE
+#elif defined(ARDUCAM_CAMERA_HM0360)
+#include "Himax_HM0360/hm0360.h"
+HM0360 himax;
+Camera cam(himax);
+#define IMAGE_MODE CAMERA_GRAYSCALE
+#elif defined(ARDUCAM_CAMERA_OV767X)
+#include "OV7670/ov767x.h"
+// OV7670 ov767x;
+OV7675 ov767x;
+Camera cam(ov767x);
+#define IMAGE_MODE CAMERA_RGB565
+#elif defined(ARDUCAM_CAMERA_GC2145)
+#include "GC2145/gc2145.h"
+GC2145 galaxyCore;
+Camera cam(galaxyCore);
+#define IMAGE_MODE CAMERA_RGB565
 #endif
 
-/*
-  Other buffer instantiation options:
-  FrameBuffer fb(0x30000000);
-  FrameBuffer fb(320,240,2);
-*/
+// The buffer used to capture the frame
 FrameBuffer fb;
-
-unsigned long lastUpdate = 0;
-
+// The buffer used to rotate and resize the frame
+FrameBuffer outfb;
+// The buffer used to rotate and resize the frame
+Arduino_H7_Video Display(800, 480, GigaDisplayShield);
 
 void blinkLED(uint32_t count = 0xFFFFFFFF)
 {
@@ -34,68 +46,61 @@ void blinkLED(uint32_t count = 0xFFFFFFFF)
     delay(50);                       // wait for a second
   }
 }
-void LCD_ST7701_Init();
 
 uint32_t palette[256];
 
 void setup() {
-  pinMode(PA_1, OUTPUT);
-  digitalWrite(PA_1, HIGH);
-
-  pinMode(PD_4, OUTPUT);
-  digitalWrite(PD_4, LOW);
-
   // Init the cam QVGA, 30FPS
   if (!cam.begin(CAMERA_R320x240, IMAGE_MODE, 30)) {
     blinkLED();
   }
 
+  // Setup the palette to convert 8 bit greyscale to 32bit greyscale
   for (int i = 0; i < 256; i++) {
     palette[i] = 0xFF000000 | (i << 16) | (i << 8) | i;
   }
 
-  giga_init_video();
-  LCD_ST7701_Init();
+  Display.begin();
 
-  blinkLED(5);
+  if (IMAGE_MODE == CAMERA_GRAYSCALE) {
+    dsi_configueCLUT((uint32_t*)palette);
+  }
+  outfb.setBuffer((uint8_t*)SDRAM.malloc(1024 * 1024));
 
-  stm32_configue_CLUT((uint32_t*)palette);
-  stm32_LCD_Clear(0);
-  stm32_LCD_Clear(0);
-  stm32_LCD_Clear(0);
-  stm32_LCD_Clear(0);
+  // clear the display (gives a nice black background)
+  dsi_lcdClear(0);
+  dsi_drawCurrentFrameBuffer();
+  dsi_lcdClear(0);
+  dsi_drawCurrentFrameBuffer();
 }
 
-#include "avir.h"
+#define HTONS(x)    (((x >> 8) & 0x00FF) | ((x << 8) & 0xFF00))
 
 void loop() {
 
-  lastUpdate = millis();
-
-  // Grab frame and write to serial
+  // Grab frame and write to another framebuffer
   if (cam.grabFrame(fb, 3000) == 0) {
-    //avir :: CImageResizer<> ImageResizer( 8 );
-    //ImageResizer.resizeImage( (uint8_t*)fb.getBuffer(), 320, 240, 0, (uint8_t*)outfb.getBuffer(), 480, 320, 1, 0 );
-    static FrameBuffer outfb(0x30000000);
-    //static FrameBuffer outfb(getFramebufferEnd());
-    for (int i = 0; i < 300; i++) {
+
+    // double the resolution and transpose (rotate by 90 degrees) in the same step
+    // this only works if the camera feed is 320x240 and the area where we want to display is 640x480
+    for (int i = 0; i < 320; i++) {
       for (int j = 0; j < 240; j++) {
-        //((uint8_t*)outfb.getBuffer())[j * 240 + (320 - i)] = ((uint8_t*)fb.getBuffer())[i * 320 + j];
-#if 1
-        ((uint8_t*)outfb.getBuffer())[j * 2 + (i * 2) * 480] = ((uint8_t*)fb.getBuffer())[i + j * 320];
-        ((uint8_t*)outfb.getBuffer())[j * 2 + (i * 2) * 480 + 1] = ((uint8_t*)fb.getBuffer())[i + j * 320];
-        ((uint8_t*)outfb.getBuffer())[j * 2 + (i*2+1) * 480] = ((uint8_t*)fb.getBuffer())[i + j * 320];
-        ((uint8_t*)outfb.getBuffer())[j * 2 + (i*2+1) * 480 + 1] = ((uint8_t*)fb.getBuffer())[i + j * 320];
-#endif
-#if 0
-        ((uint8_t*)outfb.getBuffer())[j + i * 240] = ((uint8_t*)fb.getBuffer())[i + j * 320];
-#endif
+        if (IMAGE_MODE == CAMERA_GRAYSCALE) {
+          ((uint8_t*)outfb.getBuffer())[j * 2 + (i * 2) * 480] = ((uint8_t*)fb.getBuffer())[i + j * 320];
+          ((uint8_t*)outfb.getBuffer())[j * 2 + (i * 2) * 480 + 1] = ((uint8_t*)fb.getBuffer())[i + j * 320];
+          ((uint8_t*)outfb.getBuffer())[j * 2 + (i * 2 + 1) * 480] = ((uint8_t*)fb.getBuffer())[i + j * 320];
+          ((uint8_t*)outfb.getBuffer())[j * 2 + (i * 2 + 1) * 480 + 1] = ((uint8_t*)fb.getBuffer())[i + j * 320];
+        } else {
+          ((uint16_t*)outfb.getBuffer())[j * 2 + (i * 2) * 480] = HTONS(((uint16_t*)fb.getBuffer())[i + j * 320]);
+          ((uint16_t*)outfb.getBuffer())[j * 2 + (i * 2) * 480 + 1] = HTONS(((uint16_t*)fb.getBuffer())[i + j * 320]);
+          ((uint16_t*)outfb.getBuffer())[j * 2 + (i * 2 + 1) * 480] = HTONS(((uint16_t*)fb.getBuffer())[i + j * 320]);
+          ((uint16_t*)outfb.getBuffer())[j * 2 + (i * 2 + 1) * 480 + 1] = HTONS(((uint16_t*)fb.getBuffer())[i + j * 320]);
+        }
       }
     }
-    //stm32_LCD_DrawImage((void*)outfb.getBuffer(), (void*)getNextFrameBuffer(), 240, 320, DMA2D_INPUT_L8);
-    stm32_LCD_DrawImage((void*)outfb.getBuffer(), (void*)getNextFrameBuffer(), 480, 640, DMA2D_INPUT_L8);
-    //stm32_LCD_DrawImage((void*)fb.getBuffer(), (void*)getNextFrameBuffer(), 320, 240, DMA2D_INPUT_L8);
+    dsi_lcdDrawImage((void*)outfb.getBuffer(), (void*)dsi_getCurrentFrameBuffer(), 480, 640, IMAGE_MODE == CAMERA_GRAYSCALE ? DMA2D_INPUT_L8 : DMA2D_INPUT_RGB565);
+    dsi_drawCurrentFrameBuffer();
   } else {
     blinkLED(20);
   }
-}
+}