22 Commits

Author SHA1 Message Date
MiroChao
81b6a600cb Update main.ts 2020-01-02 11:20:53 +08:00
MiroChao
f2f5a34bd5 Update main.ts 2020-01-02 11:20:53 +08:00
MiroChao
cfeeada678 Update main.ts 2020-01-02 10:24:24 +08:00
sidikalamini
1d51956960 Update main.ts
update error of x instead of y
2019-12-10 11:26:53 +08:00
Michael Klein
f006a8b115 added german locale 2019-12-10 11:26:30 +08:00
Michael Klein
a97427ee49 fixed missing arguments for blocks 2019-12-10 11:25:44 +08:00
Michael Klein
90d23f74fd add german locale 2019-12-10 11:25:27 +08:00
adambla76
dff3c9bf76 math.floor fix 2019-11-11 09:37:19 +08:00
adambla76
f1dba411b0 text 2019-11-11 09:37:19 +08:00
adambla76
f65efbaf40 mała zmiana 2019-11-11 09:37:19 +08:00
adambla76
48ab57de24 Update pxt.json
new ver
2019-11-11 09:37:19 +08:00
adambla76
37bcbb378e Update main.ts 2019-11-11 09:37:19 +08:00
adambla76
eba0e205f5 Create testy.ts 2019-11-11 09:37:19 +08:00
Baozhu Zuo
43674e0dc5 add onGesture and onGesture 2019-07-31 16:52:21 +08:00
Baozhu Zuo
2ee4f55c1c update readme and pxt version 2019-07-31 15:51:43 +08:00
Baozhu Zuo
719ec4a2cc update to lastest verion 2019-07-31 15:30:28 +08:00
Baozhu Zuo
902648c6a9 remove onGesture and onJoystick event 2019-07-31 15:23:52 +08:00
Baozhu Zuo
3ea33acce9 update pxt version 2019-07-30 16:16:05 +08:00
Baozhu Zuo
a0ad605412 test gesture 2019-07-30 16:10:22 +08:00
Baozhu Zuo
bc272c73bd try to fix type error 2019-07-30 15:03:03 +08:00
jerryyip
fe28f60f66 add Grove - Thumb Joystick 2018-09-14 14:11:57 +08:00
jinyuan.weng
1154cb2fef Modify gesture callback. 2018-08-20 17:45:49 +08:00
6 changed files with 482 additions and 180 deletions

7
.gitignore vendored
View File

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

View File

@@ -6,15 +6,88 @@ A Microsoft MakeCode package for for Seeed Studio Grove module.
### Grove - Gesture
Create gesture events.
get gesture model.
```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

View File

@@ -0,0 +1,39 @@
{
"{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"
}

394
main.ts
View File

@@ -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;
}
/**
*
*/
@@ -338,59 +260,74 @@ 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.buf[3] = dispData;
this.buf[2] = 0x7f;
this.buf[1] = 0x7f;
this.buf[0] = 0x7f;
}
else if(dispData < 100)
{
this.bit(dispData % 10, 3);
this.bit((dispData / 10) % 10, 2);
if(dispData > 90){
this.bit(9, 2);
} else{
this.bit(Math.floor(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);
this.bit((dispData / 10) % 10, 2);
this.bit((dispData / 100) % 10, 1);
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(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)
{
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(dispData % 10, 3);
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;
this.bit(9, 3);
this.bit(9, 2);
this.bit(9, 1);
this.bit(9, 0);
}
}
/**
* Set the brightness level of display at from 0 to 7
* @param level value of brightness level
* @param level value of brightness light level
*/
//% blockId=grove_tm1637_set_display_level block="%strip|brightness level to|%level"
//% level.min=0 level.max=7
@@ -464,4 +401,201 @@ 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 at|%xpin|and|%ypin"
//% 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;
}
/**
* 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
*
*/
//% 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|%ypin"
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);
}
})
}
}

View File

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

136
test.ts
View File

@@ -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);
}
}