Skip to content

Commit 5cf88e2

Browse files
committed
Tue Jan 5 23:31:59 EST 2021 - quick fix
1 parent faf93cc commit 5cf88e2

File tree

39 files changed

+25
-388
lines changed

39 files changed

+25
-388
lines changed

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.8"
182+
#define BUILD "v.2.7"
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.8"
182+
#define BUILD "v.2.7"
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.8"
209+
#define BUILD "v.2.7"
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.8"
212+
#define BUILD "v.2.7"
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.8"
209+
#define BUILD "v.2.7"
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.8"
182+
#define BUILD "v.2.7"
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.8"
208+
#define BUILD "v.2.7"
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.8"
209+
#define BUILD "v.2.7"
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.8"
209+
#define BUILD "v.2.7"
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.8"
182+
#define BUILD "v.2.7"
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},

Configs/cute-esp32/Emulators/frodo-go/sdkconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,7 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
168168
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
169169
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
170170
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
171-
<<<<<<< HEAD
172-
CONFIG_SPIRAM_SUPPORT=
173-
=======
174171
CONFIG_SPIRAM_SUPPORT=y
175-
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
176172

177173
#
178174
# SPI RAM config

0 commit comments

Comments
 (0)