From 0d9e719078cabdc34eb6aeee30ef3370edc81366 Mon Sep 17 00:00:00 2001 From: Michal Moskal Date: Mon, 10 Jul 2017 12:48:04 +0100 Subject: [PATCH] Button name clashes with C++ --- libs/core/input.ts | 2 +- libs/core/ir.ts | 4 ++-- libs/core/touch.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/core/input.ts b/libs/core/input.ts index 7c3475c6..0045beaf 100644 --- a/libs/core/input.ts +++ b/libs/core/input.ts @@ -424,7 +424,7 @@ namespace input.internal { } namespace input { - export class Button extends control.Component { + export class ButtonTS extends control.Component { private downTime: number; private _isPressed: boolean; private _wasPressed: boolean; diff --git a/libs/core/ir.ts b/libs/core/ir.ts index b9878e93..f216c8fd 100644 --- a/libs/core/ir.ts +++ b/libs/core/ir.ts @@ -43,14 +43,14 @@ namespace input { export class IrSensor extends internal.UartSensor { private channel: IrRemoteChannel private pollRunning: boolean - private buttons: Button[]; + private buttons: ButtonTS[]; constructor() { super() this.channel = IrRemoteChannel.Ch0 this.buttons = [] for (let i = 0; i < 5; ++i) { - this.buttons.push(new Button()) + this.buttons.push(new ButtonTS()) } } diff --git a/libs/core/touch.ts b/libs/core/touch.ts index 172bb455..7967ca35 100644 --- a/libs/core/touch.ts +++ b/libs/core/touch.ts @@ -1,10 +1,10 @@ namespace input { export class TouchSensor extends internal.AnalogSensor { - button: Button; + button: ButtonTS; constructor() { super() - this.button = new Button() + this.button = new ButtonTS() } _query() {