Split out serialnum code

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

src/bin/b1display.rs

@@ -47,29 +47,14 @@ use heapless::String;
 
 use lotus_input::control::*;
 use lotus_input::graphics::*;
+use lotus_input::serialnum::get_serialnum;
 
 //                            FRA                - Framwork
 //                               KDE             - Lotus C2 LED Matrix
 //                                  AM           - Atemitech
 //                                    00         - Default Configuration
 //                                      00000000 - Device Identifier
 const DEFAULT_SERIAL: &str = "FRAKDEAM0000000000";
-// Get serial number from last 4K block of the first 1M
-const FLASH_OFFSET: usize = 0x10000000;
-const LAST_4K_BLOCK: usize = 0xff000;
-const SERIALNUM_LEN: usize = 18;
-
-fn get_serialnum() -> Option<&'static str> {
-    // Flash is mapped into memory, just read it from there
-    let ptr: *const u8 = (FLASH_OFFSET + LAST_4K_BLOCK) as *const u8;
-    unsafe {
-        let slice: &[u8] = core::slice::from_raw_parts(ptr, SERIALNUM_LEN);
-        if slice[0] == 0xFF || slice[0] == 0x00 {
-            return None;
-        }
-        core::str::from_utf8(slice).ok()
-    }
-}
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone)]

src/bin/ledmatrix.rs

@@ -100,29 +100,14 @@ use lotus_input::control::*;
 use lotus_input::lotus::LotusLedMatrix;
 use lotus_input::matrix::*;
 use lotus_input::patterns::*;
+use lotus_input::serialnum::get_serialnum;
 
 //                            FRA                - Framwork
 //                               KDE             - Lotus C2 LED Matrix
 //                                  AM           - Atemitech
 //                                    00         - Default Configuration
 //                                      00000000 - Device Identifier
 const DEFAULT_SERIAL: &str = "FRAKDEAM0000000000";
-// Get serial number from last 4K block of the first 1M
-const FLASH_OFFSET: usize = 0x10000000;
-const LAST_4K_BLOCK: usize = 0xff000;
-const SERIALNUM_LEN: usize = 18;
-
-fn get_serialnum() -> Option<&'static str> {
-    // Flash is mapped into memory, just read it from there
-    let ptr: *const u8 = (FLASH_OFFSET + LAST_4K_BLOCK) as *const u8;
-    unsafe {
-        let slice: &[u8] = core::slice::from_raw_parts(ptr, SERIALNUM_LEN);
-        if slice[0] == 0xFF || slice[0] == 0x00 {
-            return None;
-        }
-        core::str::from_utf8(slice).ok()
-    }
-}
 
 #[entry]
 fn main() -> ! {

src/lib.rs

@@ -17,3 +17,4 @@ pub mod graphics;
 pub mod lotus_lcd_hal;
 
 pub mod control;
+pub mod serialnum;

src/serialnum.rs

@@ -0,0 +1,16 @@
+// Get serial number from last 4K block of the first 1M
+const FLASH_OFFSET: usize = 0x10000000;
+const LAST_4K_BLOCK: usize = 0xff000;
+const SERIALNUM_LEN: usize = 18;
+
+pub fn get_serialnum() -> Option<&'static str> {
+    // Flash is mapped into memory, just read it from there
+    let ptr: *const u8 = (FLASH_OFFSET + LAST_4K_BLOCK) as *const u8;
+    unsafe {
+        let slice: &[u8] = core::slice::from_raw_parts(ptr, SERIALNUM_LEN);
+        if slice[0] == 0xFF || slice[0] == 0x00 {
+            return None;
+        }
+        core::str::from_utf8(slice).ok()
+    }
+}