Added option to Swap A and B buttons in menu #2059

resistancelion · 2025-01-26T03:07:28Z

Please check if the PR fulfills these requirements

[OK, compiles & functions for TS100 3.45/TS101 3.50] The changes have been tested locally
[Forces to go to default settings after update] There are no breaking changes

What kind of change does this PR introduce?
Added menu option to swap A and B key functionality in menus (doesn't affect the Temperature regulation buttons)
Note: Effect is immediate, so if you double tap A, you'll apply it and go back to previous menu

#2034

Other information:
UK, BG, BE translations doesn't require re-visiting
New compiler definition: REVERSE_NAV_EVERYWHERE to make it reverse buttons not only in menu (if needed)

Unified statement to one type of translation ("Sleep mode" instead of "Waiting mode") Corrected "blink" translation Shortened phrases for statements ("t° у сек"/"градусів на секунду"; "сек"/"секунд","секунди"; "Хв"/"Хвилин","Хвилини") Traslated soldering tip type selection menu

Fixed padding

Spelling corrected + replaced "temperature" with "t°" in few places

Unified a few more sentences to be suitable for a context Fixed text size to better fit TS101/TS100

getButtonState() now have an option int/bool argument to swap the result via XOR

I don't know is it better or worse, functions the same

ia · 2025-01-26T18:39:48Z

Hello. Since I'm interested in this feature myself, I would like to test everything myself before merge, but I will try to give feedbck in 2-3 days tops.

Ralim · 2025-01-27T20:53:12Z

This code change seems fine, @ia if you can test this would be great, feel free to merge if it works in testing

Removed falsefully duplicated entry

Rework of 96x12 drawer, in order to support swapping of setting/heating hints

Style corrected

meh

meh(2)

Is It fOrMaTtEd EnOuGh??

Sorry

Code cleanup

Drawer rework, should look ok but testing is required

…o code style

…onNav

ia

Just a few rants about code style practices.

source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp

source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp

ia

Sorry for bad news again. :/
Just really would like to know how much do you need this REVERSE_NAV_EVERYWHERE feature for yourself.

ia · 2025-01-31T20:43:57Z

source/Core/Threads/GUIThread.cpp

@@ -43,8 +43,15 @@ guiContext    context;                                                  // Conte
 OperatingMode handle_post_init_state();
 OperatingMode guiHandleDraw(void) {
  OLED::clearScreen(); // Clear ready for render pass
+  bool d = getSettingValue(SettingsOptions::ReverseButtonNavEnabled);
+  bool e = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled);
+#ifdef REVERSE_NAV_EVERYWHERE


New compiler definition: REVERSE_NAV_EVERYWHERE to make it reverse buttons not only in menu (if needed)

Are you going to use this feature yourself? I really would like to know. And if you're not, then could this be removed, please?

My concern here is very simple: there are already two separate files to handle different screens, and now there will be two additional "combinatorial varieties", so basically when next time there will be some changes there, we have to think about basically four different use-case code paths, which may turn into nightmare from the perspective of code management & maintaining in the future.

Yes, i've thought that i've sent a comment mentioning it, but apparently i've forgot and had sent only this one

may turn into nightmare from the perspective of code management & maintaining in the future.

no request for or work towards - my mindset about such

Pardon, I'm a bit confused with your replies.

I have a simple question (two, actually): are you really going to use REVERSE_NAV_EVERYWHERE code paths yourself on a daily basis? Is that really more comfortable for you to use boost mode with the back button while soldering and going to standby/settings with the front button?

are you really going to use REVERSE_NAV_EVERYWHERE code paths yourself on a daily basis? Is that really more comfortable for you to use boost mode with the back button while soldering and going to standby/settings with the front button?

No, i use both +/- + A/B reverse, so yeah, Just a leak of conceptual analysis from my side, will it suit more to modify existing swapping setting to vary from 0 to 3, where 0 is neither and 3 is both?

Anyway, then let's keep for now REVERSE_NAV_EVERYWHERE as macro, and the swap of buttons for the settings menu as a setting, just like the original feature request in the issue was with the comments there. And I thought it was pretty clear there, so that's why I'm very confused how any misunderstanding about this feature could happen in the first place, since there is no any mention nor request about changing buttons on the main screens for Soldering mode and for Standy mode.

will it suit more to modify existing swapping setting to vary from 0 to 3 [...]

With high probability this turn some parts of the code base into even more hard-to-maintain spaghetti, than OLED section here now. Please, try to understand, that it's not a problem to staff as many features & options as some may would like to have, and then use it for themselves, but about for maintainers to keep it, well, maintain & support in the future.

But if there will be at least ~3 more users requesting an option to swap buttons on the main screen modes in the future as well, with heavy grounded reasoning, we may consider to add this as another boolean option, i.e. "swap buttons on main screen".

…nubuttons

ia

@resistancelion , as of for the review, these are a few code style notices:

first of all, could, you, please, fix this;
and somehow some files have been modified, while they shouldn't, so could, you, please, add/remove extra spaces at these places, like it used to be, because there were proper alignments originally, but now these changes only "spam" diff-view with noise, and not required:

ia · 2025-02-08T01:35:47Z

source/Core/BSP/Miniware/Vendor/CMSIS/Include/arm_math.h

@@ -495,7 +495,7 @@ static __INLINE q63_t mult32x64(q63_t x, q31_t y) { return ((((q63_t)(x & 0x0000
 /*
  #if defined (ARM_MATH_CM0_FAMILY) && defined ( __CC_ARM   )
  #define __CLZ __clz
-  #endif
+#endif


ia · 2025-02-08T01:35:58Z

source/Core/BSP/Pinecil/Vendor/NMSIS/Core/Include/nmsis_version.h

+ * #else
 *      #error "We need NMSIS 1.1.5 or later!"
- *   #endif
+ * #endif


ia · 2025-02-08T01:36:07Z

source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/nmsis/core/inc/core_feature_eclic.h

@@ -206,7 +206,7 @@ typedef enum IRQn {
 #ifdef NMSIS_ECLIC_VIRTUAL
    #ifndef NMSIS_ECLIC_VIRTUAL_HEADER_FILE
        #define NMSIS_ECLIC_VIRTUAL_HEADER_FILE "nmsis_eclic_virtual.h"
-    #endif
+  #endif


ia · 2025-02-08T01:36:13Z

source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/nmsis/core/inc/core_feature_eclic.h

@@ -238,7 +238,7 @@ typedef enum IRQn {
 #ifdef NMSIS_VECTAB_VIRTUAL
    #ifndef NMSIS_VECTAB_VIRTUAL_HEADER_FILE
        #define NMSIS_VECTAB_VIRTUAL_HEADER_FILE "nmsis_vectab_virtual.h"
-    #endif
+  #endif


ia · 2025-02-08T01:36:21Z

source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/nmsis/core/inc/nmsis_version.h

+ * #else
 *      #error "We need NMSIS 1.1.5 or later!"
- *   #endif
+ * #endif


ia · 2025-02-08T01:36:27Z

source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_math.h

@@ -495,7 +495,7 @@ static __INLINE q63_t mult32x64(q63_t x, q31_t y) { return ((((q63_t)(x & 0x0000
 /*
  #if defined (ARM_MATH_CM0_FAMILY) && defined ( __CC_ARM   )
  #define __CLZ __clz
-  #endif
+#endif


ia · 2025-02-08T01:36:36Z

source/Core/Drivers/Font.h

@@ -168,7 +168,7 @@
        0x03, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    #endif
+  #endif


ia · 2025-02-08T01:36:40Z

source/Core/Drivers/Font.h

@@ -356,7 +356,7 @@
          0x00,  0x00,  0x3e,  0x00,  0x00,  0x00,  0x07,  0x0f,  0x2b,  0x09,  0x07,  0x00,  0x01,  0x02,  0x04,  0x04,  0x04,  0x04,  0x04,  0x02,  0x01,
      }
    };
-  #else
+#else


ia · 2025-02-08T01:36:46Z

source/Core/Drivers/Font.h

@@ -401,7 +401,7 @@
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0xd0, 0xc8, 0x08, 0x10, 0x10, 0x10, 0x10,
        0x20, 0x20, 0x20, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x04, 0x38, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    #endif
+  #endif


ia · 2025-02-08T01:37:10Z

source/Core/Drivers/Font.h

+    };
+#endif


ia

UPD: Oops! I was heavily confused, because I got lost in macro names myself. I did make a heavy confusion between REVERSE_NAV_EVERYWHERE and REVERSE_BUTTON_NAV, obviously. :/

About macro management... These definitions with REVERSE_NAV_EVERYWHERE should be commented, i.e.:

// #define REVERSE_BUTTON_NAV // Uncomment to swap buttons completely in _Soldering mode_ and in _Standby mode_

in these places:

source/Core/BSP/MHP30/configuration.h

source/Core/BSP/Pinecil/configuration.h

source/Core/BSP/Miniware/configuration.h

source/Core/BSP/Pinecilv2/configuration.h

source/Core/BSP/Sequre/configuration.h

source/Core/Threads/GUIThread.cpp

CakeIsYummy21 · 2025-02-12T13:24:36Z

Very cool to see it getting done! : )

ia · 2025-02-13T05:17:43Z

Very cool to see it getting done! : )

Thanks, @CakeIsYummy21! I only would like to refactor a couple of things myself, so I hope it will be over by this weekend.

…nMenu handling and add the option to the end of the settings struct to avoid the collisions on factory resets

…tyle in configuration.h files for related changes

… a bit

…atus if swap buttons in menu is enabled

…e comment

resistancelion · 2025-02-19T08:28:56Z

source/Core/Threads/GUIThread.cpp

resistancelion added 5 commits January 25, 2025 06:21

Update translation_UK.json

3fc762c

Fixed padding

Update translation_UK.json

8f37b4c

Spelling corrected + replaced "temperature" with "t°" in few places

Update translation_UK.json

c229cec

Unified a few more sentences to be suitable for a context Fixed text size to better fit TS101/TS100

Implemented switching A and B buttons, closing Ralim#2034

1fb84d5

getButtonState() now have an option int/bool argument to swap the result via XOR

discip enabled auto-merge (squash) January 26, 2025 12:07

discip disabled auto-merge January 26, 2025 12:07

resistancelion added 4 commits January 26, 2025 16:33

Merge branch 'dev' into patch-2

9546086

Update code format in Settings.cpp

c6cd698

Removed edits from TemperatureAdjust.cpp, so less code will have changes

dfce094

Entirely moved button flipping to GUIIThread.cpp

659fa48

I don't know is it better or worse, functions the same

ia added the Usability UX, Usability and/or Design. label Jan 26, 2025

ia self-requested a review January 26, 2025 18:35

resistancelion and others added 12 commits January 28, 2025 12:41

Update translation_UK.json

031a47c

Removed falsefully duplicated entry

Update draw_homescreen_simplified.cpp

71551e6

Rework of 96x12 drawer, in order to support swapping of setting/heating hints

Update draw_homescreen_simplified.cpp

1ed2299

Style corrected

Update draw_homescreen_simplified.cpp

0f60d73

meh

Update draw_homescreen_simplified.cpp

719dc6b

meh(2)

Update draw_homescreen_simplified.cpp

5e5f858

Is It fOrMaTtEd EnOuGh??

Update draw_homescreen_simplified.cpp

24cb221

Sorry

Update draw_homescreen_simplified.cpp

b469179

Code cleanup

Update draw_homescreen_simplified (128x32)

ce86d65

Drawer rework, should look ok but testing is required

Sync

759b748

Translations/: replace tab by spaces for ReverseButtonNav according t…

80479cc

…o code style

translations_definitions.json: expand the description for ReverseButt…

c8ef810

…onNav

ia requested changes Jan 29, 2025

View reviewed changes

source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp Outdated Show resolved Hide resolved

source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp Outdated Show resolved Hide resolved

resistancelion added 2 commits January 29, 2025 06:23

Style correction

54d14b4

Style correction (8th TRY)

8908c9d

resistancelion added 6 commits January 30, 2025 18:33

-style

157769b

-style

5e78168

style(3)

79cb0b5

style(4)

9993fc1

style (5)

b6642ac

style (6)

ef8c9a6

ia requested changes Jan 31, 2025

View reviewed changes

ia added 2 commits February 7, 2025 05:19

Sync

8936787

Merge branch 'patch-2' of github.com:resistancelion/IronOS into rl-me…

904a25a

…nubuttons

ia self-assigned this Feb 8, 2025

Sync

bfbd1a5

ia linked an issue Feb 8, 2025 that may be closed by this pull request

Option to switch A and B button for settings #2034

Open

ia requested changes Feb 8, 2025

View reviewed changes

Summary

8b60290

ia requested changes Feb 8, 2025

View reviewed changes

Sync

0e703ca

ia added 11 commits February 17, 2025 17:57

Remove macro from configuration.h files

883ef60

Translations/: rename ReverseButtonNav to ReverseButtonMenu

726140d

Refactoring: unify the names of the variables related to ReverseButto…

7e57184

…nMenu handling and add the option to the end of the settings struct to avoid the collisions on factory resets

Refactoring: REVERSE_BUTTON_MENU handling and unify comment/section s…

0bd84d9

…tyle in configuration.h files for related changes

translations_definitions.json: ReverseButtonMenu - extend description…

432b583

… a bit

Refactoring: trying to find a more suitable variable name to check st…

035f3dd

…atus if swap buttons in menu is enabled

Refactoring: replace variables with one-letter names

a798509

Refactoring: clang-format for comments in settings struct

d78dcb4

Refactoring: Buttons - rename revert to swapButtonMenu

768668d

Translations: clarify the description of the option

362713a

Translation.h: reorder items in SettingsItemIndex properly and add th…

0ede3ec

…e comment

resistancelion commented Feb 19, 2025

View reviewed changes

source/Core/Threads/GUIThread.cpp

Copy link

Contributor Author

resistancelion Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added option to Swap A and B buttons in menu #2059

Added option to Swap A and B buttons in menu #2059

resistancelion commented Jan 26, 2025 •

edited

Loading

ia commented Jan 26, 2025

Ralim commented Jan 27, 2025

ia left a comment

ia left a comment

ia Jan 31, 2025

resistancelion Feb 6, 2025 •

edited

Loading

resistancelion Feb 6, 2025 •

edited

Loading

ia Feb 7, 2025

resistancelion Feb 7, 2025

ia Feb 8, 2025

ia left a comment •

edited

Loading

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia Feb 8, 2025

ia left a comment •

edited

Loading

CakeIsYummy21 commented Feb 12, 2025

ia commented Feb 13, 2025

resistancelion Feb 19, 2025

Added option to Swap A and B buttons in menu #2059

Are you sure you want to change the base?

Added option to Swap A and B buttons in menu #2059

Conversation

resistancelion commented Jan 26, 2025 • edited Loading

ia commented Jan 26, 2025

Ralim commented Jan 27, 2025

ia left a comment

Choose a reason for hiding this comment

ia left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

resistancelion Feb 6, 2025 • edited Loading

Choose a reason for hiding this comment

resistancelion Feb 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ia left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ia left a comment • edited Loading

Choose a reason for hiding this comment

CakeIsYummy21 commented Feb 12, 2025

ia commented Feb 13, 2025

Choose a reason for hiding this comment

resistancelion commented Jan 26, 2025 •

edited

Loading

resistancelion Feb 6, 2025 •

edited

Loading

resistancelion Feb 6, 2025 •

edited

Loading

ia left a comment •

edited

Loading

ia left a comment •

edited

Loading