From 937b5b943122c6d32c020197251e5c4bf97bf4eb Mon Sep 17 00:00:00 2001 From: Robert Lukotka Date: Thu, 7 Sep 2023 09:34:41 +0200 Subject: [PATCH] Remove stax from guidelines enforcer, add stax icon --- .github/workflows/guidelines_enforcer.yml | 2 ++ Makefile | 16 +++++++++++++--- MakefileLocal.mk | 8 ++++++-- MakefileSpeculos.mk | 2 +- icon_fio_stax.png | Bin 0 -> 1259 bytes icon_fio_stax_large.png | Bin 0 -> 1527 bytes .../speculos-buttons-and-snapshots.js | 4 ++-- 7 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 icon_fio_stax.png create mode 100644 icon_fio_stax_large.png diff --git a/.github/workflows/guidelines_enforcer.yml b/.github/workflows/guidelines_enforcer.yml index 32cfd201..3aa0962e 100644 --- a/.github/workflows/guidelines_enforcer.yml +++ b/.github/workflows/guidelines_enforcer.yml @@ -17,3 +17,5 @@ jobs: guidelines_enforcer: name: Call Ledger guidelines_enforcer uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1 + with: + run_for_devices: '["nanos", "nanox", "nanosp"]' diff --git a/Makefile b/Makefile index dbb733d3..92a2af77 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ WORDS = "abandon abandon abandon abandon abandon abandon abandon abandon abandon PIN = 5555 SPECULOS_MODEL_SWITCH=nanos -NANO_ICON_GIF=nanos_icon.gif +NANO_ICON_GIF=icon_fio_nanos.gif BOLOS_SDK_DIRECTORY=/opt/nanos-secure-sdk TARGET_NAME=TARGET_NANOS TEST_DEVICE=nanos @@ -37,7 +37,7 @@ SPECULOS_SDK_STRING= --sdk 2.1 ifeq ($(TARGET_DEVICE), NANO_X) $(info Targeting NanoX) SPECULOS_MODEL_SWITCH=nanox - NANO_ICON_GIF=nanox_icon.gif + NANO_ICON_GIF=icon_fio_nanox.gif BOLOS_SDK_DIRECTORY=/opt/nanox-secure-sdk TARGET_NAME=TARGET_NANOX TEST_DEVICE=nanox @@ -46,13 +46,23 @@ endif ifeq ($(TARGET_DEVICE), NANO_SP) $(info Targeting NanoSPlus) SPECULOS_MODEL_SWITCH=nanosp - NANO_ICON_GIF=nanox_icon.gif + NANO_ICON_GIF=icon_fio_nanox.gif BOLOS_SDK_DIRECTORY=/opt/nanosplus-secure-sdk TARGET_NAME=TARGET_NANOS2 TEST_DEVICE=nanosp SPECULOS_SDK_STRING= endif +ifeq ($(TARGET_DEVICE), STAX) + $(info Targeting STAX) + SPECULOS_MODEL_SWITCH=stax + NANO_ICON_GIF=icon_fio_stax.png + BOLOS_SDK_DIRECTORY=/opt/stax-secure-sdk + TARGET_NAME=TARGET_STAX + TEST_DEVICE=stax + SPECULOS_SDK_STRING= +endif + ifeq ($(BOLOS_SDK),) include $(CURDIR)/MakefileContainer.mk diff --git a/MakefileLocal.mk b/MakefileLocal.mk index f3ee1c63..0e8cf43a 100644 --- a/MakefileLocal.mk +++ b/MakefileLocal.mk @@ -37,7 +37,11 @@ APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS) ifeq ($(TARGET_NAME),TARGET_NANOS) ICONNAME=icon_fio_nanos.gif else - ICONNAME=icon_fio_nanox.gif + ifeq ($(TARGET_NAME),TARGET_STAX) + ICONNAME=icon_fio_stax.png + else + ICONNAME=icon_fio_nanox.gif + endif endif ############ @@ -179,7 +183,7 @@ include $(BOLOS_SDK)/Makefile.rules dep/%.d: %.c Makefile listvariants: - @echo VARIANTS COIN fio + @echo VARIANTS COIN FIO ############## # Style # diff --git a/MakefileSpeculos.mk b/MakefileSpeculos.mk index 060b4f83..885f4551 100644 --- a/MakefileSpeculos.mk +++ b/MakefileSpeculos.mk @@ -15,7 +15,7 @@ # limitations under the License. #******************************************************************************* -SPECULOS_IMAGE = speculos:sha-d6dee99 +SPECULOS_IMAGE = speculos:sha-6a34680 define run_announce @perl -e 'use Time::HiRes; use POSIX; $$ts = sprintf qq[%f], Time::HiRes::time(); ($$f) = $$ts =~ m~(\....)~; printf qq[%s%s %s make: %s\n], POSIX::strftime("%H:%M:%S", gmtime), $$f, q[-] x 126, $$ARGV[0];' "$(1)" diff --git a/icon_fio_stax.png b/icon_fio_stax.png new file mode 100644 index 0000000000000000000000000000000000000000..e4cdc734ae4c99ad075517f4da81f4237eb718d1 GIT binary patch literal 1259 zcmbVLTWB0r7#>|~%Qi9AmnPz6m^`SobD!*7$To>PyLL-And~kY2@5%M=4^II=Hkqx zyUFf8v~3Kky}C7wxkqeAF|2WHMW z|M|cF|Nh%c#`rV6$%m5!LGqWei@wX#^|N6?Y&+#@8Wv8N&SB>f*K*X5knTX6g zU=|e-uoj=ch=vIwamX%DMN@@?8uT0n#5zpF@iCephDRDcfO9A!O*Ct}Y3lZ;=P1&) z($up<1+L&{P|e=I6rj@5co{CuLDiy0_L0L44I6M!1jvRn?}l0bz&@}gw0w?e+C$YRlbDSosnk12(MPYY=Rn>}m zuHy{f(o`*qe2r!6^*U1*884V+c~w-RaKS-tl-JV~eqk)z(qu_gB_NnImjWU!DS}0VAw{7@ zRS{7N0u=$FYiBEbR^f9wK9`l0Oor#PSyk1C6n;#U^h{1va+}z^8%Dr|sO#ItzB^d` zu2?M-AP{*$+4JVRZD7>A$O~(pPYMDfkxv!?wB1-rbDB#QH zFd-LDP=H6}$7_FF!eho62g}*X$;no$Wf+EOn(cNQLfC9JOQq8E^mG`82%#VdY}=lg zn5a}L7__|mEg5eQM#b^c+J6^ueXufs-#*IgW97!Rm#C2uo$v4!;@B1_P z-pcQv^_G9F9N7MoQ#jc&nlrC_xa(H(yJHW*(v7|!J~+{{+;`yJ!#9sU_NwfRp4@3Q zSKnM+ezAT0ozoZpdgR2+j``PD`-uy8=5BqTNHJ%UiP1sh)ScGI@xI>kH^1H{|9thA eeeb_bB#0y5FgG5Zyz(5TPvo=X`l+X9j{FU-XQ^EP literal 0 HcmV?d00001 diff --git a/icon_fio_stax_large.png b/icon_fio_stax_large.png new file mode 100644 index 0000000000000000000000000000000000000000..5bc3a5d7d916ae4a5a6dc607665a8dcbc0ae79dc GIT binary patch literal 1527 zcmbVLeQXnD7{6|OOg6&U#>YsM%hmBAT<_XmyWX*~jQYi+M7%Ks!$S-mL zb%fX&;0COJ%jQ8)fFP++!Q)lD&QgXKLmD=rqlt$i5RD)Oh4Bc>ZvqO+ff^xf#(p~9 zhoOSsj8z$&q%%?sfiu0}X_L!lLm|ZCGaFW^CLp1J4OD zfuZ9n$|f^5LCWiNp~a#EP@{&#d6G1u`LxE*axBkrD^VS((-I^_Xepc|89mKV6gs&u z=uYwn7`N3v=?vb?SWrIj_{0bs-Q|99A<1Uo?Kf&(HxKm7h=Q za4NtVad_0?CL?FU^#-GXGV*`~6q&R$72amj+U;6<5oIba)@p4wnzkBD+9Ew=Ew<}T zc3l$d2+Il^=0Vc80DVtl>APZ?VhON{D0xJ&HrWQQps0v)P>i5DorXe}Iayu^CnU=g zRhkIe3M3&4{B}tUq2p<0gefQlj0Q-TCUJ_@8*qxFNSrltH10Rj6va{j)}W`cNxc96 zrjLN6h(xdat9Ozj*pP|iol$_7JHrIRaDpT_D!PN}D{#z6SEF$L?SI(E_oPYJfLr-3B zPj^2vJ<^1aayjjvo?7?Na8*h0>*mANThIKmV46?$l3_zn+f}wcn>Kg1W~%dcoZ7bU zVe0h@X(P*`slIP(FQug{ow0Rnzcth!UD9KFZ_)0>C%FR8!L2Rdc#mdwt}7B-&gxNn zw&mtqxA6WwFBHCix;0qt?ojQb=WbrT9h}_G&qdpPuJ+e%VTB(pPPcTgxGK!7IS^m< zmGj8VrnEui^CPl>cqQws)IF`ENXsrnZ2hM@8}FSl^w{&6bC{J&#!@}?!JOE^c;7(l6C;j{qw{}%p!eMH;H>YLzG-A{T&&9*?F73lqtipV-qOc=QkV^EH_p3w zvTU*IbkF>2s*yn69Lw;RZF|psm@_o}*v>EP8`FcDJ;U3cT5#ZvO3U%wPnI{|u#Mca z|GD{Nf3`$zzp8#Vzx!x&Hd@sbOCNYzxDr!0)0XwuZ