Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEAT: Implemented swapping of A/B and X/Y in MainUI #1038

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/common/system/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ typedef struct settings_s {
int ingame_long_press;
int ingame_double_press;
bool disable_standby;
bool swap_abxy;

char mainui_button_x[JSON_STRING_LEN];
char mainui_button_y[JSON_STRING_LEN];
Expand Down Expand Up @@ -96,6 +97,7 @@ static settings_s __default_settings = (settings_s){
.ingame_long_press = 2,
.ingame_double_press = 3,
.disable_standby = false,
.swap_abxy = false,
.mainui_button_x = "",
.mainui_button_y = ""};

Expand Down Expand Up @@ -174,7 +176,7 @@ void settings_load(void)
settings.low_battery_autosave = !config_flag_get(".noLowBatteryAutoSave");
settings.mute = config_flag_get(".muteVolume");
settings.disable_standby = config_flag_get(".disableStandby");

settings.swap_abxy = config_flag_get(".swapABXY");
if (config_flag_get(".noBatteryWarning")) // flag is deprecated, but keep compatibility
settings.low_battery_warn_at = 0;

Expand Down Expand Up @@ -300,6 +302,7 @@ void settings_save(void)
config_flag_set(".noLowBatteryAutoSave", !settings.low_battery_autosave);
config_flag_set(".muteVolume", settings.mute);
config_flag_set(".disableStandby", settings.disable_standby);
config_flag_set(".swapABXY", settings.swap_abxy);
config_setNumber("battery/warnAt", settings.low_battery_warn_at);
config_setNumber("startup/app", settings.startup_application);
config_setNumber("startup/addHours", settings.time_skip);
Expand Down
5 changes: 5 additions & 0 deletions src/tweaks/actions.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ void action_setDisableStandby(void *pt)
settings.disable_standby = ((ListItem *)pt)->value == 1;
}

void action_swapABXY(void *pt)
{
settings.swap_abxy = ((ListItem *)pt)->value == 1;
}

void action_setMenuButtonHaptics(void *pt)
{
settings.menu_button_haptics = ((ListItem *)pt)->value == 1;
Expand Down
8 changes: 7 additions & 1 deletion src/tweaks/menus.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void menu_buttonActionInGameMenu(void *_)
void menu_buttonAction(void *_)
{
if (!_menu_button_action._created) {
_menu_button_action = list_create(6, LIST_SMALL);
_menu_button_action = list_create(7, LIST_SMALL);
strcpy(_menu_button_action.title, "Button shortcuts");
list_addItem(&_menu_button_action,
(ListItem){
Expand Down Expand Up @@ -306,6 +306,12 @@ void menu_buttonAction(void *_)
.value_formatter = formatter_appShortcut,
.action_id = 1,
.action = action_setAppShortcut});
list_addItem(&_menu_button_action,
(ListItem){
.label = "MainUI: Swap A/B and X/Y",
.item_type = TOGGLE,
.value = (int)settings.swap_abxy,
.action = action_swapABXY});
list_addItem(&_menu_button_action,
(ListItem){
.label = "Power single press",
Expand Down
Binary file modified static/build/.tmp_update/bin/MainUI-283-clean
Binary file not shown.
Binary file not shown.
Binary file modified static/build/.tmp_update/bin/MainUI-283-expert
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion static/build/.tmp_update/runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@ mainui_target=$miyoodir/app/MainUI

mount_main_ui() {
mainui_mode=$([ -f $sysdir/config/.showExpert ] && echo "expert" || echo "clean")
[ -f $sysdir/config/.swapABXY ] && mainui_mode="${mainui_mode}-abxy"
mainui_srcname="MainUI-$DEVICE_ID-$mainui_mode"
mainui_mount=$(basename "$(cat /proc/self/mountinfo | grep $mainui_target | cut -d' ' -f4)")

Expand All @@ -437,7 +438,7 @@ mount_main_ui() {
if [ ! -f $mainui_target ]; then
touch $mainui_target
fi

mount -o bind "$sysdir/bin/$mainui_srcname" $mainui_target
fi
}
Expand Down