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
@@ -120,35 +47,10 @@ Use ``||point||`` to open or close point dispay.
 
 Use ``||clear||`` to clean display.
 
-### Grove - UART WiFi V2
-
-Connect to a WiFi and send data to ThinkSpeak or IFTTT, specify the UART tx and rx pin.
-
-```blocks
-grove.setupWifi(
-    SerialPin.P15,
-    SerialPin.P1,
-    BaudRate.BaudRate115200,
-    "test-ssid",
-    "test-passwd"
-)
-
-basic.forever(() => {
-    if (grove.wifiOK()) {
-        basic.showIcon(IconNames.Yes)
-    } else {
-        basic.showIcon(IconNames.No)
-    }
-    grove.sendToThinkSpeak("write_api_key", 1, 2, 3, 4, 5, 6, 7, 8)
-    grove.sendToIFTTT("ifttt_event", "ifttt_key", "hello", 'micro', 'bit')
-    basic.pause(60000)
-})
-```
-
 ## License
 
 MIT
 
 ## Supported targets
 
-* for PXT/calliopemini
+* for PXT/microbit

_locales/de/Grove-strings.json

@@ -1,42 +0,0 @@
-{
-    "{id:category}Grove": "Grove",
-    "{id:group}4-Digit": "4 Ziffern Display",
-    "{id:group}Ultrasonic": "Ultraschall",
-    "{id:group}Gesture": "Gestenerkennung",
-    "{id:group}Thumbjoystick": "Grove Joystick",
-    "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": "lies Geste",
-    "grove.onGesture|block": "wenn Grovegeste |%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": "%GestureModul|initialisiere den Gestensensor",
-    "grove.PAJ7620.read|block": "%GestureModul|erkenne Geste",
-    "grove.TM1637.show|block": "%4Digit|zeige Zahl|%dispData|",
-    "grove.TM1637.set|block": "%4Digit|setze Helligkeit auf|%level|",
-    "grove.TM1637.bit|block": "%4Digit|zeige Ziffer|%dispData|an Stelle|%bitAddr|",
-    "grove.TM1637.point|block": "%4Digit|schalte Kommapunkt|%point|",
-    "grove.TM1637.clear|block": "%4Digit|lösche 4-Ziffern Display",
-    "GroveJoystickKey.None|block": "Keine",
-    "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.onJoystick|block": "wenn Grove - Joystickrichtung|%key an|%xpin|und|%ypin",
-    "grove.getJoystick|block": "lies Joystickrichtung an|%xpin|und|%ypin"
-}

main.ts

@@ -61,25 +61,25 @@ enum GroveGesture {
 }
 
 enum GroveJoystickKey {
-    //% block="None"
+    //% block=None
     None = 0,
-    //% block="Right"
+    //% block=Right
     Right = 1,
-    //% block="Left"
+    //% block=Left
     Left = 2,
-    //% block="Up"
+    //% block=Up
     Up = 3,
-    //% block="Down"
+    //% block=Down
     Down = 4,
-    //% block="Upper left"
+    //% block=Upper left
     UL = 5,
-    //% block="Upper right"
+    //% block=Upper right
     UR = 6,
-    //% block="Lower left"
+    //% block=Lower left
     LL = 7,
-    //% block="Lower right"
+    //% block=Lower right
     LR = 8,
-    //% block="press"
+    //% block=press
     Press = 9
 }
 
@@ -87,8 +87,7 @@ enum GroveJoystickKey {
 /**
  * Functions to operate Grove module.
  */
-//% weight=10 color=#9F79EE icon="\uf1b3" block="Grove"
-//% groups='["4-Digit","Ultrasonic","Gesture","Thumbjoystick","UartWiFi"]'
+//% weight=10 color=#9F79EE icon="\uf108" block="Grove"
 namespace grove {
     /**
      * 
@@ -138,6 +137,8 @@ namespace grove {
         /**
          * Create a new driver of Grove - Gesture
          */
+        //% blockId=grove_gesture_init block="%strip|initiate the Grove - Gesture"
+        //% advanced=true
         init() {
             this.paj7620Init();
             basic.pause(200);
@@ -146,7 +147,8 @@ namespace grove {
         /**
          * Detect and recognize the gestures from Grove - Gesture
          */
-
+        //% blockId=grove_gesture_read block="%strip|get gesture"
+        //% advanced=true
         read(): number {
             let data = 0, result = 0;
 
@@ -255,83 +257,65 @@ namespace grove {
          * Show a 4 digits number on display
          * @param dispData value of number
          */
-
-        //% blockId=grove_tm1637_display_number block="%4Digit|show number|%dispData"
-        //% group="4-Digit"
+        //% 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="%4Digit|brightness level to|%level"
+        //% blockId=grove_tm1637_set_display_level block="%strip|brightness level to|%level"
         //% level.min=0 level.max=7
-        //% group="4-Digit"
         set(level: number)
         {
             this.brightnessLevel = level;
@@ -347,10 +331,10 @@ namespace grove {
          * @param dispData value of number
          * @param bitAddr value of bit number
          */
-        //% blockId=grove_tm1637_display_bit block="%4Digit|show single number|%dispData|at digit|%bitAddr"
+        //% blockId=grove_tm1637_display_bit block="%strip|show single number|%dispData|at digit|%bitAddr"
         //% dispData.min=0 dispData.max=9
         //% bitAddr.min=0 bitAddr.max=3
-        //% group="4-Digit"
+        //% advanced=true
         bit(dispData: number, bitAddr: number)
         {
             if((dispData == 0x7f) || ((dispData <= 9) && (bitAddr <= 3)))
@@ -377,8 +361,8 @@ namespace grove {
          * Turn on or off the colon point on Grove - 4-Digit Display
          * @param pointEn value of point switch
          */
-        //% blockId=grove_tm1637_display_point block="%4Digit|turn|%point|colon point"
-        //% group="4-Digit"
+        //% blockId=grove_tm1637_display_point block="%strip|turn|%point|colon point"
+        //% advanced=true
         point(point: boolean)
         {
             this.pointFlag = point;
@@ -392,8 +376,8 @@ namespace grove {
         /**
          * Clear the display
          */
-        //% blockId=grove_tm1637_display_clear block="%4Digit|clear"
-        //% group="4-Digit"
+        //% blockId=grove_tm1637_display_clear block="%strip|clear"
+        //% advanced=true
         clear()
         {
             this.bit(0x7f, 0x00);
@@ -411,9 +395,9 @@ namespace grove {
          * @param xPin
          * @param yPin
          */
-     
-        joyread(xPin: AnalogPin, yPin: AnalogPin): number {
-
+        //% 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);
@@ -451,78 +435,12 @@ namespace grove {
     let distanceBackup: number = 0;
     let joystick = new GroveJoystick();
     let paj7620 = new PAJ7620();
-    // adapted to Calliope mini V2 Core by M.Klein 17.09.2020
-    
-    /**
-     * 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_v2 block="(V2)Ultrasonic Sensor (in cm) at|%pin"
-    //% pin.fieldEditor="gridpicker" pin.fieldOptions.columns=4
-    //% pin.fieldOptions.tooltips="false" pin.fieldOptions.width="250"
-    //% group="Ultrasonic" pin.defl=DigitalPin.C16
-
-    export function measureInCentimetersV2(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 / 44 / 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_v2 block="(V2)Ultrasonic Sensor (in inch) at|%pin"
-    //% pin.fieldEditor="gridpicker" pin.fieldOptions.columns=4
-    //% pin.fieldOptions.tooltips="false" pin.fieldOptions.width="250"
-    //% group="Ultrasonic" pin.defl=DigitalPin.C16
-    export function measureInInchesV2(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 / 113 / 2 / 100;
-        
-        if(RangeInInches > 0) distanceBackup = RangeInInches;
-        else RangeInInches = distanceBackup;
-        
-        basic.pause(50);
-        
-        return RangeInInches;
-    }
     
     /**
      * 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"
-    //% pin.fieldEditor="gridpicker" pin.fieldOptions.columns=4
-    //% pin.fieldOptions.tooltips="false" pin.fieldOptions.width="250"
-    //% group="Ultrasonic" pin.defl=DigitalPin.C16
-
     export function measureInCentimeters(pin: DigitalPin): number
     {
         let duration = 0;
@@ -550,9 +468,6 @@ namespace grove {
      * @param pin signal pin of ultrasonic ranger module
      */
     //% blockId=grove_ultrasonic_inches block="Ultrasonic Sensor (in inch) at|%pin"
-    //% pin.fieldEditor="gridpicker" pin.fieldOptions.columns=4
-    //% pin.fieldOptions.tooltips="false" pin.fieldOptions.width="250"
-    //% group="Ultrasonic" pin.defl=DigitalPin.C16
     export function measureInInches(pin: DigitalPin): number
     {
         let duration = 0;
@@ -575,39 +490,11 @@ 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"
-    //% clkPin.fieldEditor="gridpicker" clkPin.fieldOptions.columns=4
-    //% group="4-Digit"
-    //% clkPin.fieldOptions.tooltips="false" clkPin.fieldOptions.width="250"
-    //% dataPin.fieldEditor="gridpicker" dataPin.fieldOptions.columns=4
-    //% clkPin.defl=DigitalPin.C16 dataPin.defl=DigitalPin.C17
-    //% dataPin.fieldOptions.tooltips="false" dataPin.fieldOptions.width="250"
-    //% blockSetVariable=4digit
-    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
      * 
      */
     //% blockId=grove_initgesture block="init gesture"
-    //% group="Gesture"
     export function initGesture() {
         if (!paj7620) {
             paj7620.init();
@@ -615,11 +502,10 @@ namespace grove {
     }
 
     /**
-     * get Grove Gesture model
+     * get Grove Gesture modle
      * 
      */
     //% blockId=grove_getgesture block="get gesture model"
-    //% group="Gesture"
     export function getGestureModel(): number {
         return paj7620.read();
     }
@@ -627,242 +513,8 @@ namespace grove {
      * get Joystick key
      * 
      */
-    //% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%ypin"
-    //% group="Thumbjoystick" xpin.defl=AnalogPin.C16 ypin.defl=AnalogPin.C17
-    export function getJoystick(xpin: AnalogPin, ypin: AnalogPin): number {
-        return joystick.joyread(xpin, ypin);
+    //% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%xpin"
+    export function getJoystick(xpin: AnalogPin, ypin: AnalogPin) : number {
+        return joystick.read(xpin, ypin);
     }
-
-   /**
-     * Converts the gesture name to a number
-     * Useful for comparisons
-     */
-    //% blockId=ggesture block="%key"
-    //% group="Gesture"
-    export function ggesture(g: GroveGesture): number {
-        return g;
-    }
-    
-    /**
-     * 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"
-    //% group="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);
-            }
-        })
-    }
-
-    /**
-     * Converts the key name to a number
-     * Useful for comparisons
-     */
-    //% blockId=joystickkey block="%key"
-    //% group="Thumbjoystick"
-    export function joystickkey(key: GroveJoystickKey): number {
-        return key;
-    }
-
-    /**
-     * 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"
-    //% group="Thumbjoystick" xpin.defl=AnalogPin.C16 ypin.defl=AnalogPin.C17
-
-    export function onJoystick(key: GroveJoystickKey, xpin: AnalogPin, ypin: AnalogPin, handler: () => void) {
-        control.onEvent(joystickEventID, key, handler);
-        control.inBackground(() => {
-            while(true) {
-                const key = joystick.joyread(xpin, ypin);
-                if (key != lastJoystick) {
-                    lastJoystick = key; 
-                    control.raiseEvent(joystickEventID, lastJoystick);
-                }
-                basic.pause(50);
-            }
-        })
-        
-    }
-
-    let isWifiConnected = false;
-    /**
-     * Setup Grove - Uart WiFi V2 to connect to  Wi-Fi
-     */
-    //% block="Setup Wifi|TX %txPin|RX %rxPin|Baud rate %baudrate|SSID = %ssid|Password = %passwd"
-    //% group="UartWiFi"
-    //% txPin.defl=SerialPin.P15
-    //% rxPin.defl=SerialPin.P1
-    //% baudRate.defl=BaudRate.BaudRate115200
-    export function setupWifi(txPin: SerialPin, rxPin: SerialPin, baudRate: BaudRate, ssid: string, passwd: string) {
-        let result = 0
-
-        isWifiConnected = false
-
-        serial.redirect(
-            txPin,
-            rxPin,
-            baudRate
-        )
-
-        sendAtCmd("AT")
-        result = waitAtResponse("OK", "ERROR", "None", 1000)
-
-        sendAtCmd("AT+CWMODE=1")
-        result = waitAtResponse("OK", "ERROR", "None", 1000)
-
-        sendAtCmd(`AT+CWJAP="${ssid}","${passwd}"`)
-        result = waitAtResponse("WIFI GOT IP", "ERROR", "None", 20000)
-
-        if (result == 1) {
-            isWifiConnected = true
-        }
-    }
-
-    /**
-     * Check if Grove - Uart WiFi V2 is connected to Wifi
-     */
-    //% block="Wifi OK?"
-    //% group="UartWiFi"
-    export function wifiOK() {
-        return isWifiConnected
-    }
-
-    /**
-     * Send data to ThinkSpeak
-     */
-    //% block="Send Data to your ThinkSpeak Channel|Write API Key %apiKey|Field1 %field1|Field2 %field2|Field3 %field3|Field4 %field4|Field5 %field5|Field6 %field6|Field7 %field7|Field8 %field8"
-    //% group="UartWiFi"
-    //% apiKey.defl="your Write API Key"
-    export function sendToThinkSpeak(apiKey: string, field1: number, field2: number, field3: number, field4: number, field5: number, field6: number, field7: number, field8: number) {
-        let result = 0
-        let retry = 2
-
-        // close the previous TCP connection
-        if (isWifiConnected) {
-            sendAtCmd("AT+CIPCLOSE")
-            waitAtResponse("OK", "ERROR", "None", 2000)
-        }
-
-        while (isWifiConnected && retry > 0) {
-            retry = retry - 1;
-            // establish TCP connection
-            sendAtCmd("AT+CIPSTART=\"TCP\",\"api.thingspeak.com\",80")
-            result = waitAtResponse("OK", "ALREADY CONNECTED", "ERROR", 2000)
-            if (result == 3) continue
-
-            let data = "GET /update?api_key=" + apiKey
-            if (!isNaN(field1)) data = data + "&field1=" + field1
-            if (!isNaN(field2)) data = data + "&field2=" + field2
-            if (!isNaN(field3)) data = data + "&field3=" + field3
-            if (!isNaN(field4)) data = data + "&field4=" + field4
-            if (!isNaN(field5)) data = data + "&field5=" + field5
-            if (!isNaN(field6)) data = data + "&field6=" + field6
-            if (!isNaN(field7)) data = data + "&field7=" + field7
-            if (!isNaN(field8)) data = data + "&field8=" + field8
-
-            sendAtCmd("AT+CIPSEND=" + (data.length + 2))
-            result = waitAtResponse(">", "OK", "ERROR", 2000)
-            if (result == 3) continue
-            sendAtCmd(data)
-            result = waitAtResponse("SEND OK", "SEND FAIL", "ERROR", 5000)
-
-            // // close the TCP connection
-            // sendAtCmd("AT+CIPCLOSE")
-            // waitAtResponse("OK", "ERROR", "None", 2000)
-
-            if (result == 1) break
-        }
-    }
-
-    /**
-     * Send data to IFTTT
-     */
-    //% block="Send Data to your IFTTT Event|Event %event|Key %key|value1 %value1|value2 %value2|value3 %value3"
-    //% group="UartWiFi"
-    //% event.defl="your Event"
-    //% key.defl="your Key"
-    //% value1.defl="hello"
-    //% value2.defl="micro"
-    //% value3.defl="bit"
-    export function sendToIFTTT(event: string, key: string, value1: string, value2: string, value3: string) {
-        let result = 0
-        let retry = 2
-
-        // close the previous TCP connection
-        if (isWifiConnected) {
-            sendAtCmd("AT+CIPCLOSE")
-            waitAtResponse("OK", "ERROR", "None", 2000)
-        }
-
-        while (isWifiConnected && retry > 0) {
-            retry = retry - 1;
-            // establish TCP connection
-            sendAtCmd("AT+CIPSTART=\"TCP\",\"maker.ifttt.com\",80")
-            result = waitAtResponse("OK", "ALREADY CONNECTED", "ERROR", 2000)
-            if (result == 3) continue
-
-            let data = "GET /trigger/" + event + "/with/key/" + key
-            data = data + "?value1=" + value1
-            data = data + "&value2=" + value2
-            data = data + "&value3=" + value3
-            data = data + " HTTP/1.1"
-            data = data + "\u000D\u000A"
-            data = data + "User-Agent: curl/7.58.0"
-            data = data + "\u000D\u000A"
-            data = data + "Host: maker.ifttt.com"
-            data = data + "\u000D\u000A"
-            data = data + "Accept: */*"
-            data = data + "\u000D\u000A"
-
-            sendAtCmd("AT+CIPSEND=" + (data.length + 2))
-            result = waitAtResponse(">", "OK", "ERROR", 2000)
-            if (result == 3) continue
-            sendAtCmd(data)
-            result = waitAtResponse("SEND OK", "SEND FAIL", "ERROR", 5000)
-
-            // // close the TCP connection
-            // sendAtCmd("AT+CIPCLOSE")
-            // waitAtResponse("OK", "ERROR", "None", 2000)
-
-            if (result == 1) break
-        }
-    }
-
-
-    function waitAtResponse(target1: string, target2: string, target3: string, timeout: number) {
-        let buffer = ""
-        let start = input.runningTime()
-
-        while ((input.runningTime() - start) < timeout) {
-            buffer += serial.readString()
-
-            if (buffer.includes(target1)) return 1
-            if (buffer.includes(target2)) return 2
-            if (buffer.includes(target3)) return 3
-
-            basic.pause(100)
-        }
-
-        return 0
-    }
-
-    function sendAtCmd(cmd: string) {
-        serial.writeString(cmd + "\u000D\u000A")
-    }
-}
+}

pxt.json

@@ -1,6 +1,6 @@
 {
     "name": "Grove",
-    "version": "0.4.0",
+    "version": "0.1.2",
     "description": "A Microsoft MakeCode package for Seeed Studio Grove module",
     "license": "MIT",
     "dependencies": {
@@ -9,15 +9,10 @@
     "files": [
         "README.md",
         "main.ts",
-        "_locales/ja/Grove-strings.json",
-        "_locales/de/Grove-strings.json"
+        "_locales/ja/Grove-strings.json"
     ],
     "testFiles": [
         "test.ts"
     ],
-    "public": true,
-    "supportedTargets": [
-        "calliopemini"
-    ],
-    "preferredEditor": "tsprj"
+    "public": true
 }

test.ts

@@ -1,12 +1,104 @@
-let _4Digit = grove.createDisplay(DigitalPin.C16, DigitalPin.C17)
-grove.setupWifi(
-    SerialPin.P15,
-    SerialPin.P1,
-    BaudRate.BaudRate115200,
-    "test-ssid",
-    "test-passwd"
-)
+// 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")
+// })
 
-basic.forever(function () {
-    _4Digit.bit(6, 1)
-})
+// 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;
+
+    // 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(true);
+    // display.clear();
+    // display.bit(1, 1);
+    // basic.pause(500);
+    
+    // display.point(false);
+    // display.clear();
+    // display.bit(0, 0);
+    // basic.pause(500);
+    
+    // display.set(7);
+    // let p : grove.PAJ7620;
+    // p.init();
+    
+    while(true)
+    {
+    //     display.show(data ++);
+    //     let distance = grove.measureInCentimeters(DigitalPin.P0);
+        basic.showNumber(12);
+        basic.pause(2000);
+    }
+}