@@ -34,7 +34,6 @@ public partial class MainWindow : Window
3434 } ;
3535
3636 private readonly SerialPort _uartSerial = new ( ) ;
37- private readonly NORData _norData = new ( ) ;
3837
3938 public MainWindow ( )
4039 {
@@ -182,16 +181,16 @@ private async void Button_OnClick(object? sender, RoutedEventArgs e)
182181
183182 #region Extract PS5 Version
184183
185- SetData ( norPath , Offsets . One , 12 , ref _norData . OffsetOne , out _ ) ;
186- SetData ( norPath , Offsets . Two , 12 , ref _norData . OffsetTwo , out _ ) ;
184+ SetData ( norPath , Offsets . One , 12 , out string ? offsetOne , out _ ) ;
185+ SetData ( norPath , Offsets . Two , 12 , out string ? offsetTwo , out _ ) ;
187186
188- if ( _norData . OffsetOne ? . Contains ( "22020101" ) ?? false )
187+ if ( offsetOne ? . Contains ( "22020101" ) ?? false )
189188 {
190189 PS5ModelOut . Content = "Disc Edition" ;
191190 }
192191 else
193192 {
194- if ( _norData . OffsetTwo ? . Contains ( "22030101" ) ?? false )
193+ if ( offsetTwo ? . Contains ( "22030101" ) ?? false )
195194 {
196195 PS5ModelOut . Content = "Digital Edition" ;
197196 }
@@ -205,19 +204,19 @@ private async void Button_OnClick(object? sender, RoutedEventArgs e)
205204
206205 #region Extract Motherboard Serial Number
207206
208- SetData ( norPath , Offsets . MoboSerial , 16 , ref _norData . MoboSerial , out string moboSerialText ) ;
207+ SetData ( norPath , Offsets . MoboSerial , 16 , out string ? moboSerial , out string moboSerialText ) ;
209208
210- MotherboardSerialOut . Content = _norData . MoboSerial != null
209+ MotherboardSerialOut . Content = moboSerial != null
211210 ? moboSerialText
212211 : "Unknown" ;
213212
214213 #endregion
215214
216215 #region Extract Board Serial Number
217216
218- SetData ( norPath , Offsets . Serial , 17 , ref _norData . Serial , out string serialText ) ;
217+ SetData ( norPath , Offsets . Serial , 17 , out string ? serial , out string serialText ) ;
219218
220- if ( _norData . Serial != null )
219+ if ( serial != null )
221220 {
222221 SerialNumberOut . Content = serialText ;
223222 SerialNumberIn . Text = serialText ;
@@ -232,14 +231,14 @@ private async void Button_OnClick(object? sender, RoutedEventArgs e)
232231
233232 #region Extract WiFi Mac Address
234233
235- SetData ( norPath , Offsets . WiFiMAC , 6 , ref _norData . WiFiMAC , out _ ) ;
236- if ( _norData . WiFiMAC != null )
237- _norData . WiFiMAC = string . Join ( "" , _norData . WiFiMAC . Select ( ( c , i ) => i % 2 == 0 ? $ "{ c } " : $ "{ c } -") ) [ ..^ 1 ] ;
234+ SetData ( norPath , Offsets . WiFiMAC , 6 , out string ? wiFiMAC , out _ ) ;
235+ if ( wiFiMAC != null )
236+ wiFiMAC = string . Join ( "" , wiFiMAC . Select ( ( c , i ) => i % 2 == 0 ? $ "{ c } " : $ "{ c } -") ) [ ..^ 1 ] ;
238237
239- if ( _norData . WiFiMAC != null )
238+ if ( wiFiMAC != null )
240239 {
241- WiFiMACAddressOut . Content = _norData . WiFiMAC ;
242- WiFiMACAddressIn . Text = _norData . WiFiMAC ;
240+ WiFiMACAddressOut . Content = wiFiMAC ;
241+ WiFiMACAddressIn . Text = wiFiMAC ;
243242 }
244243 else
245244 {
@@ -251,14 +250,14 @@ private async void Button_OnClick(object? sender, RoutedEventArgs e)
251250
252251 #region Extract LAN Mac Address
253252
254- SetData ( norPath , Offsets . LANMAC , 6 , ref _norData . LANMAC , out _ ) ;
255- if ( _norData . LANMAC != null )
256- _norData . LANMAC = string . Join ( "" , _norData . LANMAC . Select ( ( c , i ) => i % 2 == 0 ? $ "{ c } " : $ "{ c } -") ) [ ..^ 1 ] ;
253+ SetData ( norPath , Offsets . LANMAC , 6 , out string ? lanmac , out _ ) ;
254+ if ( lanmac != null )
255+ lanmac = string . Join ( "" , lanmac . Select ( ( c , i ) => i % 2 == 0 ? $ "{ c } " : $ "{ c } -") ) [ ..^ 1 ] ;
257256
258- if ( _norData . LANMAC != null )
257+ if ( lanmac != null )
259258 {
260- LANMACAddressOut . Content = _norData . LANMAC ;
261- LANMACAddressIn . Text = _norData . LANMAC ;
259+ LANMACAddressOut . Content = lanmac ;
260+ LANMACAddressIn . Text = lanmac ;
262261 }
263262 else
264263 {
@@ -270,19 +269,19 @@ private async void Button_OnClick(object? sender, RoutedEventArgs e)
270269
271270 #region Extract Board Variant
272271
273- SetData ( norPath , Offsets . Variant , 19 , ref _norData . Variant , out string variantText ) ;
274- if ( _norData . Variant != null )
275- _norData . Variant = _norData . Variant . Replace ( "FF" , null ) ;
272+ SetData ( norPath , Offsets . Variant , 19 , out string ? variant , out string variantText ) ;
273+ if ( variant != null )
274+ variant = variant . Replace ( "FF" , null ) ;
276275
277276 variantText += " - " + Regions . GetValueOrDefault ( variantText [ ^ 3 ..^ 1 ] , "Unknown Region" ) ;
278277
279- BoardVariantOut . Content = _norData . Variant != null ? variantText : "Unknown" ;
278+ BoardVariantOut . Content = variant != null ? variantText : "Unknown" ;
280279
281280 #endregion
282281
283282 return ;
284283
285- void SetData ( string path , long offset , int bytes , ref string ? dataValue , out string outputText )
284+ void SetData ( string path , long offset , int bytes , out string ? dataValue , out string outputText )
286285 {
287286 try
288287 {
0 commit comments