diff --git a/CHANGELOG.md b/CHANGELOG.md index dcbd90c..a115abd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,7 +98,8 @@ Other changes | Version | Date | Comment | | -------------- | -------------- | -------- | -| 3.27.0 | 2017-09-11 | added raw data to `currentLoad()`, fixed `networkInterfaces()` MAC problem node 8.x | +| 3.27.1 | 2017-09-13 | updated Raspberry version detection `system()` (Pi 3, Zero) | +| 3.27.0 | 2017-09-12 | added raw data to `currentLoad()`, fixed `networkInterfaces()` MAC problem node 8.x | | 3.26.2 | 2017-09-01 | removed redundant code | | 3.26.1 | 2017-08-23 | fixed `cpu().speed` windows / AMD, updated docs | | 3.26.0 | 2017-08-21 | extended `getDynamicData()` (windows), updated docs | diff --git a/lib/filesystem.js b/lib/filesystem.js index de5f5f6..45bd736 100644 --- a/lib/filesystem.js +++ b/lib/filesystem.js @@ -172,7 +172,7 @@ function parseBlk(lines) { let data = []; lines.filter(line => line !== '').forEach((line) => { - // line = line.replace(/\\/g,'\\\\'); + line = line.replace(/\\/g,'\\\\'); let disk = JSON.parse(line); data.push({ 'name': disk.name, diff --git a/lib/system.js b/lib/system.js index 702534c..4b7b8ef 100644 --- a/lib/system.js +++ b/lib/system.js @@ -67,19 +67,34 @@ module.exports = function (callback) { if (line.toLowerCase().indexOf('serial') !== -1) result.serial = line.split(':')[1].trim(); } }); - if (result.model === 'BCM2709') { + if (result.model === 'BCM2835') { // Pi 3 + result.manufacturer = 'Raspberry Pi Foundation'; + result.model = result.model + ' - Pi 3 Model B'; + if (['a02082', 'a22082', 'a32082'].indexOf(result.version) >= 0) { + result.version = result.version + ' - Rev. 1.2' + } + } + if (result.model === 'BCM2709') { // Pi 2 result.manufacturer = 'Raspberry Pi Foundation'; result.model = result.model + ' - Pi 2 Model B'; if (['a01041', 'a21041'].indexOf(result.version) >= 0) { result.version = result.version + ' - Rev. 1.1' } } - if (result.model === 'BCM2708') { + if (result.model === 'BCM2708') { // Pi, Pi Zero result.manufacturer = 'Raspberry Pi Foundation'; if (['0002', '0003'].indexOf(result.version) >= 0) { result.model = result.model + ' - Pi Model B'; result.version = result.version + ' - Rev 1.0'; } + if (['900092'].indexOf(result.version) >= 0) { + result.model = result.model + ' - Pi Zero'; + result.version = result.version + ' - Rev 1.2'; + } + if (['900092', '900093', '920093'].indexOf(result.version) >= 0) { + result.model = result.model + ' - Pi Zero'; + result.version = result.version + ' - Rev 1.3'; + } if (['0007', '0008', '0009'].indexOf(result.version) >= 0) { result.model = result.model + ' - Pi Model A'; result.version = result.version + ' - Rev 2.0'; @@ -88,18 +103,22 @@ module.exports = function (callback) { result.model = result.model + ' - Pi Model B'; result.version = result.version + ' - Rev 2.0'; } - if (['0012'].indexOf(result.version) >= 0) { - result.model = result.model + ' - Pi Model A+'; - result.version = result.version + ' - Rev 1.0'; - } if (['0010'].indexOf(result.version) >= 0) { result.model = result.model + ' - Pi Model B+'; result.version = result.version + ' - Rev 1.0'; } + if (['0012'].indexOf(result.version) >= 0) { + result.model = result.model + ' - Pi Model A+'; + result.version = result.version + ' - Rev 1.0'; + } if (['0013'].indexOf(result.version) >= 0) { result.model = result.model + ' - Pi Model B+'; result.version = result.version + ' - Rev 1.2'; } + if (['0015'].indexOf(result.version) >= 0) { + result.model = result.model + ' - Pi Model A+'; + result.version = result.version + ' - Rev 1.1'; + } } } if (callback) { callback(result) }