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.

Sign up for GitHub

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

Jump to bottom

typo combing #352

Merged
merged 4 commits into from
Feb 21, 2023
Merged

typo combing #352

merged 4 commits into from
Feb 21, 2023

Conversation

Round-Pi
Copy link
Contributor

@Round-Pi Round-Pi commented Feb 20, 2023 •
edited by xMasterX
Loading

What's new

  • fix typos, with the help of the spell check extension on VS Code

Verification

  • Build fbt
  • Update firmware on Flipper Zero and see if anything breaks

Checklist (For Reviewer)

  • PR has description of feature/bug
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

xMasterX
xMasterX requested changes Feb 20, 2023
View reviewed changes
Copy link
Member

@xMasterX xMasterX left a comment

Choose a reason for hiding this comment

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

Hi, amiibo was named ameebo to avoid nintendo copyrights issues
Do not rename that

Second thing, you changed submodules
lib/FreeRTOS-Kernel
lib/STM32CubeWB
We can't accept such changes

also revert changes to debug/fw.jflash

@Round-Pi
Copy link
Contributor Author

Alright, I made the changes.

xMasterX
xMasterX requested changes Feb 20, 2023
View reviewed changes
firmware/targets/f7/ble_glue/app_conf.h Outdated
@@ -463,4 +463,4 @@ typedef enum {
#define MAX_DBG_TRACE_MSG_SIZE 1024

#define CFG_OTP_BASE_ADDRESS OTP_AREA_BASE
#define CFG_OTP_END_ADRESS OTP_AREA_END_ADDR
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be reverted

also Ameebo needs to be reverted

@Round-Pi
Copy link
Contributor Author

Done. Are there any other changes I should fix?

@xMasterX
Copy link
Member

Done. Are there any other changes I should fix?

thanks, other things looks ok, i will test that nothing is broken today/tomorrow and will merge it

@Round-Pi
Copy link
Contributor Author

If it doesn't work, I can revert all the typo-fixes, except for the ones in comments and documents.

@xMasterX xMasterX self-assigned this Feb 21, 2023
xMasterX
xMasterX approved these changes Feb 21, 2023
View reviewed changes
Copy link
Member

@xMasterX xMasterX left a comment

Choose a reason for hiding this comment

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

Thanks!

@xMasterX xMasterX merged commit 202a97e into DarkFlippers:dev Feb 21, 2023
@Round-Pi Round-Pi deleted the dev2 branch February 23, 2023 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xMasterX xMasterX xMasterX approved these changes

Assignees

@xMasterX xMasterX

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Round-Pi @xMasterX