Skip to content

Commit

Permalink
Add Flex support
Browse files Browse the repository at this point in the history
  • Loading branch information
cedelavergne-ledger committed Jun 19, 2024
1 parent 28a82c9 commit 04006b9
Show file tree
Hide file tree
Showing 137 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ICON_NANOS = icons/nanos_app_eos.gif
ICON_NANOX = icons/nano_app_eos.gif
ICON_NANOSP = icons/nano_app_eos.gif
ICON_STAX = icons/stax_app_eos.gif
ICON_FLEX = icons/flex_app_eos.gif

# Application allowed derivation curves.
# Possibles curves are: secp256k1, secp256r1, ed25519 and bls12381g1
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ You can choose which device to compile and load for by setting the `BOLOS_SDK` e
- `BOLOS_SDK=$NANOX_SDK`
- `BOLOS_SDK=$NANOSP_SDK`
- `BOLOS_SDK=$STAX_SDK`
- `BOLOS_SDK=$FLEX_SDK`

### Loading on a physical device

Expand Down
File renamed without changes
Binary file added icons/flex_app_eos.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ledger_app.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[app]
build_directory = "./"
sdk = "C"
devices = ["nanos", "nanox", "nanos+", "stax"]
devices = ["nanos", "nanox", "nanos+", "stax", "flex"]

[tests]
pytest_directory = "./tests/functional"
10 changes: 5 additions & 5 deletions src/ui_nbgl.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void ui_idle(void) {
infosList.infoContents = INFO_CONTENTS;

nbgl_useCaseHomeAndSettings(APPNAME,
&C_stax_app_eos_64px,
&C_app_eos_64px,
NULL,
INIT_HOME_PAGE,
&settingContents,
Expand All @@ -95,7 +95,7 @@ static void display_address_callback(bool confirm) {
void ui_display_public_key_flow(void) {
nbgl_useCaseAddressReview(tmpCtx.publicKeyContext.address,
NULL,
&C_stax_app_eos_64px,
&C_app_eos_64px,
"Verify Eos address",
NULL,
display_address_callback);
Expand Down Expand Up @@ -155,7 +155,7 @@ static nbgl_contentTagValue_t* get_multi_action_review_pair(uint8_t index) {
txProcessingCtx.currentActionNumber);
pair.value = review_action;
pair.centeredInfo = 1;
pair.valueIcon = &C_stax_app_eos_64px;
pair.valueIcon = &C_app_eos_64px;
return &pair;
}
return get_single_action_review_pair(index - 1);
Expand Down Expand Up @@ -190,7 +190,7 @@ void ui_display_single_action_sign_flow(void) {

nbgl_useCaseReview(TYPE_TRANSACTION,
&pairList,
&C_stax_app_eos_64px,
&C_app_eos_64px,
"Review transaction",
NULL,
"Sign transaction",
Expand Down Expand Up @@ -223,7 +223,7 @@ void ui_display_multiple_action_sign_flow(void) {
"With %d actions",
txProcessingCtx.currentActionNumber);
nbgl_useCaseReviewStreamingStart(TYPE_TRANSACTION,
&C_stax_app_eos_64px,
&C_app_eos_64px,
"Review transaction",
review_subtitle,
review_choice_single);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions tests/functional/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You can use for this the container `ghcr.io/ledgerhq/ledger-app-builder/ledger-a
docker pull ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
cd <your app repository>
docker run --user "$(id -u)":"$(id -g)" --rm -ti -v "$(realpath .):/app" --privileged -v "/dev/bus/usb:/dev/bus/usb" ledger-app-builder-lite:latest
make clean && make BOLOS_SDK=$<device>_SDK # replace <device> with one of [NANOS, NANOX, NANOSP, STAX]
make clean && make BOLOS_SDK=$<device>_SDK # replace <device> with one of [NANOS, NANOX, NANOSP, STAX, FLEX]
exit
```

Expand All @@ -43,7 +43,7 @@ You can use for this the container `ghcr.io/ledgerhq/ledger-app-builder/ledger-a
docker pull ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
cd app-<appname>
docker run --user "$(id -u)":"$(id -g)" --rm -ti -v "$(realpath .):/app" --privileged -v "/dev/bus/usb:/dev/bus/usb" ledger-app-builder-lite:latest
make clean && make BOLOS_SDK=$<device>_SDK load # replace <device> with one of [NANOS, NANOX, NANOSP, STAX]
make clean && make BOLOS_SDK=$<device>_SDK load # replace <device> with one of [NANOS, NANOX, NANOSP, STAX, FLEX]
exit
```

Expand All @@ -70,7 +70,7 @@ Standard useful pytest options
Custom pytest options
```shell
--device <device> run the test on the specified device [nanos,nanox,nanosp,stax,all]. This parameter is mandatory
--device <device> run the test on the specified device [nanos,nanox,nanosp,stax,flex,all]. This parameter is mandatory
--backend <backend> run the tests against the backend [speculos, ledgercomm, ledgerwallet]. Speculos is the default
--display on Speculos, enables the display of the app screen using QT
--golden_run on Speculos, screen comparison functions will save the current screen instead of comparing
Expand Down

0 comments on commit 04006b9

Please sign in to comment.