nkellenicki/node-poweredup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified and deduplicated type selection

Browse Source
This commit is contained in:
Nathan Kunicki 2018-06-19 17:16:42 +01:00
parent a3905c81cc
commit 2d39fa7222
1 changed files with 22 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
hub.js
View File

@ -87,26 +87,7 @@ class Hub extends EventEmitter {
subscribe (port, mode = false) {
if (!mode) {
switch (this.ports[port].type) {
case Consts.Devices.BASIC_MOTOR:
mode = 0x02;
break;
case Consts.Devices.BOOST_INTERACTIVE_MOTOR:
mode = 0x02;
break;
case Consts.Devices.BOOST_MOVE_HUB_MOTOR:
mode = 0x02;
break;
case Consts.Devices.BOOST_DISTANCE:
mode = Consts.Hubs.WEDO2_SMART_HUB ? 0x00 : 0x08
break;
case Consts.Devices.BOOST_TILT:
mode = 0x04;
break;
default:
mode = 0x00;
break;
}
mode = this._getModeForDeviceType(this.ports[port].type);
}
this._activatePortDevice(this.ports[port].value, this.ports[port].type, mode, 0x00);
}
@ -114,31 +95,30 @@ class Hub extends EventEmitter {
unsubscribe (port, mode = false) {
if (!mode) {
switch (this.ports[port].type) {
case Consts.Devices.BASIC_MOTOR:
mode = 0x02;
break;
case Consts.Devices.BOOST_INTERACTIVE_MOTOR:
mode = 0x02;
break;
case Consts.Devices.BOOST_MOVE_HUB_MOTOR:
mode = 0x02;
break;
case Consts.Devices.BOOST_DISTANCE:
mode = Consts.Hubs.WEDO2_SMART_HUB ? 0x00 : 0x08
break;
case Consts.Devices.BOOST_TILT:
mode = 0x04;
break;
default:
mode = 0x00;
break;
}
mode = this._getModeForDeviceType(this.ports[port].type);
}
this._deactivatePortDevice(this.ports[port].value, this.ports[port].type, mode, 0x00);
}
_getModeForDeviceType (type) {
switch (type) {
case Consts.Devices.BASIC_MOTOR:
return 0x02;
case Consts.Devices.BOOST_INTERACTIVE_MOTOR:
return 0x02;
case Consts.Devices.BOOST_MOVE_HUB_MOTOR:
return 0x02;
case Consts.Devices.BOOST_DISTANCE:
return (Consts.Hubs.WEDO2_SMART_HUB ? 0x00 : 0x08);
case Consts.Devices.BOOST_TILT:
return 0x04;
default:
return 0x00;
}
}
_subscribeToCharacteristic (characteristic, callback) {
characteristic.on("data", (data, isNotification) => {
return callback(data);
@ -154,70 +134,8 @@ class Hub extends EventEmitter {
_registerDeviceAttachment (port, type) {
if (port.connected) {
switch (type) {
case Consts.Devices.WEDO2_TILT:
{
port.type = type;
debug(`Port ${port.id} connected, detected WEDO2_TILT`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, 0x00, 0x00);
}
break;
}
case Consts.Devices.WEDO2_DISTANCE:
{
port.type = type;
debug(`Port ${port.id} connected, detected WEDO2_DISTANCE`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, 0x00, 0x00);
}
break;
}
case Consts.Devices.BASIC_MOTOR:
{
port.type = type;
debug(`Port ${port.id} connected, detected BASIC_MOTOR`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, 0x02, 0x00);
}
break;
}
case Consts.Devices.BOOST_DISTANCE:
{
port.type = type;
debug(`Port ${port.id} connected, detected BOOST_DISTANCE`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, this.type == Consts.Hubs.WEDO2_SMART_HUB ? 0x00 : 0x08, 0x00); // NK: 0x00 for WeDo 2.0 Smart hub, 0x08 for Boost Move Hub
}
break;
}
case Consts.Devices.BOOST_INTERACTIVE_MOTOR:
{
port.type = type;
debug(`Port ${port.id} connected, detected BOOST_INTERACTIVE_MOTOR`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, 0x02, 0x00);
}
break;
}
case Consts.Devices.BOOST_MOVE_HUB_MOTOR:
{
port.type = type;
debug(`Port ${port.id} connected, detected BOOST_MOVE_HUB_MOTOR`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, 0x02, 0x00);
}
break;
}
case Consts.Devices.BOOST_TILT:
{
port.type = type;
debug(`Port ${port.id} connected, detected BOOST_TILT`);
if (this.autoSubscribe) {
this._activatePortDevice(port.value, port.type, 0x04, 0x00);
}
break;
}
this._activatePortDevice(port.value, this._getModeForDeviceType(port.type), 0x00, 0x00);
}
} else {
port.type = null;