Remove hard dependency on ArduinoGraphics

Author: leonardocavagnis

libraries/Arduino_H7_Video/examples/ArduinoLogo/ArduinoLogo.ino

@@ -6,6 +6,7 @@
 */
 
 #include "Arduino_H7_Video.h"
+#include "ArduinoGraphics.h"
 
 #include "img_arduinologo.h"
 // Alternatively, any raw RGB565 image can be included on demand using this macro

libraries/Arduino_H7_Video/examples/ArduinoLogoDrawing/ArduinoLogoDrawing.ino

@@ -6,6 +6,7 @@
 */
 
 #include "Arduino_H7_Video.h"
+#include "ArduinoGraphics.h"
 
 Arduino_H7_Video Display(800, 480, GigaDisplayShield);
 //Arduino_H7_Video Display(1024, 768, USBCVideo);

libraries/Arduino_H7_Video/src/Arduino_H7_Video.cpp

@@ -27,18 +27,23 @@ void lvgl_displayFlushing(lv_disp_drv_t * disp, const lv_area_t * area, lv_color
 #endif
 
 /* Functions -----------------------------------------------------------------*/
-Arduino_H7_Video::Arduino_H7_Video(int width, int heigth, H7DisplayShield &shield) :
-  ArduinoGraphics(width, heigth) {
+Arduino_H7_Video::Arduino_H7_Video(int width, int height, H7DisplayShield &shield)
+#ifdef HAS_ARDUINOGRAPHICS
+   : ArduinoGraphics(width, height)
+#endif
+{
+  _height   = height;
+  _width    = width;
   _shield   = &shield;
-  _edidMode = _shield->getEdidMode(width, heigth);
+  _edidMode = _shield->getEdidMode(width, height);
 
   switch(_edidMode) {
     case EDID_MODE_640x480_60Hz ... EDID_MODE_800x600_59Hz: 
     case EDID_MODE_1024x768_60Hz ... EDID_MODE_1920x1080_60Hz:
-      _rotated = (width < heigth) ? true : false;
+      _rotated = (width < height) ? true : false;
       break;
     case EDID_MODE_480x800_60Hz:
-      _rotated = (width >= heigth) ? true : false;
+      _rotated = (width >= height) ? true : false;
       break;
     default:
       _rotated = false;
@@ -50,14 +55,13 @@ Arduino_H7_Video::~Arduino_H7_Video() {
 }
 
 int Arduino_H7_Video::begin() {
+#ifdef HAS_ARDUINOGRAPHICS
   if (!ArduinoGraphics::begin()) {
-    return H7V_ERR_UNKNOWN;
+    return 1; /* Unknown err */
   }
 
   textFont(Font_5x7);
-
-  /* Configure SDRAM */
-  SDRAM.begin();
+#endif
 
   /* Video controller/bridge init */
   _shield->init(_edidMode);
@@ -71,7 +75,7 @@ int Arduino_H7_Video::begin() {
     static lv_color_t * buf1;                                           
     buf1 = (lv_color_t*)malloc((width() * height() / 10) * sizeof(lv_color_t)); /* Declare a buffer for 1/10 screen size */
     if (buf1 == NULL) {
-      return H7V_ERR_INSUFFMEM;
+      return 2; /* Insuff memory err */
     }
     lv_disp_draw_buf_init(&draw_buf, buf1, NULL, width() * height() / 10);      /* Initialize the display buffer. */
 
@@ -93,13 +97,27 @@ int Arduino_H7_Video::begin() {
     lv_disp_drv_register(&disp_drv);        /* Finally register the driver */
   #endif
 
+  /* Configure SDRAM */
+  SDRAM.begin(dsi_getFramebufferEnd());
+
   return 0;
 }
 
+int Arduino_H7_Video::width() {
+  return _width;
+}
+
+int Arduino_H7_Video::height() {
+  return _height;
+}
+
 void Arduino_H7_Video::end() {
+#ifdef HAS_ARDUINOGRAPHICS
   ArduinoGraphics::end();
+#endif
 }
 
+#ifdef HAS_ARDUINOGRAPHICS
 void Arduino_H7_Video::beginDraw() {
   ArduinoGraphics::beginDraw();
 
@@ -150,6 +168,7 @@ void Arduino_H7_Video::set(int x, int y, uint8_t r, uint8_t g, uint8_t b) {
     uint32_t color =  (uint32_t)((uint32_t)(r << 16) | (uint32_t)(g << 8) | (uint32_t)(b << 0));
     dsi_lcdFillArea((void *)(dsi_getCurrentFrameBuffer() + ((x_rot + (dsi_getDisplayXSize() * y_rot)) * sizeof(uint16_t))), 1, 1, color);
 }
+#endif
 
 #if __has_include("lvgl.h")
 void lvgl_displayFlushing(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p) {

libraries/Arduino_H7_Video/src/Arduino_H7_Video.h

@@ -12,38 +12,50 @@
 #define _ARDUINO_H7_VIDEO_H
 
 /* Includes ------------------------------------------------------------------*/
-#include <ArduinoGraphics.h>
 #include "H7DisplayShield.h"
+#if __has_include ("HasIncludeArduinoGraphics.h")
+#include "ArduinoGraphics.h"
+#define HAS_ARDUINOGRAPHICS
+#endif
 
 /* Exported defines ----------------------------------------------------------*/
-#define H7V_ERR_UNKNOWN             1
-#define H7V_ERR_INSUFFMEM           2
 
 /* Exported enumeration ------------------------------------------------------*/
 
 /* Class ----------------------------------------------------------------------*/
-class Arduino_H7_Video : public ArduinoGraphics {
+class Arduino_H7_Video
+#ifdef HAS_ARDUINOGRAPHICS
+ : public ArduinoGraphics
+#endif
+{
 public:
 #if defined(ARDUINO_PORTENTA_H7_M7)
-  Arduino_H7_Video(int width = 1024, int heigth = 768, H7DisplayShield &shield = USBCVideo);
+  Arduino_H7_Video(int width = 1024, int height = 768, H7DisplayShield &shield = USBCVideo);
 #elif defined(ARDUINO_GIGA)
-  Arduino_H7_Video(int width = 800, int heigth = 480, H7DisplayShield &shield = GigaDisplayShield);
+  Arduino_H7_Video(int width = 800, int height = 480, H7DisplayShield &shield = GigaDisplayShield);
 #endif
   ~Arduino_H7_Video();
 
   int begin();
   void end();
 
+  int width();
+  int height();
+
+#ifdef HAS_ARDUINOGRAPHICS
   void clear();
-  
+
   virtual void beginDraw();
   virtual void endDraw();
 
   virtual void set(int x, int y, uint8_t r, uint8_t g, uint8_t b);
+#endif
 private:
     H7DisplayShield*    _shield;
     bool                _rotated;
     int                 _edidMode;
+    uint32_t            _width;
+    uint32_t            _height;
 };
 
 #endif /* _ARDUINO_H7_VIDEO_H */

libraries/Arduino_H7_Video/src/H7DisplayShield.h

@@ -1,3 +1,6 @@
+#pragma once
+#include "Arduino.h"
+
 class H7DisplayShield {
     public:
         virtual int init(int edidmode) = 0;

libraries/Arduino_H7_Video/src/dsi.cpp

@@ -244,7 +244,7 @@ int dsi_init(uint8_t bus, struct edid *edid, struct display_timing *dt) {
 	HAL_DSI_Refresh(&dsi);
 
 	dsi_layerInit(0, FB_ADDRESS_0);
-	dsi_layerInit(1, FB_ADDRESS_1);
+	dsi_layerInit(1, FB_ADDRESS_0 + (lcd_x_size * lcd_y_size * BYTES_PER_PIXEL));
 
 	HAL_DSI_PatternGeneratorStop(&dsi);
 
@@ -321,6 +321,16 @@ uint32_t dsi_getFramebufferEnd(void) {
 	return (FB_BASE_ADDRESS + 2 * (lcd_x_size * lcd_y_size * BYTES_PER_PIXEL));
 }
 
+uint32_t dsi_getNextFrameBuffer() {
+	int fb = pend_buffer++ % 2;
+
+	__HAL_LTDC_LAYER_ENABLE(&(ltdc), fb);
+  	__HAL_LTDC_LAYER_DISABLE(&(ltdc), !fb);
+  	__HAL_LTDC_VERTICAL_BLANKING_RELOAD_CONFIG(&(ltdc));
+
+	return fb ? ltdc.LayerCfg[0].FBStartAdress : ltdc.LayerCfg[1].FBStartAdress;
+}
+
 void dsi_drawCurrentFrameBuffer(void) {
 	int fb = pend_buffer++ % 2;
 
@@ -402,7 +412,7 @@ extern "C" void LTDC_IRQHandler(void) {
 }
 
 /* Reload LTDC event callback */
-void HAL_LTDC_ReloadEventCallback(LTDC_HandleTypeDef *hltdc) {
+extern "C" void HAL_LTDC_ReloadEventCallback(LTDC_HandleTypeDef *hltdc) {
   reloadLTDC_status = 1;
 }
 

libraries/Arduino_H7_Video/src/dsi.h

@@ -37,6 +37,7 @@ void		dsi_lcdDrawImage(void *pSrc, void *pDst, uint32_t xSize, uint32_t ySize, u
 void		dsi_lcdFillArea(void *pDst, uint32_t xSize, uint32_t ySize, uint32_t ColorMode);
 void		dsi_configueCLUT(uint32_t* clut);
 void		dsi_drawCurrentFrameBuffer(void);
+uint32_t	dsi_getNextFrameBuffer(void);
 uint32_t	dsi_getCurrentFrameBuffer(void);
 uint32_t 	dsi_getActiveFrameBuffer(void);
 uint32_t	dsi_getFramebufferEnd(void);