separating touch sensor stuff

libs/core/touch.ts

@@ -1,12 +1,26 @@
+// keep TouchSensorEvent in sync with ButtonEvent
+
+/**
+ * Touch sensor interactions
+ */
+const enum TouchSensorEvent {
+    //% block="touched"
+    Touched = 4,
+    //% block="bumped"
+    Bumped = 1,
+    //% block="released"
+    Released = 3,
+}
+
 namespace input {
 
     //% fixedInstances
     export class TouchSensor extends internal.AnalogSensor {
-        button: Button;
+        private button: Button;
 
         constructor(port: number) {
             super(port)
-            this.button = new Button()
+            this.button = new Button();
         }
 
         _query() {
@@ -20,26 +34,45 @@ namespace input {
         _deviceType() {
             return DAL.DEVICE_TYPE_TOUCH
         }
+
+        /**
+         * Check if touch sensor is touched.
+         * @param sensor the port to query the request
+         */
+        //% help=input/touch/is-touched
+        //% block="%sensor|is touched"
+        //% blockId=touchIsTouched
+        //% parts="touch"
+        //% blockNamespace=input
+        //% weight=81 blockGap=8
+        //% group="Touch sensor"
+        isTouched() {
+            return this.button.isPressed();
+        }
+
+        /**
+         * Do something when a touch sensor is touched...
+         * @param sensor the touch sensor that needs to be clicked or used
+         * @param event the kind of button gesture that needs to be detected
+         * @param body code to run when the event is raised
+         */
+        //% help=input/touch/on-event
+        //% blockId=touchEvent block="on %sensor|%event"
+        //% parts="touch"
+        //% blockNamespace=input
+        //% weight=99 blockGap=8
+        //% group="Touch sensor"
+        onEvent(ev: TouchSensorEvent, body: () => void) {
+            this.button.onEvent(<ButtonEvent><number>ev, body)
+        }
     }
 
-    //% whenUsed
-    export const touchSensorImpl1: TouchSensor = new TouchSensor(1)
-    //% whenUsed
-    export const touchSensorImpl2: TouchSensor = new TouchSensor(2)
-    //% whenUsed
-    export const touchSensorImpl3: TouchSensor = new TouchSensor(3)
-    //% whenUsed
-    export const touchSensorImpl4: TouchSensor = new TouchSensor(4)
-
     //% whenUsed block="touch sensor 1" weight=95 fixedInstance
-    export const touchSensor1: Button = touchSensorImpl1.button
-
+    export const touchSensor1: TouchSensor = new TouchSensor(1)
     //% whenUsed block="touch sensor 2" weight=95 fixedInstance
-    export const touchSensor2: Button = touchSensorImpl2.button
-
+    export const touchSensor2: TouchSensor = new TouchSensor(2)
     //% whenUsed block="touch sensor 3" weight=95 fixedInstance
-    export const touchSensor3: Button = touchSensorImpl3.button
-
+    export const touchSensor3: TouchSensor = new TouchSensor(3)
     //% whenUsed block="touch sensor 4" weight=95 fixedInstance
-    export const touchSensor4: Button = touchSensorImpl4.button
+    export const touchSensor4: TouchSensor = new TouchSensor(4)
 }