Upgrade to v1.3.2

.gitignore

@@ -58,3 +58,7 @@ debug/app\.asm
 bin/app\.hex
 
 bin/app\.elf
+
+src/glyphs\.h
+
+src/glyphs\.c

Makefile

@@ -19,51 +19,76 @@
 ifeq ($(BOLOS_SDK),)
 $(error BOLOS_SDK is not set)
 endif
+include $(BOLOS_SDK)/Makefile.defines
+
+# Main app configuration
+APPNAME = "Cosmos"
+APPVERSION_M=1
+APPVERSION_N=5
+APPVERSION_P=0
 
-dummy_submodules := $(shell git submodule update --init --recursive)
+APP_LOAD_PARAMS = --appFlags 0x200 --delete $(COMMON_LOAD_PARAMS) --path "44'/118'"
 
+ifeq ($(TARGET_NAME),TARGET_NANOS)
 SCRIPT_LD:=$(CURDIR)/script.ld
+ICONNAME:=$(CURDIR)/nanos_icon.gif
+endif
 
-include $(BOLOS_SDK)/Makefile.defines
+ifeq ($(TARGET_NAME),TARGET_NANOX)
+ICONNAME:=$(CURDIR)/nanox_icon.gif
+endif
 
-# Main app configuration
-APPNAME = "COSMOS"
-APPVERSION_M=1
-APPVERSION_N=1
-APPVERSION_P=1
+ifndef ICONNAME
+$(error ICONNAME is not set)
+endif
 
-APP_LOAD_PARAMS = --appFlags 0x00 --delete $(COMMON_LOAD_PARAMS) --path "44'/118'"
-ICONNAME=$(CURDIR)/icon.gif
+all: default
 
 ############
 # Platform
 
 DEFINES   += UNUSED\(x\)=\(void\)x
+DEFINES   += PRINTF\(...\)=
 
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 DEFINES   += APPVERSION=\"$(APPVERSION)\"
 
-DEFINES += OS_IO_SEPROXYHAL IO_SEPROXYHAL_BUFFER_SIZE_B=128
-DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
-
+DEFINES += OS_IO_SEPROXYHAL
 DEFINES += HAVE_BAGL HAVE_SPRINTF
-DEFINES += PRINTF\(...\)=
 DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
 
 DEFINES += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
 
-SDK_SOURCE_PATH += lib_u2f
 DEFINES   += HAVE_U2F HAVE_IO_U2F
-DEFINES   += USB_SEGMENT_SIZE=64
 DEFINES   += U2F_PROXY_MAGIC=\"CSM\"
+DEFINES   += USB_SEGMENT_SIZE=64
 DEFINES   += U2F_MAX_MESSAGE_SIZE=264 #257+5+2
-
 DEFINES   += HAVE_BOLOS_APP_STACK_CANARY
-DEFINES   += LEDGER_SPECIFIC
+
+ifeq ($(TARGET_NAME),TARGET_NANOX)
+DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300
+
+DEFINES       += HAVE_GLO096
+DEFINES       += HAVE_BAGL BAGL_WIDTH=128 BAGL_HEIGHT=64
+DEFINES       += HAVE_BAGL_ELLIPSIS # long label truncation feature
+DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
+DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
+DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
+
+DEFINES          += HAVE_UX_FLOW
+
+#SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
+SDK_SOURCE_PATH  += lib_ux
+else
+# Assume Nano S
+DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128
+endif
+
+# X specific
 
 #Feature temporarily disabled
+DEFINES   += LEDGER_SPECIFIC
 #DEFINES += TESTING_ENABLED
-#DEFINES += FEATURE_ED25519
 
 # Compiler, assembler, and linker
 
@@ -92,17 +117,19 @@ AS := $(GCCPATH)arm-none-eabi-gcc
 AFLAGS +=
 
 LD       := $(GCCPATH)arm-none-eabi-gcc
-LDFLAGS  += -O3 -s
+LDFLAGS  += -O3 -Os
 LDLIBS   += -lm -lgcc -lc
 
 ##########################
+include $(BOLOS_SDK)/Makefile.glyphs
 
 APP_SOURCE_PATH += src deps/jsmn/src deps/ledger-zxlib/include deps/ledger-zxlib/src
 SDK_SOURCE_PATH += lib_stusb lib_u2f lib_stusb_impl
 
-#include $(BOLOS_SDK)/Makefile.glyphs
-
-all: default
+ifeq ($(TARGET_NAME),TARGET_NANOX)
+#SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
+SDK_SOURCE_PATH  += lib_ux
+endif
 
 load:
 	python -m ledgerblue.loadApp $(APP_LOAD_PARAMS)
@@ -114,12 +141,10 @@ package:
 	./pkgdemo.sh ${APPNAME} ${APPVERSION} ${ICONNAME}
 
 # Import generic rules from the SDK
-
 include $(BOLOS_SDK)/Makefile.rules
 
 #add dependency on custom makefile filename
-dep/%.d: %.c Makefile.genericwallet
-
+dep/%.d: %.c Makefile
 
 listvariants:
 	@echo VARIANTS COIN cosmos

README.md

@@ -3,4 +3,4 @@
 
 This is a submodule that only contains the user app according to Ledger specs.
 
-Please refer to the [Ledger-Cosmos](https://github.com/cosmos/ledger-cosmos) for the complete source code (unit tests, integration tests, documentation, etc.)  
+Please refer to the [Ledger-Cosmos](https://github.com/cosmos/ledger-cosmos) for the complete source code, build instructions, etc. (unit tests, integration tests, documentation, etc.)  

deps/ledger-zxlib/.editorconfig

@@ -0,0 +1,12 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+[*.{c,h,cpp,hpp}]
+indent_style = space
+indent_size = 4