diff --git a/CHANGELOG.md b/CHANGELOG.md index 23cb57f..e58e0ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.25.6 | 2025-01-08 | `system()` raspberry PI detection improved | | 5.25.5 | 2025-01-07 | `shell()` detect powerShell (windows) | | 5.25.4 | 2025-01-06 | `versions()` improved powerShell parsing (windows) | | 5.25.3 | 2025-01-05 | `memLayout()` improved speed parsing (windows) | diff --git a/docs/history.html b/docs/history.html index 0056d03..d45ba24 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@ + + 5.25.6 + 2024-01-08 + system() raspberry pi detection improved + 5.25.5 2024-01-07 diff --git a/docs/index.html b/docs/index.html index f89c92f..7bac7f5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
- 3
New Version: 5.25.5
+ 3
New Version: 5.25.6
diff --git a/lib/system.js b/lib/system.js index 70b634e..14cfacd 100644 --- a/lib/system.js +++ b/lib/system.js @@ -189,7 +189,7 @@ function system(callback) { const model = util.getValue(lines, 'model:', ':', true); // reference values: https://elinux.org/RPi_HardwareHistory // https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md - if ((result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2710' || result.model === 'BCM2711' || result.model === 'BCM2836' || result.model === 'BCM2837') && model.toLowerCase().indexOf('raspberry') >= 0) { + if ((result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2710' || result.model === 'BCM2711' || result.model === 'BCM2836' || result.model === 'BCM2837' || result.model === '') && model.toLowerCase().indexOf('raspberry') >= 0) { const rPIRevision = util.decodePiCpuinfo(lines); result.model = rPIRevision.model; result.version = rPIRevision.revisionCode; diff --git a/lib/util.js b/lib/util.js index 50d68b9..230d215 100644 --- a/lib/util.js +++ b/lib/util.js @@ -661,7 +661,8 @@ function isRaspberry() { } const hardware = getValue(cpuinfo, 'hardware'); - return (hardware && PI_MODEL_NO.indexOf(hardware) > -1); + const model = getValue(cpuinfo, 'model'); + return ((hardware && PI_MODEL_NO.indexOf(hardware) > -1) || (model && model.indexOf('Raspberry Pi') > -1)); } function isRaspbian() {