add auto-detect of EDID mode for portenta H7+USB

Author: leonardocavagnis

libraries/Arduino_H7_Video/src/Arduino_H7_Video.cpp

@@ -14,7 +14,9 @@
 #include "dsi.h"
 #include "st7701.h"
 #include "SDRAM.h"
+extern "C" {
 #include "video_modes.h"
+}
 #include "anx7625.h"
 
 #if __has_include ("lvgl.h")
@@ -30,7 +32,29 @@ void lvgl_displayFlushing(lv_disp_drv_t * disp, const lv_area_t * area, lv_color
 Arduino_H7_Video::Arduino_H7_Video(int width, int heigth, DisplayShieldModel shield) :
   ArduinoGraphics(width, heigth) {
     _shield = shield;
-    _landscape = (width >= heigth) ? true : false;
+
+  #if defined(ARDUINO_PORTENTA_H7_M7)
+    if (_shield == NONE_SHIELD) {
+      _edidMode = video_modes_get_edid(width, heigth);
+    } else if (_shield == GIGA_DISPLAY_SHIELD) {
+      _edidMode = EDID_MODE_480x800_60Hz;
+    }
+  #elif defined(ARDUINO_GIGA)
+    _edidMode = EDID_MODE_480x800_60Hz;
+  #endif
+
+  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;
+      break;
+    case EDID_MODE_480x800_60Hz:
+      _rotated = (width >= heigth) ? true : false;
+      break;
+    default:
+      _rotated = false;
+      break;
+  }
 }
 
 Arduino_H7_Video::~Arduino_H7_Video() {
@@ -61,20 +85,20 @@ int Arduino_H7_Video::begin() {
       anx7625_dp_get_edid(0, &recognized_edid);
 
       //DSI Configuration
-      anx7625_dp_start(0, &recognized_edid, EDID_MODE_720x480_60Hz);
+      anx7625_dp_start(0, &recognized_edid, (enum edid_modes) _edidMode);
 
       //Configure SDRAM 
       SDRAM.begin(dsi_getFramebufferEnd());
     } else if (_shield == GIGA_DISPLAY_SHIELD) {
       //Init LCD Controller
-      st7701_init(EDID_MODE_480x800_60Hz);
+      st7701_init((enum edid_modes) _edidMode);
 
       //Configure SDRAM 
       SDRAM.begin();
     }
   #elif defined(ARDUINO_GIGA)
     //Init LCD Controller
-    st7701_init(EDID_MODE_480x800_60Hz);
+    st7701_init((enum edid_modes) _edidMode);
 
     //Configure SDRAM 
     SDRAM.begin();
@@ -101,7 +125,7 @@ int Arduino_H7_Video::begin() {
     lv_disp_drv_init(&disp_drv);                /* Basic initialization */
     disp_drv.flush_cb = lvgl_displayFlushing;   /* Set your driver function */
     disp_drv.draw_buf = &draw_buf;              /* Assign the buffer to the display */
-    if(_landscape) {
+    if(_rotated) {
       disp_drv.hor_res = height();        /* Set the horizontal resolution of the display */
       disp_drv.ver_res = width();         /* Set the vertical resolution of the display */
       disp_drv.rotated  = LV_DISP_ROT_270;
@@ -141,7 +165,7 @@ void Arduino_H7_Video::clear(){
   uint32_t bg = ArduinoGraphics::background();
   uint32_t x_size, y_size;
 
-  if(_landscape) {
+  if(_rotated) {
     x_size = (height() <= dsi_getDisplayXSize())? height() : dsi_getDisplayXSize();
     y_size = (width() <= dsi_getDisplayYSize())? width() : dsi_getDisplayYSize();
   } else {
@@ -155,7 +179,7 @@ void Arduino_H7_Video::clear(){
 void Arduino_H7_Video::set(int x, int y, uint8_t r, uint8_t g, uint8_t b) {
     uint32_t x_rot, y_rot;
 
-    if (_landscape) {
+    if (_rotated) {
       x_rot = ((height()-1) - y);
       y_rot = x;
 

libraries/Arduino_H7_Video/src/Arduino_H7_Video.h

@@ -43,7 +43,8 @@ class Arduino_H7_Video : public ArduinoGraphics {
   void attachLVGLTouchCb(void (*touch_cb)(void*,void*));
 private:
     DisplayShieldModel  _shield;
-    bool                _landscape;
+    bool                _rotated;
+    int                 _edidMode;
 };
 
 #endif /* _ARDUINO_H7_VIDEO_H */

libraries/Arduino_H7_Video/src/video_modes.c

@@ -49,6 +49,53 @@ struct envie_edid_mode envie_known_modes[NUM_KNOWN_MODES] = {
 		.hactive = 1280, .hback_porch = 370, .hfront_porch = 110, .hsync_len = 40,
 		.vactive = 720, .vback_porch = 30, .vfront_porch = 5, .vsync_len = 20,
 	},
+	[EDID_MODE_1920x1080_60Hz] = {
+		.name = "1920x1080@60Hz", .pixel_clock = 148500, .refresh = 60,
+		.hactive = 1920, .hback_porch = 280, .hfront_porch = 88, .hsync_len = 44,
+		.vactive = 1080, .vback_porch = 45, .vfront_porch = 4, .vsync_len = 4,
+	},
 };
 
+/* Functions -----------------------------------------------------------------*/
+
+enum edid_modes video_modes_get_edid(uint32_t h_check, uint32_t v_check) {
+	int sum = 0;
+	int sel_mode = -1;
+	int sel_sum = 0;
+
+	for (int i = 0; i<NUM_KNOWN_MODES; i++) {
+		if (h_check <= envie_known_modes[i].hactive && v_check <= envie_known_modes[i].vactive) {
+			sum = ((int)envie_known_modes[i].hactive - h_check) + 
+					((int)envie_known_modes[i].vactive - v_check);
+		} else {
+			sum = -1;
+		}
+
+		if (sum >= 0 && ((sel_mode == -1) || (sum < sel_sum))) {
+			sel_mode = i;
+			sel_sum = sum;
+		}
+	}
+
+	for (int i = 0; i<NUM_KNOWN_MODES; i++) {
+		if (h_check <= envie_known_modes[i].vactive && v_check <= envie_known_modes[i].hactive) {
+			sum = ((int)envie_known_modes[i].vactive - h_check) + 
+					((int)envie_known_modes[i].hactive - v_check);
+		} else {
+			sum = -1;
+		}
+
+		if (sum >= 0 && ((sel_mode == -1) || (sum < sel_sum))) {
+			sel_mode = i;
+			sel_sum = sum;
+		}
+	}
+
+	if (sel_mode == -1) {
+		sel_mode = EDID_MODE_1920x1080_60Hz;
+	}
+
+	return sel_mode;
+}
+
 /**** END OF FILE ****/

libraries/Arduino_H7_Video/src/video_modes.h

@@ -35,4 +35,7 @@ struct envie_edid_mode {
 /* Exported variables --------------------------------------------------------*/
 extern struct envie_edid_mode envie_known_modes[];
 
+/* Exported functions --------------------------------------------------------*/
+enum edid_modes video_modes_get_edid(uint32_t h_check, uint32_t v_check);
+
 #endif /* _VIDEO_MODES_H */