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

Aktualisierungen.

Browse Source
This commit is contained in:
Michael Klein 2019-11-13 15:19:37 +01:00
parent 727ec603ad
commit 6c0783c5b5
2 changed files with 81 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_locales/de/Grove-strings.json
View File

@ -33,7 +33,7 @@
"GroveJoystickKey.LL|block": "Unten links", "GroveJoystickKey.LL|block": "Unten links",
"GroveJoystickKey.LR|block": "Unten rechts", "GroveJoystickKey.LR|block": "Unten rechts",
"GroveJoystickKey.Press|block": "Gedrückt", "GroveJoystickKey.Press|block": "Gedrückt",
"grove.read|block": "%strip|lies Position von Joystick|%xpin|und|%ypin", "grove.grove_joystick_read|block": "%strip|lies Position von Joystick an|%xpin|und|%ypin",
"grove.onJoystick|block": "wenn Grove - Joysticktaste|%key", "grove.onJoystick|block": "wenn Grove - Joysticktaste|%key",
"grove.getJoystick|block": "hole Joysticktaste an|%xpin|und|%ypin" "grove.getJoystick|block": "hole Joysticktaste an|%xpin|und|%ypin"
} }

60
main.ts
View File

@ -200,18 +200,15 @@ namespace grove {
/** /**
* *
*/ */
export class TM1637 export class TM1637 {
{
clkPin: DigitalPin; clkPin: DigitalPin;
dataPin: DigitalPin; dataPin: DigitalPin;
brightnessLevel: number; brightnessLevel: number;
pointFlag: boolean; pointFlag: boolean;
buf: Buffer; buf: Buffer;
private writeByte(wrData: number) private writeByte(wrData: number) {
{ for (let i = 0; i < 8; i++) {
for(let i = 0; i < 8; i ++)
{
pins.digitalWritePin(this.clkPin, 0); pins.digitalWritePin(this.clkPin, 0);
if (wrData & 0x01) pins.digitalWritePin(this.dataPin, 1); if (wrData & 0x01) pins.digitalWritePin(this.dataPin, 1);
else pins.digitalWritePin(this.dataPin, 0); else pins.digitalWritePin(this.dataPin, 0);
@ -224,24 +221,21 @@ namespace grove {
pins.digitalWritePin(this.clkPin, 1); pins.digitalWritePin(this.clkPin, 1);
} }
private start() private start() {
{
pins.digitalWritePin(this.clkPin, 1); pins.digitalWritePin(this.clkPin, 1);
pins.digitalWritePin(this.dataPin, 1); pins.digitalWritePin(this.dataPin, 1);
pins.digitalWritePin(this.dataPin, 0); pins.digitalWritePin(this.dataPin, 0);
pins.digitalWritePin(this.clkPin, 0); pins.digitalWritePin(this.clkPin, 0);
} }
private stop() private stop() {
{
pins.digitalWritePin(this.clkPin, 0); pins.digitalWritePin(this.clkPin, 0);
pins.digitalWritePin(this.dataPin, 0); pins.digitalWritePin(this.dataPin, 0);
pins.digitalWritePin(this.clkPin, 1); pins.digitalWritePin(this.clkPin, 1);
pins.digitalWritePin(this.dataPin, 1); pins.digitalWritePin(this.dataPin, 1);
} }
private coding(dispData: number): number private coding(dispData: number): number {
{
let pointData = 0; let pointData = 0;
if (this.pointFlag == true) pointData = 0x80; if (this.pointFlag == true) pointData = 0x80;
@ -258,10 +252,8 @@ namespace grove {
* @param dispData value of number * @param dispData value of number
*/ */
//% blockId=grove_tm1637_display_number block="%strip|show number|%dispData" //% blockId=grove_tm1637_display_number block="%strip|show number|%dispData"
show(dispData: number) show(dispData: number) {
{ if (dispData < 10) {
if(dispData < 10)
{
this.bit(dispData, 3); this.bit(dispData, 3);
this.bit(0x7f, 2); this.bit(0x7f, 2);
this.bit(0x7f, 1); this.bit(0x7f, 1);
@ -272,8 +264,7 @@ namespace grove {
this.buf[1] = 0x7f; this.buf[1] = 0x7f;
this.buf[0] = 0x7f; this.buf[0] = 0x7f;
} }
else if(dispData < 100) else if (dispData < 100) {
{
this.bit(dispData % 10, 3); this.bit(dispData % 10, 3);
this.bit((dispData / 10) % 10, 2); this.bit((dispData / 10) % 10, 2);
this.bit(0x7f, 1); this.bit(0x7f, 1);
@ -284,8 +275,7 @@ namespace grove {
this.buf[1] = 0x7f; this.buf[1] = 0x7f;
this.buf[0] = 0x7f; this.buf[0] = 0x7f;
} }
else if(dispData < 1000) else if (dispData < 1000) {
{
this.bit(dispData % 10, 3); this.bit(dispData % 10, 3);
this.bit((dispData / 10) % 10, 2); this.bit((dispData / 10) % 10, 2);
this.bit((dispData / 100) % 10, 1); this.bit((dispData / 100) % 10, 1);
@ -296,8 +286,7 @@ namespace grove {
this.buf[1] = (dispData / 100) % 10; this.buf[1] = (dispData / 100) % 10;
this.buf[0] = 0x7f; this.buf[0] = 0x7f;
} }
else else {
{
this.bit(dispData % 10, 3); this.bit(dispData % 10, 3);
this.bit((dispData / 10) % 10, 2); this.bit((dispData / 10) % 10, 2);
this.bit((dispData / 100) % 10, 1); this.bit((dispData / 100) % 10, 1);
@ -316,8 +305,7 @@ namespace grove {
*/ */
//% blockId=grove_tm1637_set_display_level block="%strip|brightness level to|%level" //% blockId=grove_tm1637_set_display_level block="%strip|brightness level to|%level"
//% level.min=0 level.max=7 //% level.min=0 level.max=7
set(level: number) set(level: number) {
{
this.brightnessLevel = level; this.brightnessLevel = level;
this.bit(this.buf[0], 0x00); this.bit(this.buf[0], 0x00);
@ -335,10 +323,8 @@ namespace grove {
//% dispData.min=0 dispData.max=9 //% dispData.min=0 dispData.max=9
//% bitAddr.min=0 bitAddr.max=3 //% bitAddr.min=0 bitAddr.max=3
//% advanced=true //% advanced=true
bit(dispData: number, bitAddr: number) bit(dispData: number, bitAddr: number) {
{ if ((dispData == 0x7f) || ((dispData <= 9) && (bitAddr <= 3))) {
if((dispData == 0x7f) || ((dispData <= 9) && (bitAddr <= 3)))
{
let segData = 0; let segData = 0;
segData = this.coding(dispData); segData = this.coding(dispData);
@ -363,8 +349,7 @@ namespace grove {
*/ */
//% blockId=grove_tm1637_display_point block="%strip|turn|%point|colon point" //% blockId=grove_tm1637_display_point block="%strip|turn|%point|colon point"
//% advanced=true //% advanced=true
point(point: boolean) point(point: boolean) {
{
this.pointFlag = point; this.pointFlag = point;
this.bit(this.buf[0], 0x00); this.bit(this.buf[0], 0x00);
@ -378,8 +363,7 @@ namespace grove {
*/ */
//% blockId=grove_tm1637_display_clear block="%strip|clear" //% blockId=grove_tm1637_display_clear block="%strip|clear"
//% advanced=true //% advanced=true
clear() clear() {
{
this.bit(0x7f, 0x00); this.bit(0x7f, 0x00);
this.bit(0x7f, 0x01); this.bit(0x7f, 0x01);
this.bit(0x7f, 0x02); this.bit(0x7f, 0x02);
@ -388,8 +372,7 @@ namespace grove {
} }
export class GroveJoystick export class GroveJoystick {
{
/** /**
* Detect position from Grove - Thumb Joystick * Detect position from Grove - Thumb Joystick
* @param xPin * @param xPin
@ -441,8 +424,7 @@ namespace grove {
* @param pin signal pin of ultrasonic ranger module * @param pin signal pin of ultrasonic ranger module
*/ */
//% blockId=grove_ultrasonic_centimeters block="Ultrasonic Sensor (in cm) at|%pin" //% blockId=grove_ultrasonic_centimeters block="Ultrasonic Sensor (in cm) at|%pin"
export function measureInCentimeters(pin: DigitalPin): number export function measureInCentimeters(pin: DigitalPin): number {
{
let duration = 0; let duration = 0;
let RangeInCentimeters = 0; let RangeInCentimeters = 0;
@ -468,8 +450,7 @@ namespace grove {
* @param pin signal pin of ultrasonic ranger module * @param pin signal pin of ultrasonic ranger module
*/ */
//% blockId=grove_ultrasonic_inches block="Ultrasonic Sensor (in inch) at|%pin" //% blockId=grove_ultrasonic_inches block="Ultrasonic Sensor (in inch) at|%pin"
export function measureInInches(pin: DigitalPin): number export function measureInInches(pin: DigitalPin): number {
{
let duration = 0; let duration = 0;
let RangeInInches = 0; let RangeInInches = 0;
@ -496,8 +477,7 @@ namespace grove {
* @param dataPin value of data pin number * @param dataPin value of data pin number
*/ */
//% blockId=grove_tm1637_create block="4-Digit Display at|%clkPin|and|%dataPin" //% blockId=grove_tm1637_create block="4-Digit Display at|%clkPin|and|%dataPin"
export function createDisplay(clkPin: DigitalPin, dataPin: DigitalPin): TM1637 export function createDisplay(clkPin: DigitalPin, dataPin: DigitalPin): TM1637 {
{
let display = new TM1637(); let display = new TM1637();
display.buf = pins.createBuffer(4); display.buf = pins.createBuffer(4);