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

Added TR Language and some code refactoring #497

Merged
merged 10 commits into from
Nov 30, 2024
Merged

Added TR Language and some code refactoring #497

merged 10 commits into from
Nov 30, 2024

Conversation

9dl
Copy link
Contributor

@9dl 9dl commented Nov 29, 2024

Proposed Changes

This pull request refactors and optimizes the interface based on issue #491. It introduces a new Bad Devices menu on the main page, which consolidates Bad USB and Bad BLE into a single section. The following changes are also made:

Resolved conflict between CH9329 and BleKeyboard.
Additionally, the code was refactored and cleaned up for improved readability and maintainability.

Types of Changes

  • New Feature: Added Bad KB to the main page and refactored existing features.
  • Fix bug: Resolved conflict between CH9329 and BleKeyboard.
  • Code Refactoring: Improved code readability and maintainability.

Verification

  • Navigate to the main menu and verify that Bad Devices is now visible, containing both Bad USB and Bad BLE features.

Testing

  • Has been tested on CYD.

Linked Issues

User-Facing Change

- Added a new **Bad Devices** menu to the main page containing **Bad USB** and **Bad BLE**.

Further Comments

-/-

9dl added 3 commits November 29, 2024 16:15
- BAD USB and BAD BLE now have their own separate menus.
- Resolved conflict between CH9329 and BleKeyboard.
- Refactored and cleaned up some parts of the code for improved readability and maintainability.
@9dl
Copy link
Contributor Author

9dl commented Nov 29, 2024

I dont really get the issue with other platforms, if any other contributor could help would be great.

@9dl
Copy link
Contributor Author

9dl commented Nov 29, 2024

Works now on all platform but the section only has Bad USB (originally was in Other section). Tested on CYD.

@9dl
Copy link
Contributor Author

9dl commented Nov 30, 2024

Types of Changes

  • Added TR Layout
  • Made the Names of the Keyboard Layout Menu better

@9dl 9dl changed the title Added a new menu for managing bad devices. Added a new menu for managing bad devices and TR Language Nov 30, 2024
@pr3y
Copy link
Owner

pr3y commented Nov 30, 2024

Hey @9dl thanks for contributing!
I liked the TK layout adding and the refactor, but idk about the icon for Bad devices being a bowling ball... also wasnt Bad BLE supposed to be on this menu?
its important to add that the firmware currently already have keybindings to go to some functions (like press 'b' for badUSB) while on main menu and even has the option to select a function to run as soon as it boots.
I dont see a reason for a menu just for 'Bad devices' for now, it could be added if some different icon or something to do with it, also 'Bad devices' can be confusing to end-user maybe

@9dl
Copy link
Contributor Author

9dl commented Nov 30, 2024

Yeah, the bowling ball was supposed to be a skull, haha. I'm not really great at designing icons, so it was a placeholder. As for Bad BLE, I ran into a lot of issues trying to combine it with Bad USB on other platforms. The keyboard libraries kept conflicting, and I couldn’t find a solid workaround.
For the menu, you make a good point. It might be better to skip the "Bad devices" menu for now. Thanks for the feedback! 😊

@9dl
Copy link
Contributor Author

9dl commented Nov 30, 2024

Types of Changes

  • New Feature: Added TR Language
  • Fix bug: Resolved conflict between CH9329 and BleKeyboard Libary.
  • Code Refactoring: Improved code readability and maintainability.

@9dl
Copy link
Contributor Author

9dl commented Nov 30, 2024

@pr3y I changed everything back to normal. 👍

@9dl 9dl changed the title Added a new menu for managing bad devices and TR Language Added TR Language and some code refactoring Nov 30, 2024
@pr3y
Copy link
Owner

pr3y commented Nov 30, 2024

Awesome! looks good to me now, feel free to join our discord
Only thing is that the first part of bad_usb.cpp could be more readable maybe with tabs but i gonna merge it anyways
Thanks again for contributing

@pr3y pr3y merged commit 5c89f70 into pr3y:main Nov 30, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Interface optimization
2 participants