From 3e75109bb9e3c1ada625a563d5f8bfe1164889cd Mon Sep 17 00:00:00 2001 From: pscott <30843220+pscott@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:52:30 +0200 Subject: [PATCH 1/9] Add pending review screen --- app/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Makefile b/app/Makefile index 7712899..63982b6 100755 --- a/app/Makefile +++ b/app/Makefile @@ -97,6 +97,11 @@ endif APP_LOAD_PARAMS = --appFlags 0x200 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH) +# Pending review parameters +APP_LOAD_PARAMS += --tlvraw 9F:01 +DEFINES += HAVE_PENDING_REVIEW_SCREEN + + ifeq ($(TARGET_NAME),TARGET_NANOS) APP_STACK_SIZE:=3472 ICONNAME:=$(CURDIR)/nanos_icon.gif From 2cdddff7c929c9e18d714d7f455e76b1320fb863 Mon Sep 17 00:00:00 2001 From: pscott Date: Fri, 24 Sep 2021 13:45:21 +0200 Subject: [PATCH 2/9] Rename DOT to EDG --- app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Makefile b/app/Makefile index 63982b6..ecf2208 100755 --- a/app/Makefile +++ b/app/Makefile @@ -78,7 +78,7 @@ endif APPNAME = "Edgeware" APPPATH = "44'/523'" -else ifeq ($(COIN),DOT_XL) +else ifeq ($(COIN),EDG_XL) # XXL app configuration DEFINES += APP_STANDARD SUBSTRATE_PARSER_FULL APPNAME = "Edgeware XL" From 59a15b011adc0c8d2493c3f0e56d3ac3c2c093b7 Mon Sep 17 00:00:00 2001 From: tjulien-ledger Date: Fri, 24 Sep 2021 15:44:57 +0200 Subject: [PATCH 3/9] Modifying the warning icon --- app/glyphs/icon_warning.gif | Bin 106 -> 1130 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/glyphs/icon_warning.gif b/app/glyphs/icon_warning.gif index 280a47e71517a9b331fd0174528488fde11792de..08bd4a739c348f3655d195210e9f2d72e4f7c533 100644 GIT binary patch literal 1130 zcmZ?wbhEHbh+i z#(Mch>H3D2mX`VkM*2oZxP`3=Lf^oD9vKom`v^ z4IGV}EX^$3V0vBhlS^|`^GaZPQxJMhaOwpmh};68%`T}$nPsUdZbkXI3Sf_0W#V>= zAx`t4dQ)(_#R#WfeV}9XLD7p8-7q0w8Uiuli5JL$C;!wuV45!iCT_<6|Nj2@{p;tC z@87({PcxqRv3h4bgmo;iK$ z#u35cm<%;FYmM&SmXyJnS^XAT( zJ!|HS>C>i8nLKIYg#NzXp6;&Bj`p_Jmgc6$hWfhNn(C^`it@73lH#Jmg8aPPob0U3 zjP$hBl;otug!s7FnCPg;i14t`kl>)e0DnJUA8#*D4|g|L7iT9&2YWkP8*3{|3v)A5 z6JsMo1ARSR9c?X54RtkD6=fww1$jAH8EGj=32`w|5n&-g0e(JS9&Rp94t6$H7G@?! zUY0&8om!J_n;YvdmtT5o=NTMz?-H2_~` BB0>NF From c0e7de68517a4af35c847331bb62fd93dc12dbeb Mon Sep 17 00:00:00 2001 From: Fernando Theirs Date: Tue, 23 Nov 2021 20:52:53 +0100 Subject: [PATCH 4/9] update googletest tag --- cmake/gtest/CMakeLists.txt.gtest.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/gtest/CMakeLists.txt.gtest.in b/cmake/gtest/CMakeLists.txt.gtest.in index 4818300..b456631 100644 --- a/cmake/gtest/CMakeLists.txt.gtest.in +++ b/cmake/gtest/CMakeLists.txt.gtest.in @@ -6,7 +6,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master + GIT_TAG release-1.11.0 SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" From b22e9e79286b9bfde4bbbdd2571ba5760e6e611c Mon Sep 17 00:00:00 2001 From: Fernando Theirs Date: Tue, 23 Nov 2021 21:18:31 +0100 Subject: [PATCH 5/9] initialize variable --- deps/ledger-zxlib/app/common/view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deps/ledger-zxlib/app/common/view.c b/deps/ledger-zxlib/app/common/view.c index 8fc8d41..8a8d74b 100644 --- a/deps/ledger-zxlib/app/common/view.c +++ b/deps/ledger-zxlib/app/common/view.c @@ -73,6 +73,7 @@ void h_paging_init() { viewdata.itemIdx = 0; viewdata.pageIdx = 0; viewdata.pageCount = 1; + viewdata.itemCount = 0xFF; } bool h_paging_can_increase() { @@ -188,6 +189,11 @@ zxerr_t h_review_update_data() { return zxerr_no_data; } + if (viewdata.viewfuncGetItem == NULL) { + zemu_log_stack("h_review_update_data - GetItem==NULL"); + return zxerr_no_data; + } + char buffer[20]; snprintf(buffer, sizeof(buffer), "update Idx %d/%d", viewdata.itemIdx, viewdata.pageIdx); zemu_log_stack(buffer); From 81d6228ecbaa27705f8845ce75e08db8429b63c4 Mon Sep 17 00:00:00 2001 From: Lucas PASCAL Date: Mon, 21 Feb 2022 16:47:46 +0100 Subject: [PATCH 6/9] [add] CI on PR --- .github/workflows/ledger.yml | 4 ++-- .github/workflows/main.yml | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ledger.yml b/.github/workflows/ledger.yml index bedf8b8..22428da 100644 --- a/.github/workflows/ledger.yml +++ b/.github/workflows/ledger.yml @@ -3,9 +3,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ main ] + branches: [ master ] pull_request: - branches: [ main ] + branches: [ master ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92cf420..aff510b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,9 @@ name: Build -on: [push] +on: + push: + pull_request: + branches: + - master jobs: configure: @@ -206,4 +210,4 @@ jobs: files: ./app/pkg/installer_XL_s.sh tag_name: ${{ steps.vars_2.outputs.tag_name }} draft: false - prerelease: false + prerelease: false From efdd9444537589150173856a6f96dc39fa3f6919 Mon Sep 17 00:00:00 2001 From: Lucas PASCAL Date: Mon, 21 Feb 2022 17:13:19 +0100 Subject: [PATCH 7/9] [add] Removing 'pending review' flag --- app/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Makefile b/app/Makefile index 31d09fc..d950207 100755 --- a/app/Makefile +++ b/app/Makefile @@ -97,11 +97,6 @@ endif APP_LOAD_PARAMS = --appFlags 0x200 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH) -# Pending review parameters -APP_LOAD_PARAMS += --tlvraw 9F:01 -DEFINES += HAVE_PENDING_REVIEW_SCREEN - - ifeq ($(TARGET_NAME),TARGET_NANOS) APP_STACK_SIZE:=3216 ICONNAME:=$(CURDIR)/nanos_icon.gif From efc9c9910f6fb90653830f3ae9c0a11aa0dcd8fa Mon Sep 17 00:00:00 2001 From: Lucas PASCAL Date: Mon, 21 Feb 2022 17:15:29 +0100 Subject: [PATCH 8/9] Revert "[add] Removing 'pending review' flag" This reverts commit efdd9444537589150173856a6f96dc39fa3f6919. --- app/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Makefile b/app/Makefile index d950207..31d09fc 100755 --- a/app/Makefile +++ b/app/Makefile @@ -97,6 +97,11 @@ endif APP_LOAD_PARAMS = --appFlags 0x200 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH) +# Pending review parameters +APP_LOAD_PARAMS += --tlvraw 9F:01 +DEFINES += HAVE_PENDING_REVIEW_SCREEN + + ifeq ($(TARGET_NAME),TARGET_NANOS) APP_STACK_SIZE:=3216 ICONNAME:=$(CURDIR)/nanos_icon.gif From 13a5ef8e264d1affa1b6c73d51764d7a3a01bc29 Mon Sep 17 00:00:00 2001 From: Lucas PASCAL Date: Mon, 21 Feb 2022 17:13:19 +0100 Subject: [PATCH 9/9] [add] Removing 'pending review' flag --- app/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Makefile b/app/Makefile index 31d09fc..d950207 100755 --- a/app/Makefile +++ b/app/Makefile @@ -97,11 +97,6 @@ endif APP_LOAD_PARAMS = --appFlags 0x200 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH) -# Pending review parameters -APP_LOAD_PARAMS += --tlvraw 9F:01 -DEFINES += HAVE_PENDING_REVIEW_SCREEN - - ifeq ($(TARGET_NAME),TARGET_NANOS) APP_STACK_SIZE:=3216 ICONNAME:=$(CURDIR)/nanos_icon.gif