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

Handle the case where multiple motors or multiple sensors are connected to the same port. (#181)

Browse Source
This commit is contained in:
Sam El-Husseini 2018-01-04 21:57:01 -08:00 committed by Peli de Halleux
parent 1e460eef9e
commit de91dc6ab7
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sim/dalboard.ts
View File

@ -18,7 +18,7 @@ namespace pxsim {
brickNode: BrickNode; brickNode: BrickNode;
outputNodes: MotorNode[] = []; outputNodes: MotorNode[] = [];
private motorMap: pxt.Map<number> = { public motorMap: pxt.Map<number> = {
0x01: 0, 0x01: 0,
0x02: 1, 0x02: 1,
0x04: 2, 0x04: 2,
@ -97,27 +97,40 @@ namespace pxsim {
return this.brickNode; return this.brickNode;
} }
motorUsed(port:number, large: boolean) { motorUsed(port: number, large: boolean) {
for(let i = 0; i < DAL.NUM_OUTPUTS; ++i) { for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
const p = 1 << i; const p = 1 << i;
if (port & p) { if (port & p) {
const motorPort = this.motorMap[p]; const motorPort = this.motorMap[p];
if (!this.outputNodes[motorPort]) if (!this.outputNodes[motorPort])
this.outputNodes[motorPort] = new MotorNode(motorPort, large); this.outputNodes[motorPort] = new MotorNode(motorPort, large);
} }
} }
}
hasMotor(port: number) {
for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
const p = 1 << i;
if (port & p) {
const motorPort = this.motorMap[p];
const outputNode = this.outputNodes[motorPort];
if (outputNode)
return true;
}
}
return false;
} }
getMotor(port: number, large?: boolean): MotorNode[] { getMotor(port: number, large?: boolean): MotorNode[] {
const r = []; const r = [];
for(let i = 0; i < DAL.NUM_OUTPUTS; ++i) { for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
const p = 1 << i; const p = 1 << i;
if (port & p) { if (port & p) {
const motorPort = this.motorMap[p]; const motorPort = this.motorMap[p];
const outputNode = this.outputNodes[motorPort]; const outputNode = this.outputNodes[motorPort];
if (outputNode) if (outputNode)
r.push(outputNode); r.push(outputNode);
} }
} }
return r; return r;
} }
@ -126,6 +139,10 @@ namespace pxsim {
return this.outputNodes; return this.outputNodes;
} }
hasSensor(port: number) {
return !!this.inputNodes[port];
}
getSensor(port: number, type: number): SensorNode { getSensor(port: number, type: number): SensorNode {
if (!this.inputNodes[port]) { if (!this.inputNodes[port]) {
switch (type) { switch (type) {
@ -150,6 +167,7 @@ namespace pxsim {
runtime.postError = (e) => { runtime.postError = (e) => {
// TODO // TODO
runtime.updateDisplay(); runtime.updateDisplay();
console.log('runtime error: ' + e);
} }
} }

19
sim/state/input.ts
View File

@ -1,10 +1,17 @@
import lf = pxsim.localization.lf;
namespace pxsim.motors { namespace pxsim.motors {
export function __motorUsed(port: number, large: boolean) { export function __motorUsed(port: number, large: boolean) {
//console.log("MOTOR INIT " + port); //console.log("MOTOR INIT " + port);
ev3board().motorUsed(port, large); if (!ev3board().hasMotor(port)) {
runtime.queueDisplayUpdate(); ev3board().motorUsed(port, large);
runtime.queueDisplayUpdate();
} else {
U.userError(`${lf("Multiple motors are connected to Port")} ${String.fromCharCode('A'.charCodeAt(0) + ev3board().motorMap[port])}`);
}
} }
} }
@ -12,7 +19,11 @@ namespace pxsim.sensors {
export function __sensorUsed(port: number, type: number) { export function __sensorUsed(port: number, type: number) {
//console.log("SENSOR INIT " + port + ", type: " + type); //console.log("SENSOR INIT " + port + ", type: " + type);
const sensor = ev3board().getSensor(port, type); if (!ev3board().hasSensor(port)) {
runtime.queueDisplayUpdate(); const sensor = ev3board().getSensor(port, type);
runtime.queueDisplayUpdate();
} else {
U.userError(`${lf("Multiple sensors are connected to Port")} ${port + 1}`);
}
} }
} }