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

Merge pull request #35 from nutki/pr-3

Browse Source 
Fix and simplify tilt sensor reading
This commit is contained in:
Nathan Kellenicki 2019-11-10 12:30:05 -08:00 committed by GitHub
commit 73dd34449a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lpf2hub.ts
View File

@ -498,8 +498,8 @@ export class LPF2Hub extends Hub {
break; break;
} }
case Consts.DeviceType.WEDO2_TILT: { case Consts.DeviceType.WEDO2_TILT: {
const tiltX = data[4] > 160 ? data[4] - 255 : data[4] - (data[4] * 2); const tiltX = data.readInt8(4);
const tiltY = data[5] > 160 ? 255 - data[5] : data[5] - (data[5] * 2); const tiltY = data.readInt8(5);
this._lastTiltX = tiltX; this._lastTiltX = tiltX;
this._lastTiltY = tiltY; this._lastTiltY = tiltY;
/** /**
@ -540,8 +540,8 @@ export class LPF2Hub extends Hub {
break; break;
} }
case Consts.DeviceType.BOOST_TILT: { case Consts.DeviceType.BOOST_TILT: {
const tiltX = data[4] > 160 ? data[4] - 255 : data[4]; const tiltX = data.readInt8(4);
const tiltY = data[5] > 160 ? 255 - data[5] : data[5] - (data[5] * 2); const tiltY = data.readInt8(5);
this._lastTiltX = tiltX; this._lastTiltX = tiltX;
this._lastTiltY = tiltY; this._lastTiltY = tiltY;
this.emit("tilt", port.id, this._lastTiltX, this._lastTiltY, this._lastTiltZ); this.emit("tilt", port.id, this._lastTiltX, this._lastTiltY, this._lastTiltZ);

10
src/wedo2smarthub.ts
View File

@ -420,14 +420,8 @@ export class WeDo2SmartHub extends Hub {
break; break;
} }
case Consts.DeviceType.WEDO2_TILT: { case Consts.DeviceType.WEDO2_TILT: {
this._lastTiltX = data[2]; this._lastTiltX = data.readInt8(2);
if (this._lastTiltX > 100) { this._lastTiltY = data.readInt8(3);
this._lastTiltX = -(255 - this._lastTiltX);
}
this._lastTiltY = data[3];
if (this._lastTiltY > 100) {
this._lastTiltY = -(255 - this._lastTiltY);
}
/** /**
* Emits when a tilt sensor is activated. * Emits when a tilt sensor is activated.
* @event WeDo2SmartHub#tilt * @event WeDo2SmartHub#tilt