Skip to content

Commit a9dc71f

Browse files
32teeth32teeth
committed
Wed 11 Sep 2019 09:42:11 EDT Issue #21 fix
1 parent 5e8cda4 commit a9dc71f

File tree

13 files changed

+38
-20
lines changed

13 files changed

+38
-20
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,8 @@
453453

454454
//{#pragma region Menu
455455
void hud_menu(void) {
456+
int volume = odroid_audio_volume_get();
457+
odroid_audio_terminate();
456458
hud_init();
457459
hud_debug("HUD - MENU");
458460
hud_background();
@@ -482,7 +484,7 @@
482484
//debounce(ODROID_INPUT_DOWN);
483485
}
484486
/*
485-
BUTTON A
487+
BUTTON B
486488
*/
487489
if (gamepad.values[ODROID_INPUT_B]) {
488490
ACTION = 0;
@@ -492,7 +494,8 @@
492494
/*
493495
BUTTON A
494496
*/
495-
if (gamepad.values[ODROID_INPUT_A]) {
497+
if (gamepad.values[ODROID_INPUT_A]) {
498+
odroid_audio_volume_set(volume);
496499
hud_debug(STATE.label);
497500
ACTION = STATE.action;
498501
switch(ACTION) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,8 @@
456456

457457
//{#pragma region Menu
458458
void hud_menu(void) {
459+
int volume = odroid_audio_volume_get();
460+
odroid_audio_terminate();
459461
hud_init();
460462
hud_debug("HUD - MENU");
461463
hud_background();
@@ -485,7 +487,7 @@
485487
//debounce(ODROID_INPUT_DOWN);
486488
}
487489
/*
488-
BUTTON A
490+
BUTTON B
489491
*/
490492
if (gamepad.values[ODROID_INPUT_B]) {
491493
ACTION = 0;
@@ -495,7 +497,8 @@
495497
/*
496498
BUTTON A
497499
*/
498-
if (gamepad.values[ODROID_INPUT_A]) {
500+
if (gamepad.values[ODROID_INPUT_A]) {
501+
odroid_audio_volume_set(volume);
499502
hud_debug(STATE.label);
500503
ACTION = STATE.action;
501504
switch(ACTION) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,8 @@
455455

456456
//{#pragma region Menu
457457
void hud_menu(void) {
458+
int volume = odroid_audio_volume_get();
459+
odroid_audio_terminate();
458460
hud_init();
459461
hud_debug("HUD - MENU");
460462
hud_background();
@@ -484,7 +486,7 @@
484486
//debounce(ODROID_INPUT_DOWN);
485487
}
486488
/*
487-
BUTTON A
489+
BUTTON B
488490
*/
489491
if (gamepad.values[ODROID_INPUT_B]) {
490492
ACTION = 0;
@@ -494,7 +496,8 @@
494496
/*
495497
BUTTON A
496498
*/
497-
if (gamepad.values[ODROID_INPUT_A]) {
499+
if (gamepad.values[ODROID_INPUT_A]) {
500+
odroid_audio_volume_set(volume);
498501
hud_debug(STATE.label);
499502
ACTION = STATE.action;
500503
switch(ACTION) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,8 @@
457457

458458
//{#pragma region Menu
459459
void hud_menu(void) {
460+
int volume = odroid_audio_volume_get();
461+
odroid_audio_terminate();
460462
hud_init();
461463
hud_debug("HUD - MENU");
462464
//hud_background();
@@ -489,7 +491,7 @@
489491
//debounce(ODROID_INPUT_DOWN);
490492
}
491493
/*
492-
BUTTON A
494+
BUTTON B
493495
*/
494496
if (gamepad.values[ODROID_INPUT_B]) {
495497
STATE.action = 0;
@@ -500,7 +502,8 @@
500502
/*
501503
BUTTON A
502504
*/
503-
if (gamepad.values[ODROID_INPUT_A]) {
505+
if (gamepad.values[ODROID_INPUT_A]) {
506+
odroid_audio_volume_set(volume);
504507
hud_debug(STATE.label);
505508
ACTION = STATE.action;
506509
switch(ACTION) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,8 @@
457457

458458
//{#pragma region Menu
459459
void hud_menu(void) {
460+
int volume = odroid_audio_volume_get();
461+
odroid_audio_terminate();
460462
hud_init();
461463
hud_debug("HUD - MENU");
462464
//hud_background();
@@ -489,7 +491,7 @@
489491
//debounce(ODROID_INPUT_DOWN);
490492
}
491493
/*
492-
BUTTON A
494+
BUTTON B
493495
*/
494496
if (gamepad.values[ODROID_INPUT_B]) {
495497
STATE.action = 0;
@@ -500,7 +502,8 @@
500502
/*
501503
BUTTON A
502504
*/
503-
if (gamepad.values[ODROID_INPUT_A]) {
505+
if (gamepad.values[ODROID_INPUT_A]) {
506+
odroid_audio_volume_set(volume);
504507
hud_debug(STATE.label);
505508
ACTION = STATE.action;
506509
switch(ACTION) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,8 @@
456456

457457
//{#pragma region Menu
458458
void hud_menu(void) {
459+
int volume = odroid_audio_volume_get();
460+
odroid_audio_terminate();
459461
hud_init();
460462
hud_debug("HUD - MENU");
461463
hud_background();
@@ -485,7 +487,7 @@
485487
//debounce(ODROID_INPUT_DOWN);
486488
}
487489
/*
488-
BUTTON A
490+
BUTTON B
489491
*/
490492
if (gamepad.values[ODROID_INPUT_B]) {
491493
ACTION = 0;
@@ -495,7 +497,8 @@
495497
/*
496498
BUTTON A
497499
*/
498-
if (gamepad.values[ODROID_INPUT_A]) {
500+
if (gamepad.values[ODROID_INPUT_A]) {
501+
odroid_audio_volume_set(volume);
499502
hud_debug(STATE.label);
500503
ACTION = STATE.action;
501504
switch(ACTION) {

‎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=y
87-
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
88-
CONFIG_DEFAULT_MENU_KEY=y
89-
CONFIG_COMBO_MENU_KEY=
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
9090
CONFIG_IN_GAME_MENU_YES=y
9191
CONFIG_IN_GAME_MENU_NO=
9292

‎Firmware/Releases/Retro ESP32.fw

-6.88 MB
Binary file not shown.

‎Firmware/Releases/odroid-go.zip

-2.13 MB
Binary file not shown.

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

2.03 KB
Binary file not shown.

0 commit comments

Comments
 (0)