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

motor slider fixes and fix motor output in vm

Browse Source
This commit is contained in:
Sam El-Husseini 2018-01-12 13:33:25 -08:00
parent dfe84471e8
commit 751ea1494b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/core/output.ts
View File

@ -303,7 +303,7 @@ namespace motors {
} }
private __setSpeed(speed: number) { private __setSpeed(speed: number) {
const b = mkCmd(this._port, this._regulated ? DAL.opOutputPower : DAL.opOutputSpeed, 1) const b = mkCmd(this._port, this._regulated ? DAL.opOutputSpeed : DAL.opOutputPower, 1)
b.setNumber(NumberFormat.Int8LE, 2, speed) b.setNumber(NumberFormat.Int8LE, 2, speed)
writePWM(b) writePWM(b)
if (speed) { if (speed) {

2
sim/state/motornode.ts
View File

@ -17,7 +17,7 @@ namespace pxsim {
private speedCmdTime: number; private speedCmdTime: number;
private _synchedMotor: MotorNode; // non-null if synchronized private _synchedMotor: MotorNode; // non-null if synchronized
private manualSpeed: number = 0; private manualSpeed: number = undefined;
constructor(port: number, large: boolean) { constructor(port: number, large: boolean) {
super(port); super(port);

1
sim/state/output.ts
View File

@ -97,6 +97,7 @@ namespace pxsim {
motors.forEach(motor => motor.stop()); motors.forEach(motor => motor.stop());
return 2; return 2;
} }
case DAL.opOutputPower:
case DAL.opOutputSpeed: { case DAL.opOutputSpeed: {
// setSpeed // setSpeed
const port = buf.data[1]; const port = buf.data[1];

4
sim/visuals/controls/motorSlider.ts
View File

@ -55,13 +55,13 @@ namespace pxsim.visuals {
if (captured && (ev as MouseEvent).clientY != undefined) { if (captured && (ev as MouseEvent).clientY != undefined) {
ev.preventDefault(); ev.preventDefault();
this.updateSliderValue(pt, parent, ev as MouseEvent); this.updateSliderValue(pt, parent, ev as MouseEvent);
this.handleSliderDown(); this.handleSliderMove();
} }
}, ev => { }, ev => {
captured = true; captured = true;
if ((ev as MouseEvent).clientY != undefined) { if ((ev as MouseEvent).clientY != undefined) {
this.updateSliderValue(pt, parent, ev as MouseEvent); this.updateSliderValue(pt, parent, ev as MouseEvent);
this.handleSliderMove(); this.handleSliderDown();
} }
}, () => { }, () => {
captured = false; captured = false;