scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prevent reading non-existing sensors

Browse source
This commit is contained in:
Valerie Young 2019-01-11 10:56:00 -05:00
parent f6a9dd95b0
commit 328e4480f6
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/extensions/scratch3_gdx_for/index.js
View file

@ -68,6 +68,7 @@ class GdxFor {
this.disconnect = this.disconnect.bind(this); this.disconnect = this.disconnect.bind(this);
this._onConnect = this._onConnect.bind(this); this._onConnect = this._onConnect.bind(this);
this._sensorsEnabled = null;
} }
@ -100,12 +101,13 @@ class GdxFor {
} }
/** /**
* Called by the runtime when a use exits the connection popup. * Called by the runtime when a user exits the connection popup.
* Disconnect from the GDX FOR. * Disconnect from the GDX FOR.
*/ */
disconnect () { disconnect () {
if (this._device) { if (this._device) {
this._device.close(); this._device.close();
this._sensorsEnabled = false;
} }
} }
@ -151,12 +153,22 @@ class GdxFor {
} }
}); });
}); });
this._device.on('measurements-started', () => {
this._sensorsEnabled = true;
})
this._device.start(10); // Set the period to 10 milliseconds this._device.start(10); // Set the period to 10 milliseconds
} }
/**
* Device is connected and measurements enabled
* @private
*/
_canReadSensors () {
return this.isConnected() && this._sensorsEnabled;
}
getForce () { getForce () {
if (this.isConnected()) { if (this._canReadSensors()) {
let force = this._device.getSensor(1).value; let force = this._device.getSensor(1).value;
// Normalize the force, which can be measured between -50 and 50 N, // Normalize the force, which can be measured between -50 and 50 N,
// to be a value between -100 and 100. // to be a value between -100 and 100.
@ -167,7 +179,7 @@ class GdxFor {
} }
getTiltX () { getTiltX () {
if (this.isConnected()) { if (this._canReadSensors()) {
let x = this.getAccelerationX(); let x = this.getAccelerationX();
let y = this.getAccelerationY(); let y = this.getAccelerationY();
let z = this.getAccelerationZ(); let z = this.getAccelerationZ();
@ -217,7 +229,7 @@ class GdxFor {
} }
getTiltY () { getTiltY () {
if (this.isConnected()) { if (this._canReadSensors()) {
let x = this.getAccelerationX(); let x = this.getAccelerationX();
let y = this.getAccelerationY(); let y = this.getAccelerationY();
let z = this.getAccelerationZ(); let z = this.getAccelerationZ();
@ -268,42 +280,42 @@ class GdxFor {
getAccelerationX () { getAccelerationX () {
if (this.isConnected()) { if (this._canReadSensors()) {
return this._device.getSensor(2).value; return this._device.getSensor(2).value;
} }
return 0; return 0;
} }
getAccelerationY () { getAccelerationY () {
if (this.isConnected()) { if (this._canReadSensors()) {
return this._device.getSensor(3).value; return this._device.getSensor(3).value;
} }
return 0; return 0;
} }
getAccelerationZ () { getAccelerationZ () {
if (this.isConnected()) { if (this._canReadSensors()) {
return this._device.getSensor(4).value; return this._device.getSensor(4).value;
} }
return 0; return 0;
} }
getSpinSpeedX () { getSpinSpeedX () {
if (this.isConnected()) { if (this._canReadSensors()) {
return this._device.getSensor(5).value * (180 / Math.PI); return this._device.getSensor(5).value * (180 / Math.PI);
} }
return 0; return 0;
} }
getSpinSpeedY () { getSpinSpeedY () {
if (this.isConnected()) { if (this._canReadSensors()) {
return this._device.getSensor(6).value * (180 / Math.PI); return this._device.getSensor(6).value * (180 / Math.PI);
} }
return 0; return 0;
} }
getSpinSpeedZ () { getSpinSpeedZ () {
if (this.isConnected()) { if (this._canReadSensors()) {
return this._device.getSensor(7).value * (180 / Math.PI); return this._device.getSensor(7).value * (180 / Math.PI);
} }
return 0; return 0;