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

[FL-2083] Bring Passport back #868

Merged
merged 6 commits into from
Dec 7, 2021
Merged

[FL-2083] Bring Passport back #868

merged 6 commits into from
Dec 7, 2021

Conversation

albkharisov
Copy link
Contributor

@albkharisov albkharisov commented Dec 4, 2021

What's new

  • Bring Passport back
  • Hide editing icounter and butthurt (now it's available by SRV_DOLPHIN_STATE_DEBUG flag or by manual setting screen variable in debug)

Verification

  • Run passport from main menu
  • long down press will show only firmware version

Checklist (do not modify)

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

@github-actions
Copy link

github-actions bot commented Dec 4, 2021

Please fix following code formatting errors:

./applications/dolphin/passport/passport.c:44:7: error: code should be clang-formatted [-Wclang-format-violations]
    if (stats->butthurt <= 4) {
      ^
./applications/dolphin/passport/passport.c:47:14: error: code should be clang-formatted [-Wclang-format-violations]
    } else if (stats->butthurt <= 9) {
             ^
./applications/dolphin/passport/passport.c:57:36: error: code should be clang-formatted [-Wclang-format-violations]
    uint32_t xp_for_current_level = xp_to_levelup + dolphin_state_xp_above_last_levelup(stats->icounter);
                                   ^
./applications/dolphin/passport/passport.c:58:7: error: code should be clang-formatted [-Wclang-format-violations]
    if (stats->level == 3) {
      ^

You might want to run docker compose exec dev /syntax_check.sh for an auto-fix.

@github-actions
Copy link

github-actions bot commented Dec 4, 2021

Click here to flash the 20714813 version of this branch via WebUSB.

@github-actions
Copy link

github-actions bot commented Dec 5, 2021

Please fix following code formatting errors:

./applications/dolphin/passport/passport.c:44:7: error: code should be clang-formatted [-Wclang-format-violations]
    if (stats->butthurt <= 4) {
      ^
./applications/dolphin/passport/passport.c:47:14: error: code should be clang-formatted [-Wclang-format-violations]
    } else if (stats->butthurt <= 9) {
             ^
./applications/dolphin/passport/passport.c:57:36: error: code should be clang-formatted [-Wclang-format-violations]
    uint32_t xp_for_current_level = xp_to_levelup + dolphin_state_xp_above_last_levelup(stats->icounter);
                                   ^
./applications/dolphin/passport/passport.c:58:7: error: code should be clang-formatted [-Wclang-format-violations]
    if (stats->level == 3) {
      ^

You might want to run docker compose exec dev /syntax_check.sh for an auto-fix.

@github-actions
Copy link

github-actions bot commented Dec 5, 2021

Please fix following code formatting errors:

./applications/dolphin/passport/passport.c:44:7: error: code should be clang-formatted [-Wclang-format-violations]
    if (stats->butthurt <= 4) {
      ^
./applications/dolphin/passport/passport.c:47:14: error: code should be clang-formatted [-Wclang-format-violations]
    } else if (stats->butthurt <= 9) {
             ^
./applications/dolphin/passport/passport.c:57:36: error: code should be clang-formatted [-Wclang-format-violations]
    uint32_t xp_for_current_level = xp_to_levelup + dolphin_state_xp_above_last_levelup(stats->icounter);
                                   ^
./applications/dolphin/passport/passport.c:58:7: error: code should be clang-formatted [-Wclang-format-violations]
    if (stats->level == 3) {
      ^

You might want to run docker compose exec dev /syntax_check.sh for an auto-fix.

@skotopes skotopes merged commit 604d80a into dev Dec 7, 2021
@skotopes skotopes deleted the alb/2083_passport branch December 7, 2021 13:13
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.

None yet

2 participants