c_meyer/pxt-grove
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Seeed-Studio/master'

Browse Source
This commit is contained in:
Juri 2020-09-11 16:02:15 +02:00
commit f933fc45ed
3 changed files with 90 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
_locales/de/Grove-strings.json Normal file
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"
}

77
main.ts
View File

@ -260,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
@ -395,7 +410,7 @@ namespace grove {
* @param xPin
* @param yPin
*/
//% blockId=grove_joystick_read block="%strip|read position of joystick"
//% 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;
@ -533,7 +548,7 @@ namespace grove {
* get Joystick key
*
*/
//% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%xpin"
//% blockId=grove_getjoystick block="get joystick key at|%xpin|and|%ypin"
export function getJoystick(xpin: AnalogPin, ypin: AnalogPin): number {
return joystick.read(xpin, ypin);
}
@ -568,7 +583,7 @@ namespace grove {
* @param ypin
* @param handler code to run
*/
//% blockId=grove_joystick_create_event block="on Key|%key"
//% 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(() => {

5
pxt.json
View File

@ -1,6 +1,6 @@
{
"name": "Grove",
"version": "0.1.5",
"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"