homebridge-lib 5.1.18 → 5.1.19

package/lib/SystemInfo.js

@@ -113,25 +113,16 @@ class SystemInfo extends events.EventEmitter {
     */
   static parseRpiCpuInfo (cpuInfo) {
     const id = /Serial\s*: ([0-9a-f]{16})/.exec(cpuInfo)[1].toUpperCase()
-    const revision = parseInt(/Revision\s*: ([0-9a-f]{4,})/.exec(cpuInfo)[1], 16)
-    const rpi = SystemInfo.parseRpiRevision(revision & 0x00FFFFFF)
-    return Object.assign({ id: id }, rpi)
-  }
-
-  /** Parse the revision of a Raspberry Pi.
-    *
-    * @see https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-revision-codes
-    * @param {int} revision - The Raspberry Pi revision.
-    * @return {object} - The parsed revision.
-    */
-  static parseRpiRevision (revision) {
+    const revision = parseInt(
+      /Revision\s*: ([0-9a-f]{4,})/.exec(cpuInfo)[1], 16
+    ) & 0x00FFFFFF
     let gpioMask, manufacturer, memory, model, modelRevision, processor
     if ((revision & 0x00800000) !== 0) { // New revision scheme.
-      manufacturer = rpiInfo.manufacturers[(revision & 0x000f0000) >> 16]
+      manufacturer = rpiInfo.manufacturers[(revision & 0x000F0000) >> 16]
       memory = rpiInfo.memorySizes[(revision & 0x00700000) >> 20]
-      model = rpiInfo.models[(revision & 0x00000ff0) >> 4]
-      modelRevision = '1.' + ((revision & 0x0000000f) >> 0).toString()
-      processor = rpiInfo.processors[(revision & 0x0000f000) >> 12]
+      model = rpiInfo.models[(revision & 0x00000FF0) >> 4]
+      modelRevision = '1.' + ((revision & 0x0000000F) >> 0).toString()
+      processor = rpiInfo.processors[(revision & 0x0000F000) >> 12]
     } else if (rpiInfo.oldRevisions[revision] != null) { // Old incremental revisions.
       manufacturer = rpiInfo.oldRevisions[revision].manufacturer
       memory = rpiInfo.oldRevisions[revision].memory
@@ -155,6 +146,8 @@ class SystemInfo extends events.EventEmitter {
     return {
       gpioMask: gpioMask,
       gpioMaskSerial: (1 << 15) | (1 << 14),
+      id: id,
+      isRpi: true,
       manufacturer: manufacturer,
       memory: memory,
       model: model,
@@ -216,22 +209,7 @@ class SystemInfo extends events.EventEmitter {
     */
   async getRpiInfo () {
     const cpuInfo = await this.readTextFile('/proc/cpuinfo')
-    const rpi = SystemInfo.parseRpiCpuInfo(cpuInfo)
-    return {
-      gpioMask: rpi.gpioMask,
-      gpioMaskSerial: rpi.gpioMaskSerial,
-      id: rpi.id,
-      isRpi: true,
-      manufacturer: rpi.manufacturer,
-      memory: rpi.memory,
-      model: rpi.model,
-      modelRevision: rpi.modelRevision,
-      nCores: os.cpus().length,
-      powerLed: rpi.powerLed,
-      prettyName: rpi.prettyName,
-      processor: rpi.processor,
-      revision: rpi.revision
-    }
+    return SystemInfo.parseRpiCpuInfo(cpuInfo)
   }
 
   /** Extract OS info from /etc/os-release.

package/package.json

@@ -3,7 +3,7 @@
   "description": "Library for homebridge plugins",
   "author": "Erik Baauw",
   "license": "Apache-2.0",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "keywords": [
     "homekit",
     "homebridge"