remove onGesture and onJoystick event

.gitignore

@@ -45,3 +45,10 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+node_modules/
+pxt_modules/
+built/
+.python-version
+package-lock.json
+projects/

main.ts

@@ -1,4 +1,3 @@
-
 const initRegisterArray: number[] = [
     0xEF, 0x00, 0x32, 0x29, 0x33, 0x01, 0x34, 0x00, 0x35, 0x01, 0x36, 0x00, 0x37, 0x07, 0x38, 0x17,
     0x39, 0x06, 0x3A, 0x12, 0x3F, 0x00, 0x40, 0x02, 0x41, 0xFF, 0x42, 0x01, 0x46, 0x2D, 0x47, 0x0F,
@@ -61,112 +60,35 @@ enum GroveGesture {
     Wave = 9
 }
 
+enum GroveJoystickKey {
+    //% block=None
+    None = 0,
+    //% block=Right
+    Right = 1,
+    //% block=Left
+    Left = 2,
+    //% block=Up
+    Up = 3,
+    //% block=Down
+    Down = 4,
+    //% block=Upper left
+    UL = 5,
+    //% block=Upper right
+    UR = 6,
+    //% block=Lower left
+    LL = 7,
+    //% block=Lower right
+    LR = 8,
+    //% block=press
+    Press = 9
+}
+
+
 /**
  * Functions to operate Grove module.
  */
 //% weight=10 color=#9F79EE icon="\uf108" block="Grove"
 namespace grove {
-    const gestureEventId = 3100;
-    let lastGesture = GroveGesture.None;
-    let paj7620: PAJ7620 = undefined;
-    let distanceBackup: number = 0;
-    /**
-     * Do something when a gesture is detected by Grove - Gesture
-     * @param gesture type of gesture to detect
-     * @param handler code to run
-     */
-    //% blockId=grove_gesture_create_event block="on Gesture|%gesture"
-    export function onGesture(gesture: GroveGesture, handler: Action) {
-        control.onEvent(gestureEventId, gesture, handler);
-        if (!paj7620) {
-            paj7620.init();
-            control.inBackground(() => {
-                while(true) {
-                    const gesture = paj7620.read();
-                    if (gesture != lastGesture) {
-                        lastGesture = gesture;
-                        control.raiseEvent(gestureEventId, lastGesture);
-                    }
-                    basic.pause(50);
-                }
-            })
-        }
-    }
-    
-    /**
-     * Create a new driver of Grove - Ultrasonic Sensor to measure distances in cm
-     * @param pin signal pin of ultrasonic ranger module
-     */
-    //% blockId=grove_ultrasonic_centimeters block="Ultrasonic Sensor (in cm) at|%pin"
-    export function measureInCentimeters(pin: DigitalPin): number
-    {
-        let duration = 0;
-        let RangeInCentimeters = 0;
-        
-        pins.digitalWritePin(pin, 0);
-        control.waitMicros(2);
-        pins.digitalWritePin(pin, 1);
-        control.waitMicros(20);
-        pins.digitalWritePin(pin, 0);        
-        duration = pins.pulseIn(pin, PulseValue.High, 50000); // Max duration 50 ms
-
-        RangeInCentimeters = duration * 153 / 29 / 2 / 100;
-               
-        if(RangeInCentimeters > 0) distanceBackup = RangeInCentimeters;
-        else RangeInCentimeters = distanceBackup;
-
-        basic.pause(50);
-        
-        return RangeInCentimeters;
-    }
-    
-    /**
-     * Create a new driver Grove - Ultrasonic Sensor to measure distances in inch
-     * @param pin signal pin of ultrasonic ranger module
-     */
-    //% blockId=grove_ultrasonic_inches block="Ultrasonic Sensor (in inch) at|%pin"
-    export function measureInInches(pin: DigitalPin): number
-    {
-        let duration = 0;
-        let RangeInInches = 0;
-        
-        pins.digitalWritePin(pin, 0);
-        control.waitMicros(2);
-        pins.digitalWritePin(pin, 1);
-        control.waitMicros(20);
-        pins.digitalWritePin(pin, 0);        
-        duration = pins.pulseIn(pin, PulseValue.High, 100000); // Max duration 100 ms
-        
-        RangeInInches = duration * 153 / 74 / 2 / 100;
-        
-        if(RangeInInches > 0) distanceBackup = RangeInInches;
-        else RangeInInches = distanceBackup;
-        
-        basic.pause(50);
-        
-        return RangeInInches;
-    }
-    
-    /**
-     * Create a new driver Grove - 4-Digit Display
-     * @param clkPin value of clk pin number
-     * @param dataPin value of data pin number
-     */
-    //% blockId=grove_tm1637_create block="4-Digit Display at|%clkPin|and|%dataPin"
-    export function createDisplay(clkPin: DigitalPin, dataPin: DigitalPin): TM1637
-    {
-        let display = new TM1637();
-        
-        display.buf = pins.createBuffer(4);
-        display.clkPin = clkPin;
-        display.dataPin = dataPin;
-        display.brightnessLevel = 0;
-        display.pointFlag = false;
-        display.clear();
-        
-        return display;
-    }
-    
     /**
      * 
      */
@@ -464,4 +386,135 @@ namespace grove {
             this.bit(0x7f, 0x03);
         }
     }
+
+
+    export class GroveJoystick
+    {
+        /**
+         * Detect position from Grove - Thumb Joystick
+         * @param xPin
+         * @param yPin
+         */
+        //% blockId=grove_joystick_read block="%strip|read position of joystick"
+        //% advanced=true
+        read(xPin: AnalogPin, yPin: AnalogPin): number {
+            let xdata = 0, ydata = 0, result = 0;
+            if (xPin && yPin) {
+                xdata = pins.analogReadPin(xPin);
+                ydata = pins.analogReadPin(yPin);
+                if (xdata > 1000) {
+                    result = GroveJoystickKey.Press;
+                }
+                else if (xdata > 600) {
+                    if (ydata > 600) result = GroveJoystickKey.UR;
+                    else if (ydata < 400) result = GroveJoystickKey.LR;
+                    else result = GroveJoystickKey.Right;
+                }
+                else if (xdata < 400) {
+                    if (ydata > 600) result = GroveJoystickKey.UL;
+                    else if (ydata < 400) result = GroveJoystickKey.LL;
+                    else result = GroveJoystickKey.Left;
+                }
+                else {
+                    if (ydata > 600) result = GroveJoystickKey.Up;
+                    else if (ydata < 400) result = GroveJoystickKey.Down;
+                    else result = GroveJoystickKey.None;
+                }
+            }
+            else {
+                result =  GroveJoystickKey.None;
+            }
+            return result;
+        }
+    }
+    
+    const gestureEventId = 3100;
+    const joystickEventID = 3101;
+    let lastGesture = GroveGesture.None;
+    let lastJoystick = GroveJoystickKey.None;
+    let distanceBackup: number = 0;
+    let joystick = new GroveJoystick();
+    let paj7620 = new PAJ7620();
+    
+    /**
+     * Create a new driver of Grove - Ultrasonic Sensor to measure distances in cm
+     * @param pin signal pin of ultrasonic ranger module
+     */
+    //% blockId=grove_ultrasonic_centimeters block="Ultrasonic Sensor (in cm) at|%pin"
+    export function measureInCentimeters(pin: DigitalPin): number
+    {
+        let duration = 0;
+        let RangeInCentimeters = 0;
+        
+        pins.digitalWritePin(pin, 0);
+        control.waitMicros(2);
+        pins.digitalWritePin(pin, 1);
+        control.waitMicros(20);
+        pins.digitalWritePin(pin, 0);        
+        duration = pins.pulseIn(pin, PulseValue.High, 50000); // Max duration 50 ms
+
+        RangeInCentimeters = duration * 153 / 29 / 2 / 100;
+               
+        if(RangeInCentimeters > 0) distanceBackup = RangeInCentimeters;
+        else RangeInCentimeters = distanceBackup;
+
+        basic.pause(50);
+        
+        return RangeInCentimeters;
+    }
+    
+    /**
+     * Create a new driver Grove - Ultrasonic Sensor to measure distances in inch
+     * @param pin signal pin of ultrasonic ranger module
+     */
+    //% blockId=grove_ultrasonic_inches block="Ultrasonic Sensor (in inch) at|%pin"
+    export function measureInInches(pin: DigitalPin): number
+    {
+        let duration = 0;
+        let RangeInInches = 0;
+        
+        pins.digitalWritePin(pin, 0);
+        control.waitMicros(2);
+        pins.digitalWritePin(pin, 1);
+        control.waitMicros(20);
+        pins.digitalWritePin(pin, 0);        
+        duration = pins.pulseIn(pin, PulseValue.High, 100000); // Max duration 100 ms
+        
+        RangeInInches = duration * 153 / 74 / 2 / 100;
+        
+        if(RangeInInches > 0) distanceBackup = RangeInInches;
+        else RangeInInches = distanceBackup;
+        
+        basic.pause(50);
+        
+        return RangeInInches;
+    }
+    
+    /**
+     * init Grove Gesture modules
+     * 
+     */
+    //% blockId=grove_initgesture block="init gesture"
+    export function initGesture() {
+        if (!paj7620) {
+            paj7620.init();
+        }
+    }
+
+    /**
+     * get Grove Gesture modle
+     * 
+     */
+    //% blockId=grove_getgesture block="get gesture model"
+    export function getGestureModel(): number {
+        return paj7620.read();
+    }
+    /**
+     * get Joystick key
+     * 
+     */
+    //% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%xpin"
+    export function getJoystick(xpin: AnalogPin, ypin: AnalogPin) : number {
+        return joystick.read(xpin, ypin);
+    }
 }

pxt.json

@@ -1,6 +1,6 @@
 {
     "name": "Grove",
-    "version": "0.1.0",
+    "version": "0.1.2",
     "description": "A Microsoft MakeCode package for Seeed Studio Grove module",
     "license": "MIT",
     "dependencies": {
@@ -15,4 +15,4 @@
         "test.ts"
     ],
     "public": true
-}
+}

test.ts

@@ -1,56 +1,104 @@
-grove.onGesture(GroveGesture.Up, () => {
-    basic.showString("U")
-})
-grove.onGesture(GroveGesture.Down, () => {
-    basic.showString("D")
-})
-grove.onGesture(GroveGesture.Right, () => {
-    basic.showString("R")
-})
-grove.onGesture(GroveGesture.Left, () => {
-    basic.showString("L")
-})
-grove.onGesture(GroveGesture.Wave, () => {
-    basic.showString("W")
-})
-grove.onGesture(GroveGesture.Clockwise, () => {
-    basic.showString("C")
-})
-grove.onGesture(GroveGesture.Anticlockwise, () => {
-    basic.showString("A")
-})
+// grove.onGesture(GroveGesture.Up, () => {
+//     basic.showString("U")
+// })
+// grove.onGesture(GroveGesture.Down, () => {
+//     basic.showString("D")
+// })
+// grove.onGesture(GroveGesture.Right, () => {
+//     basic.showString("R")
+// })
+// grove.onGesture(GroveGesture.Left, () => {
+//     basic.showString("L")
+// })
+// grove.onGesture(GroveGesture.Wave, () => {
+//     basic.showString("W")
+// })
+// grove.onGesture(GroveGesture.Clockwise, () => {
+//     basic.showString("C")
+// })
+// grove.onGesture(GroveGesture.Anticlockwise, () => {
+//     basic.showString("A")
+// })
+
+// grove.onJoystick(GroveJoystickKey.Right, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.East);
+//     basic.showString("1");
+// })
+
+// grove.onJoystick(GroveJoystickKey.Left, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.West);
+//     basic.showString("2");
+// })
+
+// grove.onJoystick(GroveJoystickKey.Up, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.North);
+//     basic.showString("3");
+// })
+
+// grove.onJoystick(GroveJoystickKey.Down, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.South);
+//     basic.showString("4");
+// })
+
+// grove.onJoystick(GroveJoystickKey.UL, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.NorthEast);
+//     basic.showString("5");
+// })
+
+// grove.onJoystick(GroveJoystickKey.UR, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.NorthWest);
+//     basic.showString("6");
+// })
+
+// grove.onJoystick(GroveJoystickKey.LL, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.SouthWest);
+//     basic.showString("7");
+// })
+
+// grove.onJoystick(GroveJoystickKey.LR, AnalogPin.P0,AnalogPin.P1, () => {
+//     // basic.showArrow(ArrowNames.SouthEast);
+//     basic.showString("8");
+// })
+
+// grove.onJoystick(GroveJoystickKey.Press, AnalogPin.P0,AnalogPin.P1, () => {
+//     basic.showString("9");
+// })
+
+
 
 {
-    let display = grove.createDisplay(DigitalPin.P0, DigitalPin.P1);
-    let data = 0;
+    // let display = grove.createDisplay(DigitalPin.P0, DigitalPin.P1);
+    // let data = 0;
 
-    display.point(true);
-    display.clear();
-    display.bit(3, 3);
-    basic.pause(500);
+    // display.point(true);
+    // display.clear();
+    // display.bit(3, 3);
+    // basic.pause(500);
     
-    display.point(false);
-    display.clear();
-    display.bit(2, 2);
-    basic.pause(500);
+    // display.point(false);
+    // display.clear();
+    // display.bit(2, 2);
+    // basic.pause(500);
     
-    display.point(true);
-    display.clear();
-    display.bit(1, 1);
-    basic.pause(500);
+    // display.point(true);
+    // display.clear();
+    // display.bit(1, 1);
+    // basic.pause(500);
     
-    display.point(false);
-    display.clear();
-    display.bit(0, 0);
-    basic.pause(500);
+    // display.point(false);
+    // display.clear();
+    // display.bit(0, 0);
+    // basic.pause(500);
     
-    display.set(7);
+    // display.set(7);
+    // let p : grove.PAJ7620;
+    // p.init();
     
     while(true)
     {
-        display.show(data ++);
-        let distance = grove.measureInCentimeters(DigitalPin.P0);
-        basic.showNumber(distance);
-        basic.pause(500);
+    //     display.show(data ++);
+    //     let distance = grove.measureInCentimeters(DigitalPin.P0);
+        basic.showNumber(12);
+        basic.pause(2000);
     }
 }