remove onGesture and onJoystick event

README.md

@@ -6,88 +6,15 @@ A Microsoft MakeCode package for for Seeed Studio Grove module.
 
 ### Grove - Gesture
 
-get gesture model.
+Create gesture events.
 
 ```blocks
-
-
 grove.onGesture(GroveGesture.Up, () => {
     basic.showString("Up");
 })
 grove.onGesture(GroveGesture.Down, () => {
     basic.showString("Down");
 })
-
-
-grove.initGesture()
-basic.forever(function () {
-    if (grove.getGestureModel() == 1) {
-        basic.showLeds(`
-            . . # . .
-            . . . # .
-            # # # # #
-            . . . # .
-            . . # . .
-            `)
-    }
-    if (grove.getGestureModel() == 2) {
-        basic.showLeds(`
-            . . # . .
-            . # . . .
-            # # # # #
-            . # . . .
-            . . # . .
-            `)
-    }
-    if (grove.getGestureModel() == 3) {
-        basic.showLeds(`
-            . . # . .
-            . # # # .
-            # . # . #
-            . . # . .
-            . . # . .
-            `)
-    }
-    if (grove.getGestureModel() == 4) {
-        basic.showLeds(`
-            . . # . .
-            . . # . .
-            # . # . #
-            . # # # .
-            . . # . .
-            `)
-    }
-    basic.pause(100)
-})
-```
-all the model
-```
-
-/**
- * Grove Gestures
- */
-enum GroveGesture {
-    //% block=None
-    None = 0,
-    //% block=Right
-    Right = 1,
-    //% block=Left
-    Left = 2,
-    //% block=Up
-    Up = 3,
-    //% block=Down
-    Down = 4,
-    //% block=Forward
-    Forward = 5,
-    //% block=Backward
-    Backward = 6,
-    //% block=Clockwise
-    Clockwise = 7,
-    //% block=Anticlockwise
-    Anticlockwise = 8,
-    //% block=Wave
-    Wave = 9
-}
 ```
 
 ### Grove - Ultrasonic Ranger

_locales/de/Grove-strings.json

@@ -1,39 +0,0 @@
-{
-    "{id:category}Grove": "Grove",
-    "GroveGesture.None|block": "keine",
-    "GroveGesture.Right|block": "rechts",
-    "GroveGesture.Left|block": "links",
-    "GroveGesture.Up|block": "auf",
-    "GroveGesture.Down|block": "nieder",
-    "GroveGesture.Forward|block": "vorwärts",
-    "GroveGesture.Backward|block": "rückwärts",
-    "GroveGesture.Clockwise|block": "Uhrzeigersinn",
-    "GroveGesture.Anticlockwise|block": "Gegenuhrzeigersinn",
-    "GroveGesture.Wave|block": "Welle",
-    "grove.initGesture|block": "initialisiere Grove Gestenerkennung",
-    "grove.getGestureModel|block": "hole Geste",
-    "grove.onGesture|block": "wenn Grove - Gestensensor |%gesture|",
-    "grove.measureInCentimeters|block": "Ultraschallsensor (in cm) an |%pin",
-    "grove.measureInInches|block": "Ultraschallsensor (in inch) an |%pin",
-    "grove.createDisplay|block": "4-Ziffern Display an|%clkPin|und|%dataPin",
-    "grove.PAJ7620.init|block": "%strip|initialisiere den Gestensensor",
-    "grove.PAJ7620.read|block": "%strip|erkenne Geste",
-    "grove.TM1637.show|block": "%strip|zeige Zahl|%dispData|",
-    "grove.TM1637.set|block": "%strip|setze Helligkeit auf|%level|",
-    "grove.TM1637.bit|block": "%strip|zeige Ziffer|%dispData|an Stelle|%bitAddr|",
-    "grove.TM1637.point|block": "%strip|schalte Kommapunkt|%point|",
-    "grove.TM1637.clear|block": "%strip|lösche 4-Ziffern Display",
-    "GroveJoystickKey.None|block": "Keiner",
-    "GroveJoystickKey.Right|block": "Rechts",
-    "GroveJoystickKey.Left|block": "Links",
-    "GroveJoystickKey.Up|block": "Hoch",
-    "GroveJoystickKey.Down|block": "Runter",
-    "GroveJoystickKey.UL|block": "Oben links",
-    "GroveJoystickKey.UR|block": "Oben rechts",
-    "GroveJoystickKey.LL|block": "Unten links",
-    "GroveJoystickKey.LR|block": "Unten rechts",
-    "GroveJoystickKey.Press|block": "Gedrückt",
-    "grove.strip.read|block": "%strip|lies Position von Joystick an|%xpin|und|%ypin",
-    "grove.onJoystick|block": "wenn Grove - Joysticktaste|%key an|%xpin|und|%ypin",
-    "grove.getJoystick|block": "hole Joysticktaste an|%xpin|und|%ypin"
-}

main.ts

@@ -260,74 +260,59 @@ namespace grove {
         //% blockId=grove_tm1637_display_number block="%strip|show number|%dispData"
         show(dispData: number)
         {       
-            let compare_01:number = dispData % 100;
-            let compare_001:number = dispData % 1000;
-
             if(dispData < 10)
             {
                 this.bit(dispData, 3);
                 this.bit(0x7f, 2);
                 this.bit(0x7f, 1);
-                this.bit(0x7f, 0);                
+                this.bit(0x7f, 0);
+                
+                this.buf[3] = dispData;
+                this.buf[2] = 0x7f;
+                this.buf[1] = 0x7f;
+                this.buf[0] = 0x7f;
             }
             else if(dispData < 100)
             {
                 this.bit(dispData % 10, 3);
-                if(dispData > 90){
-                    this.bit(9, 2);
-                } else{
-                    this.bit(Math.floor(dispData / 10) % 10, 2);
-                }
-                
+                this.bit((dispData / 10) % 10, 2);
                 this.bit(0x7f, 1);
                 this.bit(0x7f, 0);
+                
+                this.buf[3] = dispData % 10;
+                this.buf[2] = (dispData / 10) % 10;
+                this.buf[1] = 0x7f;
+                this.buf[0] = 0x7f;
             }
             else if(dispData < 1000)
             {
                 this.bit(dispData % 10, 3);
-                if(compare_01 > 90){
-                    this.bit(9, 2);
-                } else{
-                    this.bit(Math.floor(dispData / 10) % 10, 2);
-                }
-                if(compare_001 > 900){
-                    this.bit(9, 1);
-                } else{
-                    this.bit(Math.floor(dispData / 100) % 10, 1);
-                }
+                this.bit((dispData / 10) % 10, 2);
+                this.bit((dispData / 100) % 10, 1);
                 this.bit(0x7f, 0);
+                
+                this.buf[3] = dispData % 10;
+                this.buf[2] = (dispData / 10) % 10;
+                this.buf[1] = (dispData / 100) % 10;
+                this.buf[0] = 0x7f;
             }
-            else if(dispData < 10000)
+            else
             {
                 this.bit(dispData % 10, 3);
-                if(compare_01 > 90){
-                    this.bit(9, 2);
-                } else{
-                    this.bit(Math.floor(dispData / 10) % 10, 2);
-                }
-                if(compare_001 > 900){
-                    this.bit(9, 1);
-                } else{
-                    this.bit(Math.floor(dispData / 100) % 10, 1);
-                }
-                if(dispData > 9000){
-                    this.bit(9, 0);
-                } else{
-                    this.bit(Math.floor(dispData / 1000) % 10, 0);
-                }
-            }
-            else 
-            {
-                this.bit(9, 3);
-                this.bit(9, 2);
-                this.bit(9, 1);
-                this.bit(9, 0);
+                this.bit((dispData / 10) % 10, 2);
+                this.bit((dispData / 100) % 10, 1);
+                this.bit((dispData / 1000) % 10, 0);
+                
+                this.buf[3] = dispData % 10;
+                this.buf[2] = (dispData / 10) % 10;
+                this.buf[1] = (dispData / 100) % 10;
+                this.buf[0] = (dispData / 1000) % 10;
             }
         }
         
         /**
          * Set the brightness level of display at from 0 to 7
-         * @param level value of brightness light level
+         * @param level value of brightness level
          */
         //% blockId=grove_tm1637_set_display_level block="%strip|brightness level to|%level"
         //% level.min=0 level.max=7
@@ -410,7 +395,7 @@ namespace grove {
          * @param xPin
          * @param yPin
          */
-        //% blockId=grove_joystick_read block="%strip|read position of joystick at|%xpin|and|%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;
@@ -505,26 +490,6 @@ namespace grove {
         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;
-    }
- 
     /**
      * init Grove Gesture modules
      * 
@@ -548,54 +513,8 @@ namespace grove {
      * get Joystick key
      * 
      */
-    //% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%ypin"
-    export function getJoystick(xpin: AnalogPin, ypin: AnalogPin): number {
+    //% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%xpin"
+    export function getJoystick(xpin: AnalogPin, ypin: AnalogPin) : number {
         return joystick.read(xpin, ypin);
     }
-
-
-    /**
-     * 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: () => void) {
-        control.onEvent(gestureEventId, gesture, handler);
-        paj7620.init();
-        control.inBackground(() => {
-            while(true) {
-                const gesture = paj7620.read();
-                if (gesture != lastGesture) {
-                    lastGesture = gesture;
-                    control.raiseEvent(gestureEventId, lastGesture);
-                }
-                basic.pause(50);
-            }
-        })
-    }
-
-
-    /**
-     * Do something when a key is detected by Grove - Thumb Joystick
-     * @param key type of joystick to detect
-     * @param xpin
-     * @param ypin
-     * @param handler code to run
-     */
-    //% blockId=grove_joystick_create_event block="on Key|%key at |%xpin|and|%ypin"
-    export function onJoystick(key: GroveJoystickKey, xpin: AnalogPin, ypin: AnalogPin, handler: () => void) {
-        control.onEvent(joystickEventID, key, handler);
-        control.inBackground(() => {
-            while(true) {
-                const key = joystick.read(xpin, ypin);
-                if (key != lastJoystick) {
-                    lastJoystick = key; 
-                    control.raiseEvent(joystickEventID, lastJoystick);
-                }
-                basic.pause(50);
-            }
-        })
-        
-    }
-}
+}

pxt.json

@@ -1,6 +1,6 @@
 {
     "name": "Grove",
-    "version": "0.1.7",
+    "version": "0.1.2",
     "description": "A Microsoft MakeCode package for Seeed Studio Grove module",
     "license": "MIT",
     "dependencies": {
@@ -9,8 +9,7 @@
     "files": [
         "README.md",
         "main.ts",
-        "_locales/ja/Grove-strings.json",
-        "_locales/de/Grove-strings.json"
+        "_locales/ja/Grove-strings.json"
     ],
     "testFiles": [
         "test.ts"