gitea_admin
/
yahboom_mbit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix left right to 0

This commit is contained in:
lzty634158 2019-10-10 12:16:31 +08:00
parent ddb532134f
commit 27e31bda76
3 changed files with 23 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
# mbit # mbit
Extension for Yahboom zh_tr mbit Extension for Yahboom_mbit_en V3.0.2
## License ## License

55
main.ts
View File

@ -610,15 +610,9 @@ namespace mbit_Robot {
if (speed1 >= 4096) { if (speed1 >= 4096) {
speed1 = 4095 speed1 = 4095
} }
if (speed1 <= 350) {
speed1 = 350
}
if (speed2 >= 4096) { if (speed2 >= 4096) {
speed2 = 4095 speed2 = 4095
} }
if (speed2 <= 350) {
speed2 = 350
}
setPwm(12, 0, speed1); setPwm(12, 0, speed1);
setPwm(13, 0, 0); setPwm(13, 0, 0);
@ -639,16 +633,9 @@ namespace mbit_Robot {
if (speed1 >= 4096) { if (speed1 >= 4096) {
speed1 = 4095 speed1 = 4095
} }
if (speed1 <= 350) {
speed1 = 350
}
if (speed2 >= 4096) { if (speed2 >= 4096) {
speed2 = 4095 speed2 = 4095
} }
if (speed2 <= 350) {
speed2 = 350
}
setPwm(12, 0, 0); setPwm(12, 0, 0);
setPwm(13, 0, speed1); setPwm(13, 0, speed1);
@ -669,15 +656,9 @@ namespace mbit_Robot {
if (speed1 >= 4096) { if (speed1 >= 4096) {
speed1 = 4095 speed1 = 4095
} }
if (speed1 <= 350) {
speed1 = 350
}
if (speed2 >= 4096) { if (speed2 >= 4096) {
speed2 = 4095 speed2 = 4095
} }
if (speed2 <= 350) {
speed2 = 350
}
setPwm(12, 0, speed1); setPwm(12, 0, speed1);
setPwm(13, 0, 0); setPwm(13, 0, 0);
@ -699,15 +680,9 @@ namespace mbit_Robot {
if (speed1 >= 4096) { if (speed1 >= 4096) {
speed1 = 4095 speed1 = 4095
} }
if (speed1 <= 350) {
speed1 = 350
}
if (speed2 >= 4096) { if (speed2 >= 4096) {
speed2 = 4095 speed2 = 4095
} }
if (speed2 <= 350) {
speed2 = 350
}
setPwm(12, 0, speed1); setPwm(12, 0, speed1);
setPwm(13, 0, 0); setPwm(13, 0, 0);
@ -741,15 +716,9 @@ namespace mbit_Robot {
if (speed1 >= 4096) { if (speed1 >= 4096) {
speed1 = 4095 speed1 = 4095
} }
if (speed1 <= 350) {
speed1 = 350
}
if (speed2 >= 4096) { if (speed2 >= 4096) {
speed2 = 4095 speed2 = 4095
} }
if (speed2 <= 350) {
speed2 = 350
}
setPwm(12, 0, 0); setPwm(12, 0, 0);
setPwm(13, 0, speed1); setPwm(13, 0, speed1);
@ -771,16 +740,9 @@ namespace mbit_Robot {
if (speed1 >= 4096) { if (speed1 >= 4096) {
speed1 = 4095 speed1 = 4095
} }
if (speed1 <= 350) {
speed1 = 350
}
if (speed2 >= 4096) { if (speed2 >= 4096) {
speed2 = 4095 speed2 = 4095
} }
if (speed2 <= 350) {
speed2 = 350
}
setPwm(12, 0, speed1); setPwm(12, 0, speed1);
setPwm(13, 0, 0); setPwm(13, 0, 0);
@ -903,6 +865,8 @@ namespace mbit_Robot {
export function Ultrasonic_Car(): number { export function Ultrasonic_Car(): number {
// send pulse // send pulse
let list:Array<number> = [0, 0, 0, 0, 0];
for (let i = 0; i < 5; i++) {
pins.setPull(DigitalPin.P14, PinPullMode.PullNone); pins.setPull(DigitalPin.P14, PinPullMode.PullNone);
pins.digitalWritePin(DigitalPin.P14, 0); pins.digitalWritePin(DigitalPin.P14, 0);
control.waitMicros(2); control.waitMicros(2);
@ -910,9 +874,12 @@ namespace mbit_Robot {
control.waitMicros(15); control.waitMicros(15);
pins.digitalWritePin(DigitalPin.P14, 0); pins.digitalWritePin(DigitalPin.P14, 0);
// read pulse
let d = pins.pulseIn(DigitalPin.P15, PulseValue.High, 43200); let d = pins.pulseIn(DigitalPin.P15, PulseValue.High, 43200);
return Math.floor(d / 58); list[i] = Math.floor(d / 40)
}
list.sort();
let length = (list[1] + list[2] + list[3])/3;
return Math.floor(length);
} }
//% blockId=mbit_Music_Car block="Music_Car|%index" //% blockId=mbit_Music_Car block="Music_Car|%index"
@ -1070,8 +1037,8 @@ namespace mbit_Robot {
switch (index) { switch (index) {
case CarState.Car_Run: Car_run(speed, speed); break; case CarState.Car_Run: Car_run(speed, speed); break;
case CarState.Car_Back: Car_back(speed, speed); break; case CarState.Car_Back: Car_back(speed, speed); break;
case CarState.Car_Left: Car_left(speed, speed); break; case CarState.Car_Left: Car_left(0, speed); break;
case CarState.Car_Right: Car_right(speed, speed); break; case CarState.Car_Right: Car_right(speed, 0); break;
case CarState.Car_Stop: Car_stop(); break; case CarState.Car_Stop: Car_stop(); break;
case CarState.Car_SpinLeft: Car_spinleft(speed, speed); break; case CarState.Car_SpinLeft: Car_spinleft(speed, speed); break;
case CarState.Car_SpinRight: Car_spinright(speed, speed); break; case CarState.Car_SpinRight: Car_spinright(speed, speed); break;
@ -1087,8 +1054,8 @@ namespace mbit_Robot {
switch (index) { switch (index) {
case CarState.Car_Run: Car_run(speed1, speed2); break; case CarState.Car_Run: Car_run(speed1, speed2); break;
case CarState.Car_Back: Car_back(speed1, speed2); break; case CarState.Car_Back: Car_back(speed1, speed2); break;
case CarState.Car_Left: Car_left(speed1, speed2); break; case CarState.Car_Left: Car_left(0, speed2); break;
case CarState.Car_Right: Car_right(speed1, speed2); break; case CarState.Car_Right: Car_right(speed1, 0); break;
case CarState.Car_Stop: Car_stop(); break; case CarState.Car_Stop: Car_stop(); break;
case CarState.Car_SpinLeft: Car_spinleft(speed1, speed2); break; case CarState.Car_SpinLeft: Car_spinleft(speed1, speed2); break;
case CarState.Car_SpinRight: Car_spinright(speed1, speed2); break; case CarState.Car_SpinRight: Car_spinright(speed1, speed2); break;

4
pxt.json
View File

@ -1,7 +1,7 @@
{ {
"name": "mbit", "name": "mbit",
"version": "3.0.1", "version": "3.0.2",
"description": "Extension for YahBoom m:bit V3.0.1", "description": "Extension for YahBoom m:bit V3.0.2",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"core": "*", "core": "*",