Skip to content

Commit

Permalink
Merge pull request #119 from cosmos/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ainhoa-a committed Jun 14, 2024
2 parents 7632c9f + 8d0039a commit 17d607c
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ endif
ifeq ($(TARGET_NAME),TARGET_NANOS)
APP_STACK_MIN_SIZE := 1600
else
APP_STACK_MIN_SIZE := 3800
APP_STACK_MIN_SIZE := 1752
endif

include $(CURDIR)/../deps/ledger-zxlib/makefiles/Makefile.platform
Expand Down
2 changes: 1 addition & 1 deletion app/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ APPVERSION_M=2
# This is the `spec_version` field of `Runtime`
APPVERSION_N=35
# This is the patch version of this release
APPVERSION_P=22
APPVERSION_P=23
2 changes: 1 addition & 1 deletion deps/nanos-secure-sdk
Submodule nanos-secure-sdk updated 76 files
+4 −2 Makefile
+11 −3 Makefile.app_params
+1 −1 Makefile.defines
+6 −1 Makefile.glyphs
+8 −0 Makefile.standard_app
+2 −2 README.md
+81 −0 include/app_storage.h
+3 −3 include/ledger_protocol.h
+26 −0 include/os_io_nfc.h
+1 −1 include/os_io_seproxyhal.h
+17 −4 include/os_settings.h
+2 −2 include/ox_aes.h
+8 −0 lib_bagl/include/bagl_font_rom.inc
+9 −7 lib_blewbxx_impl/src/ledger_ble.c
+2 −2 lib_cxng/include/lcx_cipher.h
+117 −121 lib_nbgl/doc/nbgl_layout.dox
+ lib_nbgl/doc/resources/keyboard-usages.png
+ lib_nbgl/doc/resources/keypad-usages.png
+ lib_nbgl/doc/resources/layout1.png
+ lib_nbgl/doc/resources/layout10.png
+ lib_nbgl/doc/resources/layout11.png
+ lib_nbgl/doc/resources/layout12.png
+ lib_nbgl/doc/resources/layout13.png
+ lib_nbgl/doc/resources/layout15.png
+ lib_nbgl/doc/resources/layout6.png
+ lib_nbgl/doc/resources/layout8.png
+ lib_nbgl/doc/resources/layout9.png
+ lib_nbgl/doc/resources/layout_choice_buttons1.png
+ lib_nbgl/doc/resources/stax_layout1.png
+ lib_nbgl/doc/resources/stax_layout11.png
+ lib_nbgl/doc/resources/stax_layout13.png
+ lib_nbgl/doc/resources/stax_layout15.png
+ lib_nbgl/doc/resources/stax_layout6.png
+ lib_nbgl/doc/resources/stax_layout8.png
+ lib_nbgl/doc/resources/stax_layout9.png
+ lib_nbgl/glyphs/32px/Mini_Push_32px.png
+ lib_nbgl/glyphs/32px/radio_active_32px.png
+ lib_nbgl/glyphs/32px/radio_inactive_32px.png
+ lib_nbgl/glyphs/40px/Mini_Push_40px.png
+ lib_nbgl/glyphs/40px/radio_active_40px.png
+ lib_nbgl/glyphs/40px/radio_inactive_40px.png
+ lib_nbgl/glyphs/wallet/radio_active_32px.bmp
+ lib_nbgl/glyphs/wallet/radio_active_40.bmp
+ lib_nbgl/glyphs/wallet/radio_inactive_32px.bmp
+ lib_nbgl/glyphs/wallet/radio_inactive_40.bmp
+8 −0 lib_nbgl/include/fonts/nbgl_font_rom.inc
+39 −11 lib_nbgl/include/nbgl_content.h
+2 −3 lib_nbgl/include/nbgl_flow.h
+16 −8 lib_nbgl/include/nbgl_layout.h
+16 −2 lib_nbgl/include/nbgl_obj.h
+4 −1 lib_nbgl/include/nbgl_page.h
+35 −8 lib_nbgl/include/nbgl_use_case.h
+26 −44 lib_nbgl/src/nbgl_fonts.c
+223 −163 lib_nbgl/src/nbgl_layout.c
+11 −1 lib_nbgl/src/nbgl_layout_internal.h
+88 −105 lib_nbgl/src/nbgl_layout_keyboard.c
+9 −10 lib_nbgl/src/nbgl_layout_keypad.c
+0 −2 lib_nbgl/src/nbgl_layout_nanos.c
+36 −71 lib_nbgl/src/nbgl_layout_navigation.c
+36 −29 lib_nbgl/src/nbgl_obj.c
+27 −37 lib_nbgl/src/nbgl_page.c
+42 −15 lib_nbgl/src/nbgl_step.c
+257 −139 lib_nbgl/src/nbgl_use_case.c
+32 −2 lib_nbgl/src/nbgl_use_case_nanos.c
+87 −85 lib_nbgl/tools/icon2glyph.py
+106 −0 lib_standard_app/app_storage.c
+4 −4 lib_standard_app/main.c
+8 −1 lib_stusb_impl/usbd_impl.c
+1 −1 src/checks.c
+1 −1 src/ledger_assert.c
+74 −81 src/ledger_protocol.c
+109 −0 src/os_io_nfc.c
+10 −28 src/os_io_seproxyhal.c
+1 −1 target/nanos2/script.ld
+1 −1 target/nanox/script.ld
+3 −3 unit-tests/lib_nbgl/test_nbgl_obj.c
2 changes: 1 addition & 1 deletion deps/nanosplus-secure-sdk
Submodule nanosplus-secure-sdk updated 76 files
+4 −2 Makefile
+11 −3 Makefile.app_params
+1 −1 Makefile.defines
+6 −1 Makefile.glyphs
+8 −0 Makefile.standard_app
+2 −2 README.md
+81 −0 include/app_storage.h
+3 −3 include/ledger_protocol.h
+26 −0 include/os_io_nfc.h
+1 −1 include/os_io_seproxyhal.h
+17 −4 include/os_settings.h
+2 −2 include/ox_aes.h
+8 −0 lib_bagl/include/bagl_font_rom.inc
+9 −7 lib_blewbxx_impl/src/ledger_ble.c
+2 −2 lib_cxng/include/lcx_cipher.h
+117 −121 lib_nbgl/doc/nbgl_layout.dox
+ lib_nbgl/doc/resources/keyboard-usages.png
+ lib_nbgl/doc/resources/keypad-usages.png
+ lib_nbgl/doc/resources/layout1.png
+ lib_nbgl/doc/resources/layout10.png
+ lib_nbgl/doc/resources/layout11.png
+ lib_nbgl/doc/resources/layout12.png
+ lib_nbgl/doc/resources/layout13.png
+ lib_nbgl/doc/resources/layout15.png
+ lib_nbgl/doc/resources/layout6.png
+ lib_nbgl/doc/resources/layout8.png
+ lib_nbgl/doc/resources/layout9.png
+ lib_nbgl/doc/resources/layout_choice_buttons1.png
+ lib_nbgl/doc/resources/stax_layout1.png
+ lib_nbgl/doc/resources/stax_layout11.png
+ lib_nbgl/doc/resources/stax_layout13.png
+ lib_nbgl/doc/resources/stax_layout15.png
+ lib_nbgl/doc/resources/stax_layout6.png
+ lib_nbgl/doc/resources/stax_layout8.png
+ lib_nbgl/doc/resources/stax_layout9.png
+ lib_nbgl/glyphs/32px/Mini_Push_32px.png
+ lib_nbgl/glyphs/32px/radio_active_32px.png
+ lib_nbgl/glyphs/32px/radio_inactive_32px.png
+ lib_nbgl/glyphs/40px/Mini_Push_40px.png
+ lib_nbgl/glyphs/40px/radio_active_40px.png
+ lib_nbgl/glyphs/40px/radio_inactive_40px.png
+ lib_nbgl/glyphs/wallet/radio_active_32px.bmp
+ lib_nbgl/glyphs/wallet/radio_active_40.bmp
+ lib_nbgl/glyphs/wallet/radio_inactive_32px.bmp
+ lib_nbgl/glyphs/wallet/radio_inactive_40.bmp
+8 −0 lib_nbgl/include/fonts/nbgl_font_rom.inc
+39 −11 lib_nbgl/include/nbgl_content.h
+2 −3 lib_nbgl/include/nbgl_flow.h
+16 −8 lib_nbgl/include/nbgl_layout.h
+16 −2 lib_nbgl/include/nbgl_obj.h
+4 −1 lib_nbgl/include/nbgl_page.h
+35 −8 lib_nbgl/include/nbgl_use_case.h
+26 −44 lib_nbgl/src/nbgl_fonts.c
+223 −163 lib_nbgl/src/nbgl_layout.c
+11 −1 lib_nbgl/src/nbgl_layout_internal.h
+88 −105 lib_nbgl/src/nbgl_layout_keyboard.c
+9 −10 lib_nbgl/src/nbgl_layout_keypad.c
+0 −2 lib_nbgl/src/nbgl_layout_nanos.c
+36 −71 lib_nbgl/src/nbgl_layout_navigation.c
+36 −29 lib_nbgl/src/nbgl_obj.c
+27 −37 lib_nbgl/src/nbgl_page.c
+42 −15 lib_nbgl/src/nbgl_step.c
+257 −139 lib_nbgl/src/nbgl_use_case.c
+32 −2 lib_nbgl/src/nbgl_use_case_nanos.c
+87 −85 lib_nbgl/tools/icon2glyph.py
+106 −0 lib_standard_app/app_storage.c
+4 −4 lib_standard_app/main.c
+8 −1 lib_stusb_impl/usbd_impl.c
+1 −1 src/checks.c
+1 −1 src/ledger_assert.c
+74 −81 src/ledger_protocol.c
+109 −0 src/os_io_nfc.c
+10 −28 src/os_io_seproxyhal.c
+1 −1 target/nanos2/script.ld
+1 −1 target/nanox/script.ld
+3 −3 unit-tests/lib_nbgl/test_nbgl_obj.c
2 changes: 1 addition & 1 deletion deps/nanox-secure-sdk
Submodule nanox-secure-sdk updated 76 files
+4 −2 Makefile
+11 −3 Makefile.app_params
+1 −1 Makefile.defines
+6 −1 Makefile.glyphs
+8 −0 Makefile.standard_app
+2 −2 README.md
+81 −0 include/app_storage.h
+3 −3 include/ledger_protocol.h
+26 −0 include/os_io_nfc.h
+1 −1 include/os_io_seproxyhal.h
+17 −4 include/os_settings.h
+2 −2 include/ox_aes.h
+8 −0 lib_bagl/include/bagl_font_rom.inc
+9 −7 lib_blewbxx_impl/src/ledger_ble.c
+2 −2 lib_cxng/include/lcx_cipher.h
+117 −121 lib_nbgl/doc/nbgl_layout.dox
+ lib_nbgl/doc/resources/keyboard-usages.png
+ lib_nbgl/doc/resources/keypad-usages.png
+ lib_nbgl/doc/resources/layout1.png
+ lib_nbgl/doc/resources/layout10.png
+ lib_nbgl/doc/resources/layout11.png
+ lib_nbgl/doc/resources/layout12.png
+ lib_nbgl/doc/resources/layout13.png
+ lib_nbgl/doc/resources/layout15.png
+ lib_nbgl/doc/resources/layout6.png
+ lib_nbgl/doc/resources/layout8.png
+ lib_nbgl/doc/resources/layout9.png
+ lib_nbgl/doc/resources/layout_choice_buttons1.png
+ lib_nbgl/doc/resources/stax_layout1.png
+ lib_nbgl/doc/resources/stax_layout11.png
+ lib_nbgl/doc/resources/stax_layout13.png
+ lib_nbgl/doc/resources/stax_layout15.png
+ lib_nbgl/doc/resources/stax_layout6.png
+ lib_nbgl/doc/resources/stax_layout8.png
+ lib_nbgl/doc/resources/stax_layout9.png
+ lib_nbgl/glyphs/32px/Mini_Push_32px.png
+ lib_nbgl/glyphs/32px/radio_active_32px.png
+ lib_nbgl/glyphs/32px/radio_inactive_32px.png
+ lib_nbgl/glyphs/40px/Mini_Push_40px.png
+ lib_nbgl/glyphs/40px/radio_active_40px.png
+ lib_nbgl/glyphs/40px/radio_inactive_40px.png
+ lib_nbgl/glyphs/wallet/radio_active_32px.bmp
+ lib_nbgl/glyphs/wallet/radio_active_40.bmp
+ lib_nbgl/glyphs/wallet/radio_inactive_32px.bmp
+ lib_nbgl/glyphs/wallet/radio_inactive_40.bmp
+8 −0 lib_nbgl/include/fonts/nbgl_font_rom.inc
+39 −11 lib_nbgl/include/nbgl_content.h
+2 −3 lib_nbgl/include/nbgl_flow.h
+16 −8 lib_nbgl/include/nbgl_layout.h
+16 −2 lib_nbgl/include/nbgl_obj.h
+4 −1 lib_nbgl/include/nbgl_page.h
+35 −8 lib_nbgl/include/nbgl_use_case.h
+26 −44 lib_nbgl/src/nbgl_fonts.c
+223 −163 lib_nbgl/src/nbgl_layout.c
+11 −1 lib_nbgl/src/nbgl_layout_internal.h
+88 −105 lib_nbgl/src/nbgl_layout_keyboard.c
+9 −10 lib_nbgl/src/nbgl_layout_keypad.c
+0 −2 lib_nbgl/src/nbgl_layout_nanos.c
+36 −71 lib_nbgl/src/nbgl_layout_navigation.c
+36 −29 lib_nbgl/src/nbgl_obj.c
+27 −37 lib_nbgl/src/nbgl_page.c
+42 −15 lib_nbgl/src/nbgl_step.c
+257 −139 lib_nbgl/src/nbgl_use_case.c
+32 −2 lib_nbgl/src/nbgl_use_case_nanos.c
+87 −85 lib_nbgl/tools/icon2glyph.py
+106 −0 lib_standard_app/app_storage.c
+4 −4 lib_standard_app/main.c
+8 −1 lib_stusb_impl/usbd_impl.c
+1 −1 src/checks.c
+1 −1 src/ledger_assert.c
+74 −81 src/ledger_protocol.c
+109 −0 src/os_io_nfc.c
+10 −28 src/os_io_seproxyhal.c
+1 −1 target/nanos2/script.ld
+1 −1 target/nanox/script.ld
+3 −3 unit-tests/lib_nbgl/test_nbgl_obj.c
Binary file modified tests_zemu/snapshots/s-mainmenu/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-mainmenu/00010.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-mainmenu/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-mainmenu/00010.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/st-mainmenu/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/x-mainmenu/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/x-mainmenu/00010.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 17d607c

Please sign in to comment.