Skip to content

Commit

Permalink
SDK nanos 2.1.0-12 integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Xavier Chapron committed Oct 4, 2023
1 parent 12e5f6f commit 30189cf
Show file tree
Hide file tree
Showing 191 changed files with 18,681 additions and 16,902 deletions.
37 changes: 37 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
Language: Cpp
BasedOnStyle: Chromium
IndentWidth: 4
ColumnLimit: 100
UseTab: Never
IndentCaseLabels: true
# do not allow ifs or loops without braces
InsertBraces: true
PointerAlignment: Right

BreakBeforeBraces: Stroustrup
BreakBeforeBinaryOperators: true

BinPackArguments: false
BinPackParameters: false

AlignConsecutiveMacros:
Enabled: true
AcrossComments: true
AcrossEmptyLines: false

AlignConsecutiveDeclarations:
Enabled: true
AcrossComments: false
AcrossEmptyLines: false

AlignConsecutiveAssignments:
Enabled: true
AcrossComments: false
AcrossEmptyLines: false

AlignArrayOfStructures: Left
SortIncludes: Never
SpaceAfterCStyleCast: True
AllowShortEnumsOnASingleLine: false
...
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Run this command to always ignore formatting commits in `git blame`
# git config blame.ignoreRevsFile .git-blame-ignore-revs

# Formatting commit
9c45c201907c0de3df90ae2250b513f241a5f12e
17 changes: 17 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# To install hooks, run:
# pre-commit install --hook-type pre-commit
# pre-commit install --hook-type commit-msg

exclude: |
(?x)^(
lib_blewbxx/.*|
lib_stusb/.*|
lib_nbgl/include/.*.json|
lib_bagl/include/.*.json|
)$
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v16.0.6
hooks:
- id: clang-format
types_or: [c]
4 changes: 2 additions & 2 deletions include/appflags.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define APPLICATION_FLAG_DERIVE_MASTER 0x10

#define APPLICATION_FLAG_SHARED_NVRAM 0x20
#define APPLICATION_FLAG_GLOBAL_PIN 0x40
#define APPLICATION_FLAG_GLOBAL_PIN 0x40

// This flag means the application is meant to be debugged and allows for dump
// or core ARM register in case of a fault detection
Expand Down Expand Up @@ -78,6 +78,6 @@
#define APPLICATION_FLAG_AEM_PIN APPLICATION_FLAG_GLOBAL_PIN
#else
#define APPLICATION_FLAG_AEM_PIN APPLICATION_FLAG_BOLOS_UX
#endif // BOLOS_DEBUG_UX_PERMISSION_FLAG
#endif // BOLOS_DEBUG_UX_PERMISSION_FLAG

#define APPLICATION_FLAG_NEG_MASK 0xFFFF0000UL
2 changes: 1 addition & 1 deletion include/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
#include <stdio.h>
#endif

#endif // HAVE_BOLOS
#endif // HAVE_BOLOS

#define WIDE
Loading

0 comments on commit 30189cf

Please sign in to comment.