Merge pull request #77 from LedgerHQ/y333/settings_management

Y333/settings management

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "app-boilerplate-rust"
-version = "1.6.1"
+version = "1.6.2"
 authors = ["yhql", "agrojean-ledger"]
 edition = "2021"
 
 [dependencies]
-ledger_device_sdk = { version="1.16.1" }
+ledger_device_sdk = "1.17.2"
 include_gif = "1.2.0"
 serde = {version="1.0.192", default_features = false, features = ["derive"]}
 serde-json-core = { git = "https://github.com/rust-embedded-community/serde-json-core"}

src/app_ui/menu.rs

@@ -83,7 +83,7 @@ pub fn ui_menu_main(_: &mut Comm) -> NbglHomeAndSettings {
     // Display the home screen.
     NbglHomeAndSettings::new()
         .glyph(&FERRIS)
-        .settings(settings.get_mut_ref(), &settings_strings)
+        .settings(settings.get_mut(), &settings_strings)
         .infos(
             "Boilerplate",
             env!("CARGO_PKG_VERSION"),

src/app_ui/sign.rs

@@ -81,7 +81,7 @@ pub fn ui_display_tx(tx: &Tx) -> Result<bool, AppSW> {
         const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("crab_64x64.gif", NBGL));
         // Create NBGL review. Maximum number of fields and string buffer length can be customised
         // with constant generic parameters of NbglReview. Default values are 32 and 1024 respectively.
-        let mut review: NbglReview = NbglReview::new()
+        let review: NbglReview = NbglReview::new()
             .titles(
                 "Review transaction\nto send CRAB",
                 "",

src/settings.rs

@@ -5,7 +5,7 @@ use ledger_device_sdk::NVMData;
 const SETTINGS_SIZE: usize = 10;
 #[link_section = ".nvm_data"]
 static mut DATA: NVMData<AtomicStorage<[u8; SETTINGS_SIZE]>> =
-    NVMData::new(AtomicStorage::new(&[0u8; 10]));
+    NVMData::new(AtomicStorage::new(&[0u8; SETTINGS_SIZE]));
 
 #[derive(Clone, Copy)]
 pub struct Settings;
@@ -19,23 +19,31 @@ impl Default for Settings {
 impl Settings {
     #[inline(never)]
     #[allow(unused)]
-    pub fn get_mut_ref(&mut self) -> &mut AtomicStorage<[u8; SETTINGS_SIZE]> {
+    pub fn get_mut(&mut self) -> &mut AtomicStorage<[u8; SETTINGS_SIZE]> {
         return unsafe { DATA.get_mut() };
     }
 
+    #[inline(never)]
+    #[allow(unused)]
+    pub fn get_ref(&mut self) -> &AtomicStorage<[u8; SETTINGS_SIZE]> {
+        return unsafe { DATA.get_ref() };
+    }
+
     #[allow(unused)]
     pub fn get_element(&self, index: usize) -> u8 {
-        let settings = unsafe { DATA.get_mut() };
-        settings.get_ref()[index]
+        let storage = unsafe { DATA.get_ref() };
+        let settings = storage.get_ref();
+        settings[index]
     }
 
     #[allow(unused)]
     // Not used in this boilerplate, but can be used to set a value in the settings
     pub fn set_element(&self, index: usize, value: u8) {
-        let mut updated_data: [u8; SETTINGS_SIZE] = unsafe { *DATA.get_mut().get_ref() };
+        let storage = unsafe { DATA.get_mut() };
+        let mut updated_data = *storage.get_ref();
         updated_data[index] = value;
         unsafe {
-            DATA.get_mut().update(&updated_data);
+            storage.update(&updated_data);
         }
     }
 }