Skip to content

Commit 8a816e8

Browse files
32teeth32teeth
committed
Tue Jan 5 12:51:05 EST 2021 - prep for 2.8 fix #82 
1 parent 1f6398d commit 8a816e8

File tree

24 files changed

+258
-81
lines changed

24 files changed

+258
-81
lines changed

‎Assets/insta.psd

-131 KB
Binary file not shown.

‎Assets/retro-esp32/logos/logo3d.gif

-1.01 KB
Loading

‎Components/go-play/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const uint16_t FONT_5x7[7][250] = {
179179

180180
};
181181

182-
#define BUILD "v.2.7"
182+
#define BUILD "v.2.8"
183183
const uint16_t logo[12][64] = {
184184
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
185185
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/handy-go/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const uint16_t FONT_5x7[7][250] = {
179179

180180
};
181181

182-
#define BUILD "v.2.7"
182+
#define BUILD "v.2.8"
183183
const uint16_t logo[12][64] = {
184184
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
185185
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/odroid-go-handy/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ const uint16_t icons[55][5] = {
206206
{65535,0,0,0,65535},
207207
};
208208

209-
#define BUILD "v.2.7"
209+
#define BUILD "v.2.8"
210210
const uint16_t logo[12][64] = {
211211
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
212212
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/odroid-go-pcengine-huexpress/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ THEME GUI;
209209
{65535,0,0,0,65535},
210210
};
211211

212-
#define BUILD "v.2.7"
212+
#define BUILD "v.2.8"
213213
const uint16_t logo[12][64] = {
214214
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
215215
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/odroid-go-spectrum-emulator/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ const uint16_t icons[55][5] = {
206206
{65535,0,0,0,65535},
207207
};
208208

209-
#define BUILD "v.2.7"
209+
#define BUILD "v.2.8"
210210
const uint16_t logo[12][64] = {
211211
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
212212
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/pitpo/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const uint16_t FONT_5x7[7][250] = {
179179

180180
};
181181

182-
#define BUILD "v.2.7"
182+
#define BUILD "v.2.8"
183183
const uint16_t logo[12][64] = {
184184
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
185185
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/prosystem-odroid-go/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ const uint16_t icons[55][5] = {
205205
{65535,0,0,0,65535},
206206
};
207207

208-
#define BUILD "v.2.7"
208+
#define BUILD "v.2.8"
209209
const uint16_t logo[12][64] = {
210210
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
211211
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/retro-go/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ const uint16_t icons[55][5] = {
206206
{65535,0,0,0,65535},
207207
};
208208

209-
#define BUILD "v.2.7"
209+
#define BUILD "v.2.8"
210210
const uint16_t logo[12][64] = {
211211
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
212212
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/stella-odroid-go/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ const uint16_t icons[55][5] = {
206206
{65535,0,0,0,65535},
207207
};
208208

209-
#define BUILD "v.2.7"
209+
#define BUILD "v.2.8"
210210
const uint16_t logo[12][64] = {
211211
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
212212
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Components/super-go-play/odroid-go-common/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ THEME GUI;
179179

180180
};
181181

182-
#define BUILD "v.2.7"
182+
#define BUILD "v.2.8"
183183
const uint16_t logo[12][64] = {
184184
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
185185
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Emulators/handy-go/components/odroid/odroid_hud.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const uint16_t FONT_5x7[7][250] = {
179179

180180
};
181181

182-
#define BUILD "v.2.7"
182+
#define BUILD "v.2.8"
183183
const uint16_t logo[12][64] = {
184184
{0,0,0,0,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,65535,0,0,0,0},
185185
{0,0,65535,65535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65535,65535,0,0},

‎Emulators/handy-go/sdkconfig

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,10 @@ CONFIG_MONITOR_BAUD=115200
8383
#
8484
# Retro ESP32 Configuration
8585
#
86-
<<<<<<< HEAD
87-
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
88-
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
89-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
90-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=y
91-
=======
92-
<<<<<<< HEAD
93-
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
94-
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
95-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
96-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=y
97-
=======
9886
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=y
9987
CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
10088
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
10189
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
102-
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
103-
>>>>>>> 2bd0266f688e7684c3a23dc6a37d6c3e5e1fe568
10490
CONFIG_DEFAULT_MENU_KEY=
10591
CONFIG_COMBO_MENU_KEY=y
10692
CONFIG_IN_GAME_MENU_YES=y
@@ -182,7 +168,11 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
182168
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
183169
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
184170
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
171+
<<<<<<< HEAD
172+
CONFIG_SPIRAM_SUPPORT=
173+
=======
185174
CONFIG_SPIRAM_SUPPORT=y
175+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
186176

187177
#
188178
# SPI RAM config

‎Firmware/Releases/cute-esp32.zip

-10.7 KB
Binary file not shown.

‎Firmware/Releases/cute-esp32/Retro ESP32.fw

-10.5 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
/*
4545
4646
*/
47-
#define BUILD "Version 2 Build 7 (v.2.7)"
47+
#define BUILD "Version 2 Build 8 (v.2.8)"
4848

4949

5050
#define _GNU_SOURCE

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,8 +1699,8 @@
16991699
int count = 0;
17001700

17011701
free(RECENTS);
1702-
RECENTS = (char**)malloc(50 * sizeof(void*));
1703-
1702+
//RECENTS = (char**)malloc(50 * sizeof(void*));
1703+
RECENTS = (char**)malloc((MAX_FILES_LIST) * sizeof(void*));
17041704
char file[256] = "/sd/odroid/data";
17051705
sprintf(file, "%s/%s", file, RETROESP_FOLDER);
17061706
sprintf(file, "%s/%s", file, RECENT_FILE);

0 commit comments

Comments
 (0)