Merge pull request #17 from tarassh/update-to-1.6.0

* update to firmware v1.6.0 * fix for #13
tarassh · Dec 6, 2020 · 5a37e0b · 5a37e0b
2 parents a84cd42 + bba791e
commit 5a37e0b
Show file tree

Hide file tree

Showing 10 changed files with 425 additions and 653 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ obj
 src/glyphs.c
 src/glyphs.h
 .vscode
-.idea
+.idea
+*.pyc
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ include $(BOLOS_SDK)/Makefile.defines
 
 
 APPVERSION_M=1
-APPVERSION_N=3
+APPVERSION_N=4
 APPVERSION_P=1
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
@@ -62,6 +62,7 @@ DEFINES   += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
 DEFINES   += UNUSED\(x\)=\(void\)x
 DEFINES   += APPVERSION=\"$(APPVERSION)\"
+DEFINES   += HAVE_UX_FLOW
 
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
@@ -130,10 +131,10 @@ include $(BOLOS_SDK)/Makefile.glyphs
 ### computed variables
 APP_SOURCE_PATH  += src 
 SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl lib_u2f
+SDK_SOURCE_PATH  += lib_ux
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
 SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
-SDK_SOURCE_PATH  += lib_ux
 endif
 
 

diff --git a/doc/eosapp.asc b/doc/eosapp.asc
@@ -20,6 +20,10 @@ Application version 1.2 - 28th of November 2018
 ## 1.3
   - Add WebUSB support
 
+## 1.4.1
+  - Update to firmware v1.6 
+  - Fix for https://github.com/tarassh/eos-ledger/issues/13
+
 ## About
 
 This application describes the APDU messages interface to communicate with the Eos application.