From fe1c1f066b6ec7166f2dfb880b0838ebdbf6ad58 Mon Sep 17 00:00:00 2001 From: Bryan Hughes Date: Thu, 12 Sep 2019 10:00:01 -0700 Subject: [PATCH] Fixed a bug where serial wasn't disabled on the RPi4 --- CHANGELOG.md | 4 ++++ dist/index.js | 11 +++++++---- dist/index.js.map | 2 +- package.json | 2 +- src/index.ts | 22 +++++++++++++--------- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdc1a3..104fe3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 10.0.3 (2019-9-12) + +- Fixed a bug where serial wasn't being disabled on the RPi 4 + ## 10.0.2 (2019-4-15) - Fixed a bug where GPIO pins were not marked as PWM pins correctly diff --git a/dist/index.js b/dist/index.js index 4b7d9cb..a25c9e7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -51,11 +51,14 @@ function RaspiIO({ includePins, excludePins, enableSerial, enableI2C = true } = }; } if (typeof enableSerial === 'undefined') { + const boardRevision = raspi_board_1.getBoardRevision(); enableSerial = - raspi_board_1.getBoardRevision() !== raspi_board_1.VERSION_3_MODEL_B && - raspi_board_1.getBoardRevision() !== raspi_board_1.VERSION_3_MODEL_A_PLUS && - raspi_board_1.getBoardRevision() !== raspi_board_1.VERSION_3_MODEL_B_PLUS && - raspi_board_1.getBoardRevision() !== raspi_board_1.VERSION_1_MODEL_ZERO_W; + boardRevision === raspi_board_1.VERSION_1_MODEL_B_REV_1 || + boardRevision === raspi_board_1.VERSION_1_MODEL_B_REV_2 || + boardRevision === raspi_board_1.VERSION_1_MODEL_B_PLUS || + boardRevision === raspi_board_1.VERSION_1_MODEL_A_PLUS || + boardRevision === raspi_board_1.VERSION_1_MODEL_ZERO || + boardRevision === raspi_board_1.VERSION_2_MODEL_B; } if (enableSerial) { options.platform.serial = raspi_serial_1.module; diff --git a/dist/index.js.map b/dist/index.js.map index cd5ea20..8197104 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;EAsBE;;AAEF,iCAAuD;AACvD,6CAAuD;AACvD,6CAQqB;AACrB,iCAAuC;AACvC,2CAA4C;AAC5C,yCAA0C;AAC1C,yCAA0C;AAC1C,mDAA+C;AAC/C,+CAA8D;AAC9D,+BAA+B;AAS/B,SAAgB,OAAO,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,GAAG,IAAI,KAAe,EAAE;IACjG,MAAM,OAAO,GAAiB;QAC5B,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE,KAAK,CAAC,qBAAO,EAAE,CAAC;QACzB,QAAQ,EAAE;YACR,IAAI,EAAJ,cAAI;YACJ,IAAI,EAAJ,mBAAI;YACJ,GAAG,EAAH,kBAAG;YACH,GAAG,EAAH,uBAAG;SACJ;KACF,CAAC;IAEF,IAAI,SAAS,EAAE;QACb,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,kBAAG,CAAC;QAC3B,OAAO,CAAC,MAAM,GAAG;YACf,OAAO,EAAE,8BAAgB,EAAE,KAAK,qCAAuB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAChE,CAAC;KACH;IAED,IAAI,OAAO,YAAY,KAAK,WAAW,EAAE;QACvC,MAAM,aAAa,GAAG,8BAAgB,EAAE,CAAC;QACzC,YAAY;YACV,aAAa,KAAK,qCAAuB;gBACzC,aAAa,KAAK,qCAAuB;gBACzC,aAAa,KAAK,oCAAsB;gBACxC,aAAa,KAAK,oCAAsB;gBACxC,aAAa,KAAK,kCAAoB;gBACtC,aAAa,KAAK,+BAAiB,CAAC;KACvC;IACD,IAAI,YAAY,EAAE;QAChB,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,qBAAM,CAAC;QACjC,OAAO,CAAC,SAAS,GAAG;YAClB,OAAO,EAAE,2BAAY;SACtB,CAAC;KACH;IAED,qEAAqE;IACrE,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC9B,MAAM,cAAc,GAAkC,EAAE,CAAC;QACzD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;YAC7B,MAAM,aAAa,GAAG,0BAAY,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,aAAa,KAAK,IAAI,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,4BAA4B,CAAC,CAAC;aAClE;YACD,cAAc,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SAChE;QACD,OAAO,CAAC,OAAO,GAAG,cAAc,CAAC;KAClC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;YAC7B,MAAM,aAAa,GAAG,0BAAY,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,aAAa,KAAK,IAAI,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,4BAA4B,CAAC,CAAC;aAClE;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SACvC;KACF;IAED,2FAA2F;IAC3F,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;QACjC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YACxC,SAAS;SACV;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;QACrD,IAAI,WAAW,CAAC,OAAO,CAAC,4BAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,4BAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACrG,WAAW,CAAC,IAAI,CAAC,4BAAc,CAAC,GAAG,CAAC,CAAC;SACtC;KACF;IAED,sGAAsG;IACtG,IAAI,SAAS,EAAE;QACb,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBACxC,SAAS;aACV;YACD,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,4BAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;gBACvE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,CAAE,4BAAc,CAAC,GAAG,CAAE,CAAC;aAC3D;SACF;KACF;IAED,yGAAyG;IACzG,IAAI,YAAY,EAAE;QAChB,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE;YACjC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBACxC,SAAS;aACV;YACD,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,4BAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACxE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,CAAE,4BAAc,CAAC,IAAI,CAAE,CAAC;aAC5D;SACF;KACF;IAED,OAAO,IAAI,YAAI,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC;AA7FD,0BA6FC"} \ No newline at end of file diff --git a/package.json b/package.json index 9b20b63..75089a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "raspi-io", - "version": "10.0.2", + "version": "10.0.3", "description": "A Firmata-compatible Raspberry Pi I/O API", "main": "dist/index.js", "repository": { diff --git a/src/index.ts b/src/index.ts index 4c2ac7e..70b5b08 100644 --- a/src/index.ts +++ b/src/index.ts @@ -26,11 +26,12 @@ import { J5IO, IOptions as IJ5IOOptions } from 'j5-io'; import { IPinInfo, PeripheralType } from 'j5-io-types'; import { getPins, getBoardRevision, getPinNumber, - VERSION_3_MODEL_A_PLUS, - VERSION_3_MODEL_B, - VERSION_3_MODEL_B_PLUS, - VERSION_1_MODEL_ZERO_W, - VERSION_1_MODEL_B_REV_1 + VERSION_1_MODEL_B_REV_1, + VERSION_1_MODEL_B_REV_2, + VERSION_1_MODEL_B_PLUS, + VERSION_1_MODEL_A_PLUS, + VERSION_1_MODEL_ZERO, + VERSION_2_MODEL_B } from 'raspi-board'; import { module as base } from 'raspi'; import { module as gpio } from 'raspi-gpio'; @@ -67,11 +68,14 @@ export function RaspiIO({ includePins, excludePins, enableSerial, enableI2C = tr } if (typeof enableSerial === 'undefined') { + const boardRevision = getBoardRevision(); enableSerial = - getBoardRevision() !== VERSION_3_MODEL_B && - getBoardRevision() !== VERSION_3_MODEL_A_PLUS && - getBoardRevision() !== VERSION_3_MODEL_B_PLUS && - getBoardRevision() !== VERSION_1_MODEL_ZERO_W; + boardRevision === VERSION_1_MODEL_B_REV_1 || + boardRevision === VERSION_1_MODEL_B_REV_2 || + boardRevision === VERSION_1_MODEL_B_PLUS || + boardRevision === VERSION_1_MODEL_A_PLUS || + boardRevision === VERSION_1_MODEL_ZERO || + boardRevision === VERSION_2_MODEL_B; } if (enableSerial) { options.platform.serial = serial;