Skip to content

Commit

Permalink
removed old RS90 specific logic
Browse files Browse the repository at this point in the history
  • Loading branch information
Shaun Inman committed Jun 24, 2022
1 parent 327b817 commit ca9ac4c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 29 deletions.
4 changes: 4 additions & 0 deletions nopes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
keyrepeat doesn't work in in-game menu
this is intentional so you can't accidentally choose
Load instead of Save by holding the button too long

alt core UI
I figured out what I don't like about this:
it forces a user to think about emulator meta in the launcher
Expand Down
13 changes: 1 addition & 12 deletions src/libmmenu/mmenu.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,12 @@ MenuReturnStatus ShowMenu(char* rom_path, char* save_path_template, SDL_Surface*
int save_exists = 0;
int preview_exists = 0;

// TODO: remove is_locked logic

int quit = 0;
int dirty = 1;
int show_setting = 0; // 1=brightness,2=volume
int setting_value = 0;
int setting_min = 0;
int setting_max = 0;
int select_is_locked = 0; // rs90-only
unsigned long cancel_start = SDL_GetTicks();
int was_charging = isCharging();
unsigned long charge_start = SDL_GetTicks();
Expand All @@ -483,14 +480,6 @@ MenuReturnStatus ShowMenu(char* rom_path, char* save_path_template, SDL_Surface*

Input_poll();

// rs90-only
if (select_was_pressed && Input_justReleased(kButtonSelect) && Input_justPressed(kButtonL)) {
select_is_locked = 1;
}
else if (select_is_locked && Input_justReleased(kButtonL)) {
select_is_locked = 0;
}

if (Input_justPressed(kButtonUp)) {
selected -= 1;
if (selected<0) selected += kItemCount;
Expand Down Expand Up @@ -649,7 +638,7 @@ MenuReturnStatus ShowMenu(char* rom_path, char* save_path_template, SDL_Surface*
setting_min = MIN_BRIGHTNESS;
setting_max = MAX_BRIGHTNESS;
}
else if (Input_isPressed(kButtonSelect) || select_is_locked) {
else if (Input_isPressed(kButtonSelect)) {
show_setting = 2;
setting_value = GetVolume();
setting_min = MIN_VOLUME;
Expand Down
8 changes: 2 additions & 6 deletions src/miniui/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1030,15 +1030,12 @@ int main (int argc, char *argv[]) {
int setting_value = 0;
int setting_min = 0;
int setting_max = 0;
int select_is_locked = 0; // rs90-only
int select_was_locked = 0;
int delay_start = 0;
int delay_select = 0;
unsigned long cancel_start = SDL_GetTicks();
unsigned long power_start = 0;
while (!quit) {
unsigned long frame_start = SDL_GetTicks();
int select_was_pressed = Input_isPressed(kButtonSelect); // rs90-only

Input_poll();

Expand Down Expand Up @@ -1112,8 +1109,7 @@ int main (int argc, char *argv[]) {
}
}

// NOTE: && !Input_justReleased(kButtonSelect) is for RS90
if (!Input_isPressed(kButtonStart) && !Input_isPressed(kButtonSelect) && !Input_justReleased(kButtonSelect)) {
if (!Input_isPressed(kButtonStart) && !Input_isPressed(kButtonSelect)) {
if (Input_justRepeated(kButtonL)) { // previous alpha
Entry* entry = top->entries->items[selected];
int i = entry->alpha-1;
Expand Down Expand Up @@ -1217,7 +1213,7 @@ int main (int argc, char *argv[]) {
setting_min = MIN_BRIGHTNESS;
setting_max = MAX_BRIGHTNESS;
}
else if ((Input_isPressed(kButtonSelect) || select_is_locked) && !delay_select) {
else if (Input_isPressed(kButtonSelect) && !delay_select) {
show_setting = 2;
setting_value = GetVolume();
setting_min = MIN_VOLUME;
Expand Down
15 changes: 4 additions & 11 deletions todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Please see the README.txt in the zip file for installation and update instructio

- added "Max FF speed" to `Advanced > Options > Audio and video` (thanks eggs!)
- fixed RESUME button hint appearing on version screen
- updated installer/updater to update the bootcmd if necessary

-------------------------------

Expand All @@ -14,19 +15,14 @@ and upload comparable v0.0.3 there too
for now I'm running the toolchain with a local v0.0.3 for vvvvvv
===============================

- mmenu keyrepeat isn't working
- BUG: I think show et al need to make sure pan is set to 0,0?
using after progressui sometimes results in the image not showing
also affects https://github.com/schmurtzm/Miyoo-Mini-easy-logotweak/

- quicksave and power off when /tmp/battery hits 5?
change message when performing emergency power off
maybe handle in keymon? then signal picoarch to shutdown

- maybe only change the bootcmd if "sleep" is present? eg.

OLD_CMD=`/etc/fw_printenv bootcmd`
if [[ "$OLD_CMD" == *"sleepms"* ]]; then
echo "update bootcmd"
fi

- revisit defaults and overrides for gambatte and mgba
- mgba needs rumble strength setting

Expand Down Expand Up @@ -89,9 +85,6 @@ for now I'm running the toolchain with a local v0.0.3 for vvvvvv

- BUG: say doesn't seem to respect extra line returns at end of msg

- BUG: I think show et al need to make sure pan is set to 0,0?
using after progressui sometimes results in the image not showing

- use smsplus-gx for SMS/GG?

- scroll long names
Expand Down

0 comments on commit ca9ac4c

Please sign in to comment.