Skip to content

Commit 33b364a

Browse files
32teeth32teeth
committed
Wed 20 Nov 2019 15:44:44 EST - v.1.6-ZX-Spectrum-Fix Release
1 parent e787026 commit 33b364a

File tree

22 files changed

+163
-84
lines changed

22 files changed

+163
-84
lines changed

‎Components/odroid-go-spectrum-emulator/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ void app_main(void)
588588
odroid_sdcard_open(SD_BASE_PATH); // map SD card.
589589
// see if there is a 'resume.txt' file, use it if so...
590590

591-
odroid_settings_RomFilePath_set("/sd/roms/spectrum/Donkey Kong (1986)(Ocean Software).z80");
591+
//odroid_settings_RomFilePath_set("/sd/roms/spectrum/Donkey Kong (1986)(Ocean Software).z80");
592592
char* romPath = odroid_settings_RomFilePath_get();
593593
if (romPath)
594594
{

‎Emulators/handy-go/sdkconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200
8383
#
8484
# Retro ESP32 Configuration
8585
#
86-
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
87-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
88-
CONFIG_DEFAULT_MENU_KEY=
89-
CONFIG_COMBO_MENU_KEY=y
86+
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
87+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
88+
CONFIG_DEFAULT_MENU_KEY=y
89+
CONFIG_COMBO_MENU_KEY=
9090
CONFIG_IN_GAME_MENU_YES=y
9191
CONFIG_IN_GAME_MENU_NO=
9292

‎Firmware/Releases/odroid-go.zip

235 KB
Binary file not shown.

‎Firmware/Releases/odroid-go/Retro ESP32.fw

437 KB
Binary file not shown.

‎Firmware/Releases/retro-esp.zip

235 KB
Binary file not shown.

‎Firmware/Releases/retro-esp/Retro ESP32.fw

438 KB
Binary file not shown.

‎Launchers/retro-esp32/main/includes/definitions.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,8 @@
3030
3131
*/
3232
#define MAX_FILES 4096
33+
34+
/*
35+
36+
*/
37+
#define BUILD "Version 1 Build 6 (v.1.6)"

‎Launchers/retro-esp32/main/main.c

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"sms", // 3
6262
"gg", // 3
6363
"col", // 3
64-
"spectrum", // 3
64+
"spectrum", // 4
6565
"a26", // 5
6666
"a78", // 6
6767
"lynx", // 7
@@ -76,14 +76,14 @@
7676
"sms", // 3
7777
"gg", // 3
7878
"col", // 3
79-
"z80", // 3
79+
"z80", // 4
8080
"a26", // 5
8181
"a78", // 6
8282
"lnx", // 7
8383
"pce", // 8
8484
};
8585

86-
int PROGRAMS[COUNT] = {1, 2, 2, 3, 3, 3, 3, 4, 5, 6, 7, 8};
86+
int PROGRAMS[COUNT] = {1, 2, 2, 3, 3, 3, 4, 5, 6, 7, 8, 9};
8787
int LIMIT = 6;
8888
//}#pragma endregion Emulator and Directories
8989

@@ -333,6 +333,15 @@
333333
draw_text(x,y,"BRIGHTNESS",false, SETTING == 3 ? true : false);
334334

335335
draw_brightness();
336+
337+
/*
338+
BUILD
339+
*/
340+
char message[100] = BUILD;
341+
int width = strlen(message)*5;
342+
int center = ceil((320)-(width))-48;
343+
y = 225;
344+
draw_text(center,y,message,false,false);
336345
}
337346
//}#pragma endregion Settings
338347

@@ -763,7 +772,15 @@
763772
int h = 32;
764773
for(int r = 0; r < 32; r++) {
765774
for(int c = 0; c < 32; c++) {
766-
buffer[i] = SYSTEMS[STEP].system[r][c] == WHITE ? WHITE : GUI.bg;
775+
switch(COLOR) {
776+
case 0:
777+
buffer[i] = SYSTEMS[STEP].system[r][c] == WHITE ? WHITE : GUI.bg;
778+
break;
779+
case 1:
780+
//buffer[i] = SYSTEMS[e].system[r][c] == WHITE ? WHITE : GUI.bg;
781+
buffer[i] = SYSTEMS[STEP].color[r][c] == 0 ? GUI.bg : SYSTEMS[STEP].color[r][c];
782+
break;
783+
}
767784
i++;
768785
}
769786
}
@@ -1078,6 +1095,15 @@
10781095
}
10791096
ili9341_write_frame_rectangleLE(x, y, w, h, buffer);
10801097

1098+
/*
1099+
BUILD
1100+
*/
1101+
char message[100] = BUILD;
1102+
int width = strlen(message)*5;
1103+
int center = ceil((320)-(width))-48;
1104+
y = 225;
1105+
draw_text(center,y,message,false,false);
1106+
10811107
sleep(2);
10821108
draw_background();
10831109
}

‎Launchers/retro-esp32/partitions.csv

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ launcher, 0, ota_0, 0x200000, 0x80000
99
nes, 0, ota_1, 0x280000, 0xc0000
1010
gb, 0, ota_2, 0x340000, 0xb0000
1111
sms, 0, ota_3, 0x3F0000, 0x160000
12-
a26, 0, ota_4, 0x550000, 0x1a0000
13-
a78, 0, ota_5, 0x6F0000, 0xc0000
14-
lnx, 0, ota_6, 0x7B0000, 0xe0000
15-
pce, 0, ota_7, 0x890000, 0xb0000
16-
data_0, 0x40, 0x00, 0x940000, 0x400000
12+
spectrum, 0, ota_4, 0x550000, 0x90000
13+
a26, 0, ota_5, 0x5E0000, 0x1a0000
14+
a78, 0, ota_6, 0x780000, 0xc0000
15+
lnx, 0, ota_7, 0x840000, 0xe0000
16+
pce, 0, ota_8, 0x920000, 0xb0000
17+
data_0, 0x40, 0x00, 0x9D0000, 0x400000
1718
#########################################################
1819

20+
# spectrum = 447,712 = 524288 = 90000
21+
1922
# file size 0 kb bytes 0 hex 0
2023
# file size 64 kb bytes 65536 hex 10000
2124
# file size 128 kb bytes 131072 hex 20000

‎Launchers/retro-esp32/sdkconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
8282
#
8383
# Retro ESP32 Configuration
8484
#
85-
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
86-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
87-
CONFIG_DEFAULT_MENU_KEY=
88-
CONFIG_COMBO_MENU_KEY=y
85+
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
86+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
87+
CONFIG_DEFAULT_MENU_KEY=y
88+
CONFIG_COMBO_MENU_KEY=
8989

9090
#
9191
# Partition Table

0 commit comments

Comments
 (0)