From c2fa3d8fca1b893442866353fae88b24273b9c1c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 27 Aug 2018 17:20:29 +0200 Subject: [PATCH] firmware: re-enable Stellar This reverts commit "firmware: disable Stellar for now" c82ce39ce57e8abefa778f9dcc6efe854b944f94 --- firmware/Makefile | 4 ++-- firmware/fsm.c | 4 ++-- firmware/fsm.h | 4 +--- firmware/protob/Makefile | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 035e2d948..39c8e1bb7 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -28,7 +28,7 @@ OBJS += ethereum.o OBJS += ethereum_tokens.o OBJS += nem2.o OBJS += nem_mosaics.o -# OBJS += stellar.o +OBJS += stellar.o OBJS += debug.o @@ -90,7 +90,7 @@ OBJS += protob/messages-debug.pb.o OBJS += protob/messages-ethereum.pb.o OBJS += protob/messages-management.pb.o OBJS += protob/messages-nem.pb.o -# OBJS += protob/messages-stellar.pb.o +OBJS += protob/messages-stellar.pb.o OPTFLAGS ?= -Os diff --git a/firmware/fsm.c b/firmware/fsm.c index f7d4dffd7..0cba9b9c9 100644 --- a/firmware/fsm.c +++ b/firmware/fsm.c @@ -56,7 +56,7 @@ #include "rfc6979.h" #include "gettext.h" #include "supervise.h" -// #include "stellar.h" +#include "stellar.h" #include "messages.pb.h" // message methods @@ -248,5 +248,5 @@ static bool fsm_layoutAddress(const char *address, const char *desc, bool ignore #include "fsm_msg_ethereum.h" #include "fsm_msg_crypto.h" #include "fsm_msg_nem.h" -// #include "fsm_msg_stellar.h" +#include "fsm_msg_stellar.h" #include "fsm_msg_debug.h" diff --git a/firmware/fsm.h b/firmware/fsm.h index 8d6bc5096..703be5115 100644 --- a/firmware/fsm.h +++ b/firmware/fsm.h @@ -26,7 +26,7 @@ #include "messages-ethereum.pb.h" #include "messages-management.pb.h" #include "messages-nem.pb.h" -// #include "messages-stellar.pb.h" +#include "messages-stellar.pb.h" // message functions @@ -87,7 +87,6 @@ void fsm_msgCosiCommit(CosiCommit *msg); void fsm_msgCosiSign(CosiSign *msg); // Stellar -/* void fsm_msgStellarGetAddress(StellarGetAddress *msg); void fsm_msgStellarGetPublicKey(StellarGetPublicKey *msg); void fsm_msgStellarSignTx(StellarSignTx *msg); @@ -102,7 +101,6 @@ void fsm_msgStellarAllowTrustOp(StellarAllowTrustOp *msg); void fsm_msgStellarAccountMergeOp(StellarAccountMergeOp *msg); void fsm_msgStellarManageDataOp(StellarManageDataOp *msg); void fsm_msgStellarBumpSequenceOp(StellarBumpSequenceOp *msg); -*/ // debug message functions #if DEBUG_LINK diff --git a/firmware/protob/Makefile b/firmware/protob/Makefile index d915d7935..7873b4c97 100644 --- a/firmware/protob/Makefile +++ b/firmware/protob/Makefile @@ -23,7 +23,7 @@ messages_%_pb2.py: messages-%.proto $(Q)protoc -I/usr/include -I. $< --python_out=. messages_map.h: messages_map.py messages_pb2.py - $(Q)$(PYTHON) $< | grep -v -e MessageType_Cardano -e MessageType_Lisk -e MessageType_Tezos -e MessageType_Ripple -e MessageType_Stellar > $@ + $(Q)$(PYTHON) $< | grep -v -e MessageType_Cardano -e MessageType_Lisk -e MessageType_Tezos -e MessageType_Ripple > $@ clean: rm -f *.pb *.o *.d *.pb.c *.pb.h *_pb2.py messages_map.h