From df6d34f1d06f8baa6ee19d2bd4a3f6864d684561 Mon Sep 17 00:00:00 2001
From: Alexis Grojean <alexis.grojean@ledger.fr>
Date: Wed, 24 Jul 2024 09:01:15 +0200
Subject: [PATCH] PR review.

---
 CHANGELOG.md    | 12 ++++++++++++
 Makefile        |  5 -----
 README.md       |  2 +-
 src/uiHelpers.c |  2 +-
 src/uiHelpers.h |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ca4ef16..6b0445ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [7.2.0](TBD) - [TBD]
+
+### Added
+
+- Add flex support,
+- Add integration tests in CI using [ledgerjs-cardano-shelley](https://github.com/LedgerHQ/ledgerjs-cardano-shelley)
+
+### Changed
+
+- Update Makefile to standard format,
+- Fix headless mode on Nano X / SP for integration tests running,
+- Update some NBGL calls to latest API (main menu),
 
 ## [7.1.0](TBD) - [TBD]
 
diff --git a/Makefile b/Makefile
index 6bf02513..559b95bc 100644
--- a/Makefile
+++ b/Makefile
@@ -97,11 +97,6 @@ SDK_SOURCE_PATH += lib_u2f
 ##############
 #  Compiler  #
 ##############
-
-# based in part on https://interrupt.memfault.com/blog/best-and-worst-gcc-clang-compiler-flags
-WERROR   := -Werror=return-type -Werror=parentheses -Werror=format-security
-CFLAGS   += -Wuninitialized -fno-common $(WERROR)
-
 ## USB U2F
 DEFINES += HAVE_U2F HAVE_IO_U2F U2F_PROXY_MAGIC=\"ADA\" USB_SEGMENT_SIZE=64
 
diff --git a/README.md b/README.md
index b021f825..8d52f163 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cardano Ledger App
 
-Cardano Ledger App for Ledger Nano S
+Cardano Ledger App for Ledger devices (Nano S, Nano S Plus, Nano X, Stax, Flex)
 
 ## Building
 
diff --git a/src/uiHelpers.c b/src/uiHelpers.c
index 22028706..ce58009b 100644
--- a/src/uiHelpers.c
+++ b/src/uiHelpers.c
@@ -19,7 +19,7 @@ displayState_t displayState;
 // ux is a magic global variable implicitly referenced by the UX_ macros. Apps
 // should never need to reference it directly
 ux_state_t ux;
-#elif defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
+#else
 ux_state_t G_ux;
 bolos_ux_params_t G_ux_params;
 #endif
diff --git a/src/uiHelpers.h b/src/uiHelpers.h
index e2f2e727..bd2a5c3d 100644
--- a/src/uiHelpers.h
+++ b/src/uiHelpers.h
@@ -10,7 +10,7 @@
 
 typedef void ui_callback_fn_t();
 
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
+#if !defined(TARGET_NANOS) 
 extern ux_state_t G_ux;
 extern bolos_ux_params_t G_ux_params;
 #endif