Skip to content

Commit e4187a8

Browse files
Merge pull request #18 from LedgerHQ/develop
merge develop into master
2 parents ea46888 + 6c3897d commit e4187a8

File tree

4 files changed

+37
-10
lines changed

4 files changed

+37
-10
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Ensure compliance with Ledger guidelines
2+
3+
# This workflow is mandatory in all applications
4+
# It calls a reusable workflow guidelines_enforcer developed by Ledger's internal developer team.
5+
# The successful completion of the reusable workflow is a mandatory step for an app to be available on the Ledger
6+
# application store.
7+
#
8+
# More information on the guidelines can be found in the repository:
9+
# LedgerHQ/ledger-app-workflows/
10+
11+
on:
12+
workflow_dispatch:
13+
push:
14+
branches:
15+
- master
16+
- main
17+
- develop
18+
pull_request:
19+
20+
jobs:
21+
guidelines_enforcer:
22+
name: Call Ledger guidelines_enforcer
23+
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,21 @@ ALL_PATH_PARAMS += $(NOS_PATH_PARAM)
5656

5757
ifeq ($(APP_TYPE), standalone)
5858
ifeq ($(TARGET_NAME),TARGET_NANOX)
59-
LIB_LOAD_FLAGS = --appFlags 0x250
60-
APP_LOAD_FLAGS = --appFlags 0x250
59+
LIB_LOAD_FLAGS = --appFlags 0x200
60+
APP_LOAD_FLAGS = --appFlags 0x200
6161
else
62-
LIB_LOAD_FLAGS = --appFlags 0x50
63-
APP_LOAD_FLAGS = --appFlags 0x50
62+
LIB_LOAD_FLAGS = --appFlags 0x00
63+
APP_LOAD_FLAGS = --appFlags 0x00
6464
endif
6565
DEFINES += IS_STANDALONE_APP
6666

6767
else ifeq ($(APP_TYPE), shared)
6868
ifeq ($(TARGET_NAME),TARGET_NANOX)
69-
LIB_LOAD_FLAGS = --appFlags 0xA50
70-
APP_LOAD_FLAGS = --appFlags 0x250 --dep Nano
69+
LIB_LOAD_FLAGS = --appFlags 0xA00
70+
APP_LOAD_FLAGS = --appFlags 0x200 --dep Nano
7171
else
72-
LIB_LOAD_FLAGS = --appFlags 0x850
73-
APP_LOAD_FLAGS = --appFlags 0x50 --dep Nano
72+
LIB_LOAD_FLAGS = --appFlags 0x800
73+
APP_LOAD_FLAGS = --appFlags 0x00 --dep Nano
7474
endif
7575
DEFINES += SHARED_LIBRARY_NAME=\"$(NANO_APP_NAME)\"
7676
DEFINES += HAVE_COIN_NANO
@@ -112,7 +112,7 @@ endif
112112

113113
APPVERSION_M=1
114114
APPVERSION_N=2
115-
APPVERSION_P=6
115+
APPVERSION_P=8
116116
APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
117117

118118
MAX_ADPU_INPUT_SIZE=217

ledger_app.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[app]
2+
build_directory = "./"
3+
sdk = "C"
4+
devices = ["nanos", "nanox", "nanos+"]

src/libn_app.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "u2f_transport.h"
2828
#include "u2f_processing.h"
29-
29+
extern u2f_service_t G_io_u2f;
3030
#endif // HAVE_IO_U2F
3131

3232
void libn_bagl_idle(void);

0 commit comments

Comments
 (0)