Skip to content

Commit a990865

Browse files
authored
Merge pull request #1089 from facchinm/giga_sdram_drive_strength
H7 Video: bugfixes
2 parents d9548c0 + 1bcaa95 commit a990865

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

libraries/Arduino_H7_Video/src/anx7625.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,8 @@ int anx7625_dp_get_edid(uint8_t bus, struct edid *out) {
475475

476476
ret = decode_edid(edid, (block_num + 1) * ONE_BLOCK_SIZE, out);
477477
if (ret != EDID_CONFORMANT) {
478-
ANXERROR("Failed to decode EDID.\n");
479-
return -1;
478+
ANXINFO("Non conformant EDID.\n");
479+
return 0;
480480
}
481481

482482
return 0;

libraries/Arduino_H7_Video/src/video_modes.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct envie_edid_mode envie_known_modes[NUM_KNOWN_MODES] = {
6363

6464
enum edid_modes video_modes_get_edid(uint32_t h_check, uint32_t v_check) {
6565
int sum = 0;
66-
int sel_mode = -1;
66+
int sel_mode = EDID_MODE_AUTO;
6767
int sel_sum = 0;
6868

6969
for (int i = 0; i<NUM_KNOWN_MODES; i++) {
@@ -74,7 +74,7 @@ enum edid_modes video_modes_get_edid(uint32_t h_check, uint32_t v_check) {
7474
sum = -1;
7575
}
7676

77-
if (sum >= 0 && ((sel_mode == -1) || (sum < sel_sum))) {
77+
if (sum >= 0 && ((sel_mode == EDID_MODE_AUTO) || (sum < sel_sum))) {
7878
sel_mode = i;
7979
sel_sum = sum;
8080
}
@@ -88,14 +88,13 @@ enum edid_modes video_modes_get_edid(uint32_t h_check, uint32_t v_check) {
8888
sum = -1;
8989
}
9090

91-
if (sum >= 0 && ((sel_mode == -1) || (sum < sel_sum))) {
91+
if (sum >= 0 && ((sel_mode == EDID_MODE_AUTO) || (sum < sel_sum))) {
9292
sel_mode = i;
9393
sel_sum = sum;
9494
}
9595
}
9696

97-
if (sel_mode == -1 ||
98-
sel_mode == EDID_MODE_1280x768_60Hz ||
97+
if (sel_mode == EDID_MODE_1280x768_60Hz ||
9998
sel_mode == EDID_MODE_1280x720_60Hz ||
10099
sel_mode == EDID_MODE_1920x1080_60Hz) {
101100
sel_mode = EDID_MODE_1024x768_60Hz;

libraries/Portenta_SDRAM/src/ram_internal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bool sdram_init(void) {
8989
/* Common GPIO configuration */
9090
gpio_init_structure.Mode = GPIO_MODE_AF_PP;
9191
gpio_init_structure.Pull = GPIO_PULLUP;
92-
gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
92+
gpio_init_structure.Speed = GPIO_SPEED_FREQ_MEDIUM;
9393
gpio_init_structure.Alternate = GPIO_AF12_FMC;
9494

9595
/* GPIOD configuration */

0 commit comments

Comments
 (0)