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

avoid conflicts of event values

Browse Source
This commit is contained in:
Peli de Halleux 2017-11-30 08:31:31 -08:00
parent 39b7f99741
commit 4ed41adb6a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/color-sensor/color.ts
View File

@ -59,6 +59,10 @@ namespace sensors {
this.thresholdDetector = new sensors.internal.ThresholdDetector(this.id()); this.thresholdDetector = new sensors.internal.ThresholdDetector(this.id());
} }
_colorEventValue(value: number) {
return 0xff00 | value;
}
_deviceType() { _deviceType() {
return DAL.DEVICE_TYPE_COLOR return DAL.DEVICE_TYPE_COLOR
} }
@ -82,7 +86,7 @@ namespace sensors {
_update(prev: number, curr: number) { _update(prev: number, curr: number) {
if (this.mode == ColorSensorMode.Color) if (this.mode == ColorSensorMode.Color)
control.raiseEvent(this._id, curr); control.raiseEvent(this._id, this._colorEventValue(curr));
else else
this.thresholdDetector.setLevel(curr); this.thresholdDetector.setLevel(curr);
} }
@ -100,10 +104,11 @@ namespace sensors {
//% weight=100 blockGap=8 //% weight=100 blockGap=8
//% group="Color Sensor" //% group="Color Sensor"
onColorDetected(color: ColorSensorColor, handler: () => void) { onColorDetected(color: ColorSensorColor, handler: () => void) {
control.onEvent(this._id, <number>color, handler); const v = this._colorEventValue(<number>color);
control.onEvent(this._id, v, handler);
this.setMode(ColorSensorMode.Color) this.setMode(ColorSensorMode.Color)
if (this.color() == color) if (this.color() == color)
control.raiseEvent(this._id, <number>color); control.raiseEvent(this._id, v);
} }
/** /**
@ -134,7 +139,7 @@ namespace sensors {
//% blockNamespace=sensors //% blockNamespace=sensors
//% weight=89 blockGap=8 //% weight=89 blockGap=8
//% group="Color Sensor" //% group="Color Sensor"
onLightChanged(mode: LightIntensityMode, condition: LightCondition, handler: () => void) { onLightChanged(mode: LightIntensityMode, condition: LightCondition, handler: () => void) {
control.onEvent(this._id, <number>condition, handler); control.onEvent(this._id, <number>condition, handler);
this.setMode(<ColorSensorMode><number>mode) this.setMode(<ColorSensorMode><number>mode)
} }