Commit 4ca97b1

authored

Merge pull request #1076 from iabdalkader/fix_h7_video

Fix video for USB-C displays.

2 parents bfadb39 + 924a976 commit 4ca97b1Copy full SHA for 4ca97b1

File tree

+43

-12

lines changed

+43

-12

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,23 @@ Arduino_H7_Video Display(800, 480, GigaDisplayShield);`
`22`	`22`
`23`	`23`	`Image img_arduinologo(ENCODING_RGB16, (uint8_t *) texture_raw, 300, 300);`
`24`	`24`
	`25`	`+void error() {`
	`26`	`+ while (true) {`
	`27`	`+ digitalWrite(LEDR, LOW);`
	`28`	`+ delay(500);`
	`29`	`+ digitalWrite(LEDR, HIGH);`
	`30`	`+ delay(500);`
	`31`	`+ }`
	`32`	`+}`
	`33`	`+`
`25`	`34`	`void setup() {`
`26`		`- Display.begin();`
	`35`	`+ if (Display.begin()) {`
	`36`	`+ error();`
	`37`	`+ }`
`27`	`38`
`28`	`39`	`Display.beginDraw();`
`29`	`40`	`Display.image(img_arduinologo, (Display.width() - img_arduinologo.width())/2, (Display.height() - img_arduinologo.height())/2);`
`30`	`41`	`Display.endDraw();`
`31`	`42`	`}`
`32`	`43`
`33`		`-void loop() { }`
	`44`	`+void loop() { }`

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,20 @@`
`11`	`11`	`Arduino_H7_Video Display(800, 480, GigaDisplayShield);`
`12`	`12`	`//Arduino_H7_Video Display(1024, 768, USBCVideo);`
`13`	`13`
	`14`	`+void error() {`
	`15`	`+ while (true) {`
	`16`	`+ digitalWrite(LEDR, LOW);`
	`17`	`+ delay(500);`
	`18`	`+ digitalWrite(LEDR, HIGH);`
	`19`	`+ delay(500);`
	`20`	`+ }`
	`21`	`+}`
	`22`	`+`
`14`	`23`	`void setup() {`
`15`		`- Display.begin();`
`16`		`-`
	`24`	`+ if (Display.begin()) {`
	`25`	`+ error();`
	`26`	`+ }`
	`27`	`+`
`17`	`28`	`Display.beginDraw();`
`18`	`29`	`Display.background(255, 255, 255);`
`19`	`30`	`Display.clear();`
`@@ -34,4 +45,4 @@ void setup() {`
`34`	`45`	`Display.endDraw();`
`35`	`46`	`}`
`36`	`47`
`37`		`-void loop() { }`
	`48`	`+void loop() { }`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,22 @@ static void set_slider_val(void * bar, int32_t val) {`
`28`	`28`	`lv_bar_set_value((lv_obj_t *)bar, val, LV_ANIM_ON);`
`29`	`29`	`}`
`30`	`30`
	`31`	`+void error() {`
	`32`	`+ while (true) {`
	`33`	`+ digitalWrite(LEDR, LOW);`
	`34`	`+ delay(500);`
	`35`	`+ digitalWrite(LEDR, HIGH);`
	`36`	`+ delay(500);`
	`37`	`+ }`
	`38`	`+}`
	`39`	`+`
`31`	`40`	`void setup() {`
`32`	`41`	`Serial.begin(115200);`
`33`	`42`
`34`		`- Display.begin();`
	`43`	`+ if (Display.begin()) {`
	`44`	`+ error();`
	`45`	`+ }`
	`46`	`+`
`35`	`47`	`TouchDetector.begin();`
`36`	`48`
`37`	`49`	`/* Create a container with grid 2x2 */`
`@@ -140,4 +152,4 @@ void setup() {`
`140`	`152`	`void loop() {`
`141`	`153`	`/* Feed LVGL engine */`
`142`	`154`	`lv_timer_handler();`
`143`		`-}`
	`155`	`+}`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,7 @@ int USBCVideoClass::init(int edidmode) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`//Read EDID`
`44`		`- err_code = anx7625_dp_get_edid(0, &recognized_edid);`
`45`		`- if(err_code < 0) {`
`46`		`- return err_code;`
`47`		`- }`
	`44`	`+ anx7625_dp_get_edid(0, &recognized_edid);`
`48`	`45`
`49`	`46`	`//DSI Configuration`
`50`	`47`	`err_code = anx7625_dp_start(0, &recognized_edid, (enum edid_modes) edidmode);`
`@@ -68,4 +65,4 @@ int USBCVideoClass::getStatus() {`
`68`	`65`	`}`
`69`	`66`
`70`	`67`	`GigaDisplayShieldClass GigaDisplayShield;`
`71`		`-USBCVideoClass USBCVideo;`
	`68`	`+USBCVideoClass USBCVideo;`

Comments

(0)