Merge pull request #525 from arduino/benjamindannegard/display-shield-camera-update

[GIGA Display Shield] Camera tutorial update

Author: BenjaminDannegard

content/hardware/10.mega/shields/giga-display-shield/product.md

@@ -1,7 +1,7 @@
 ---
 title: GIGA Display Shield
 url_shop: https://store.arduino.cc/
-url_guide: /tutorials/basic-draw
+url_guide: /tutorials/getting-started
 core: arduino:mbed_giga
 ---
 

content/hardware/10.mega/shields/giga-display-shield/tutorials/camera-tutorial/content.md

@@ -14,12 +14,11 @@ The GIGA Display Shield comes with an Arducam camera connector. In this tutorial
 - [Arduino GIGA R1 WiFi](/hardware/giga-r1)
 - [Arduino GIGA Display Shield]()
 - [Arduino IDE](https://www.arduino.cc/en/software)
-- HM01B0 or HM0360 camera
-- [Arducam_dvp library](https://www.arduino.cc/reference/en/libraries/arducam_dvp/)
+- HM01B0, HM0360, GC2145 or OV7675 camera
 
 ## Downloading the Library and Core
 
-The Arduino Mbed OS Giga Boards core contains most of the libraries you need to work with the shield's camera connector. To install the core for GIGA boards, navigate to **Tools > Board > Boards Manager** or click the Boards Manager icon in the left tab of the IDE. In the Boards Manager tab, search for giga and install the latest Arduino Mbed OS Giga Boards version, the [Arduino_H7_Video library](https://github.com/arduino/ArduinoCore-mbed/tree/main/libraries/Arduino_H7_Video) library is included in the core. Now open the library tab on the left, search for **Arducam_dvp**, and install this library.
+The Arduino Mbed OS Giga Boards core contains most of the libraries you need to work with the shield's camera connector. To install the core for GIGA boards, navigate to **Tools > Board > Boards Manager** or click the Boards Manager icon in the left tab of the IDE. In the Boards Manager tab, search for giga and install the latest Arduino Mbed OS Giga Boards version, the [Arduino_H7_Video library](https://github.com/arduino/ArduinoCore-mbed/tree/main/libraries/Arduino_H7_Video) library is included in the core. Now open the library tab on the left, search for [**Arducam_dvp**](https://www.arduino.cc/reference/en/libraries/arducam_dvp/), and install this library.
 
 ![Library tab in the Arduino IDE](assets/ide-library.svg)
 
@@ -29,6 +28,8 @@ The GIGA Display Shield is compatible with the following cameras:
 
 - [HM01B0](https://www.arducam.com/product/hm01b0-qvga-monochrome-dvp-camera-module-for-arduino-giga-r1-wifi-board/)
 - [HM0360](https://www.arducam.com/product/hm0360-vga-monochrome-dvp-camera-module-for-arduino-giga-r1-wifi-board/)
+- [GC2145](https://www.arducam.com/product/2mp-gc2145-color-dvp-camera-module-for-arduino-giga-r1-wifi-board/)
+- [OV7675](https://store.arduino.cc/products/arducam-camera-module?queryID=undefined)
 
 Connect the camera to the connector on the front of the display shield as shown in the image below.
 
@@ -67,13 +68,11 @@ Camera cam(himax);
 OV7675 ov767x;
 Camera cam(ov767x);
 #define IMAGE_MODE CAMERA_RGB565
-#error "Unsupported camera (at the moment :) )"
 #elif defined(ARDUCAM_CAMERA_GC2145)
 #include "GC2145/gc2145.h"
 GC2145 galaxyCore;
 Camera cam(galaxyCore);
 #define IMAGE_MODE CAMERA_RGB565
-#error "Unsupported camera (at the moment :) )"
 #endif
 
 // The buffer used to capture the frame
@@ -108,9 +107,11 @@ void setup() {
   }
 
   Display.begin();
-  dsi_configueCLUT((uint32_t*)palette);
 
-  outfb.setBuffer((uint8_t*)SDRAM.malloc(1024*1024));
+  if (IMAGE_MODE == CAMERA_GRAYSCALE) {
+    dsi_configueCLUT((uint32_t*)palette);
+  }
+  outfb.setBuffer((uint8_t*)SDRAM.malloc(1024 * 1024));
 
   // clear the display (gives a nice black background)
   dsi_lcdClear(0);
@@ -119,6 +120,8 @@ void setup() {
   dsi_drawCurrentFrameBuffer();
 }
 
+#define HTONS(x)    (((x >> 8) & 0x00FF) | ((x << 8) & 0xFF00))
+
 void loop() {
 
   // Grab frame and write to another framebuffer
@@ -128,13 +131,20 @@ void loop() {
     // 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 * 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];
+        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]);
+        }
       }
     }
-    dsi_lcdDrawImage((void*)outfb.getBuffer(), (void*)dsi_getCurrentFrameBuffer(), 480, 640, 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);
@@ -145,4 +155,3 @@ void loop() {
 ## Conclusion
 
 This tutorial went through how to connect a compatible camera to the shield and also how to test it out quickly with the example sketch included in the core. Now you should see a live feed from the camera on your GIGA Display Shield!
-