Skip to content

Commit 6176c3b

Browse files
committed
fix method names and remove call to removed method
1 parent 0f2451c commit 6176c3b

File tree

3 files changed

+26
-19
lines changed

3 files changed

+26
-19
lines changed

packages/control-hub/src/internal/ControlHub.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ export class ControlHubInternal implements ControlHub {
236236
}
237237

238238
async getDigitalAllInputs(): Promise<number> {
239-
return this.embedded.getDigitalAllInputs();
239+
return this.embedded.getAllDigitalInputs();
240240
}
241241

242242
async getDigitalDirection(dioPin: number): Promise<DigitalChannelDirection> {
@@ -409,15 +409,15 @@ export class ControlHubInternal implements ControlHub {
409409
}
410410

411411
async setDigitalAllOutputs(bitPackedField: number): Promise<void> {
412-
return this.embedded.setDigitalAllOutputs(bitPackedField);
412+
return this.embedded.setAllDigitalOutputs(bitPackedField);
413413
}
414414

415415
async setDigitalDirection(dioPin: number, direction: DigitalChannelDirection): Promise<void> {
416416
return this.embedded.setDigitalDirection(dioPin, direction);
417417
}
418418

419419
async setDigitalSingleOutput(dioPin: number, value: DigitalState): Promise<void> {
420-
return this.embedded.setDigitalSingleOutput(dioPin, value);
420+
return this.embedded.setDigitalOutput(dioPin, value);
421421
}
422422

423423
async setFTDIResetControl(ftdiResetControl: boolean): Promise<void> {

packages/control-hub/src/internal/ControlHubConnectedExpansionHub.ts

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
I2CWriteStatus,
1010
LedPattern,
1111
ModuleInterface,
12-
ModuleStatus,
12+
ModuleStatus, MotorMode,
1313
ParentExpansionHub,
1414
ParentRevHub,
15-
PidCoefficients,
15+
PidCoefficients, PidfCoefficients,
1616
RevHub,
1717
RevHubType,
1818
Rgb,
@@ -142,7 +142,7 @@ export class ControlHubConnectedExpansionHub implements ParentExpansionHub {
142142
};
143143
}
144144

145-
async getDigitalAllInputs(): Promise<number> {
145+
async getAllDigitalInputs(): Promise<number> {
146146
return await this.sendCommand("getAllDigitalInputs", {
147147
hId: this.id,
148148
});
@@ -449,7 +449,7 @@ export class ControlHubConnectedExpansionHub implements ParentExpansionHub {
449449
});
450450
}
451451

452-
async setDigitalAllOutputs(bitPackedField: number): Promise<void> {
452+
async setAllDigitalOutputs(bitPackedField: number): Promise<void> {
453453
await this.sendCommand("readVersionString", {
454454
hId: this.id,
455455
bf: bitPackedField,
@@ -464,7 +464,7 @@ export class ControlHubConnectedExpansionHub implements ParentExpansionHub {
464464
});
465465
}
466466

467-
async setDigitalSingleOutput(dioPin: number, value: DigitalState): Promise<void> {
467+
async setDigitalOutput(dioPin: number, value: DigitalState): Promise<void> {
468468
await this.sendCommand("readVersionString", {
469469
hId: this.id,
470470
c: dioPin,
@@ -680,4 +680,19 @@ export class ControlHubConnectedExpansionHub implements ParentExpansionHub {
680680

681681
return newHub;
682682
}
683+
684+
getMotorClosedLoopControlCoefficients(motorChannel: number, motorMode: MotorMode): Promise<PidfCoefficients | PidCoefficients> {
685+
return this.getMotorPIDCoefficients(motorChannel, motorMode);
686+
}
687+
688+
689+
async setMotorClosedLoopControlCoefficients(
690+
motorChannel: number,
691+
motorMode: MotorMode,
692+
algorithm: ClosedLoopControlAlgorithm,
693+
pid: PidCoefficients | PidfCoefficients,
694+
): Promise<void> {
695+
//Todo(landry): handle pidf
696+
await this.setMotorPIDCoefficients(motorChannel, motorMode, pid as PidCoefficients);
697+
}
683698
}

packages/sample/src/command/list.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
import { openConnectedExpansionHubs } from "@rev-robotics/expansion-hub";
22
import { controlHubHierarchyToString } from "../HubStringify.js";
3-
import {
4-
openConnectedControlHub, openUsbControlHubsAndChildren,
5-
} from "@rev-robotics/control-hub";
6-
import { ExpansionHub } from "@rev-robotics/rev-hub-core";
3+
import {ControlHub, ExpansionHub} from "@rev-robotics/rev-hub-core";
4+
import {openUsbControlHubs} from "../adb-setup.js";
75

86
export async function list() {
9-
let usbControlHubs = await openUsbControlHubsAndChildren();
7+
let usbControlHubs = await openUsbControlHubs();
108
for (const hub of usbControlHubs) {
119
let hierarchy = controlHubHierarchyToString(hub);
1210
console.log(hierarchy);
1311
hub.close();
1412
}
1513

16-
const controlHub = await openConnectedControlHub();
17-
if (controlHub) {
18-
console.log(`WiFi Control Hub: ${controlHub.moduleAddress}\n\n`);
19-
controlHub.close();
20-
}
21-
2214
const hubs: ExpansionHub[] = await openConnectedExpansionHubs();
2315
for (const hub of hubs) {
2416
hub.on("error", (e: any) => {

0 commit comments

Comments
 (0)