Merge pull request #249 from LedgerHQ/y333/rename_nbg_nano_feature

Rename NBGL feature for Nano devices

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.21.3"
+version = "1.21.4"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
@@ -21,13 +21,13 @@ rand_core = { version = "0.6.3", default-features = false }
 zeroize = { version = "1.6.0", default-features = false }
 numtoa = "0.2.4"
 const-zero = "0.1.1"
-ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.7.1" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.7.2" }
 
 [features]
 debug = []
 speculos = []
 heap = [ "ledger_secure_sdk_sys/heap" ]
-nbgl = [ "ledger_secure_sdk_sys/nbgl" ]
+nano_nbgl = [ "ledger_secure_sdk_sys/nano_nbgl" ]
 
 default = [ "heap" ]
 

ledger_device_sdk/Cargo.toml

@@ -372,7 +372,7 @@ impl Comm {
         match seph::Events::from(tag) {
             #[cfg(not(any(target_os = "stax", target_os = "flex")))]
             seph::Events::ButtonPush => {
-                #[cfg(feature = "nbgl")]
+                #[cfg(feature = "nano_nbgl")]
                 unsafe {
                     ux_process_button_event(spi_buffer.as_mut_ptr());
                 }

ledger_device_sdk/src/io.rs

@@ -22,9 +22,9 @@ pub mod seph;
 
 pub mod testing;
 
-#[cfg(any(target_os = "stax", target_os = "flex", feature = "nbgl"))]
+#[cfg(any(target_os = "stax", target_os = "flex", feature = "nano_nbgl"))]
 pub mod nbgl;
-#[cfg(not(any(target_os = "stax", target_os = "flex", feature = "nbgl")))]
+#[cfg(not(any(target_os = "stax", target_os = "flex", feature = "nano_nbgl")))]
 pub mod ui;
 
 pub mod uxapp;

ledger_device_sdk/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_secure_sdk_sys"
-version = "1.7.1"
+version = "1.7.2"
 authors = ["yhql", "agrojean-ledger", "yogh333"]
 edition = "2021"
 license.workspace = true
@@ -18,7 +18,7 @@ critical-section = { version = "1.1.2", optional = true }
 
 [features]
 heap = ["dep:embedded-alloc", "dep:critical-section"]
-nbgl = []
+nano_nbgl = []
 
 [lints.rust.unexpected_cfgs]
 level = "warn"

ledger_secure_sdk_sys/Cargo.toml

@@ -222,7 +222,7 @@ impl SDKBuilder<'_> {
                 target: "thumbv8m.main-none-eabi",
                 defines: {
                     let mut v = header2define("csdk_nanos2.h");
-                    if env::var_os("CARGO_FEATURE_NBGL").is_some() {
+                    if env::var_os("CARGO_FEATURE_NANO_NBGL").is_some() {
                         println!("cargo:warning=NBGL is built");
                         v.push((String::from("HAVE_NBGL"), None));
                         v.push((String::from("NBGL_STEP"), None));
@@ -245,7 +245,7 @@ impl SDKBuilder<'_> {
                 target: "thumbv6m-none-eabi",
                 defines: {
                     let mut v = header2define("csdk_nanox.h");
-                    if env::var_os("CARGO_FEATURE_NBGL").is_some() {
+                    if env::var_os("CARGO_FEATURE_NANO_NBGL").is_some() {
                         println!("cargo:warning=NBGL is built");
                         v.push((String::from("HAVE_NBGL"), None));
                         v.push((String::from("NBGL_STEP"), None));
@@ -537,7 +537,7 @@ impl SDKBuilder<'_> {
             DeviceName::NanoSPlus | DeviceName::NanoX | DeviceName::Stax | DeviceName::Flex => {
                 if ((self.device.name == DeviceName::NanoX
                     || self.device.name == DeviceName::NanoSPlus)
-                    && env::var_os("CARGO_FEATURE_NBGL").is_some())
+                    && env::var_os("CARGO_FEATURE_NANO_NBGL").is_some())
                     || self.device.name == DeviceName::Stax
                     || self.device.name == DeviceName::Flex
                 {