c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shake button (#1983)

Browse Source 
* initial fix for shake button

* minor cleanup

* always run if forced

* refactor a bit

* only ever enqueue if gesture is different from previous
This commit is contained in:
Joey Wunderlich 2019-04-09 14:19:33 -07:00 committed by GitHub
parent 3fe3642a58
commit 5ac97925a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sim/state/accelerometer.ts
View File

@ -258,32 +258,32 @@ namespace pxsim {
updateGesture() { updateGesture() {
// Determine what it looks like we're doing based on the latest sample... // Determine what it looks like we're doing based on the latest sample...
let g = this.instantaneousPosture(); let g = this.instantaneousPosture();
this.setGesture(g);
}
private setGesture(g: number) {
// Perform some low pass filtering to reduce jitter from any detected effects // Perform some low pass filtering to reduce jitter from any detected effects
if (g == this.currentGesture) { if (g != this.currentGesture) {
if (this.sigma < DAL.MICROBIT_ACCELEROMETER_GESTURE_DAMPING)
this.sigma++;
}
else {
this.currentGesture = g; this.currentGesture = g;
this.sigma = 0; this.sigma = 0;
} else if (this.sigma < DAL.MICROBIT_ACCELEROMETER_GESTURE_DAMPING) {
++this.sigma;
} }
// If we've reached threshold, update our record and raise the relevant event... if (this.sigma >= DAL.MICROBIT_ACCELEROMETER_GESTURE_DAMPING) {
if (this.currentGesture != this.lastGesture && this.sigma >= DAL.MICROBIT_ACCELEROMETER_GESTURE_DAMPING) { this.enqueueCurrentGesture();
}
}
forceGesture(gesture: number) {
this.currentGesture = gesture;
this.enqueueCurrentGesture();
}
private enqueueCurrentGesture() {
if (this.currentGesture != this.lastGesture) {
this.lastGesture = this.currentGesture; this.lastGesture = this.currentGesture;
board().bus.queue(DAL.MICROBIT_ID_GESTURE, this.lastGesture); board().bus.queue(DAL.MICROBIT_ID_GESTURE, this.lastGesture);
} }
} }
forceGesture(g: number) {
this.sigma = DAL.MICROBIT_ACCELEROMETER_GESTURE_DAMPING + 1;
this.setGesture(g);
}
/** /**
* Reads the X axis value of the latest update from the accelerometer. * Reads the X axis value of the latest update from the accelerometer.
* @param system The coordinate system to use. By default, a simple cartesian system is provided. * @param system The coordinate system to use. By default, a simple cartesian system is provided.