diff --git a/.vscode/settings.json b/.vscode/settings.json index 3c7e623906d3..477405b1519b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -54,6 +54,7 @@ "microcontrollers", "pbuf", "pixdata", + "qwiic", "Schottky", "Slidy", "strcmp", diff --git a/jacdac-ts b/jacdac-ts index e4acbd20e6d1..529a5446c2dd 160000 --- a/jacdac-ts +++ b/jacdac-ts @@ -1 +1 @@ -Subproject commit e4acbd20e6d197f50f2a54b0dbafb5669fa8caef +Subproject commit 529a5446c2ddb73f685048be0568f540f470dde3 diff --git a/src/components/specification/DeviceSpecification.tsx b/src/components/specification/DeviceSpecification.tsx index 47c05d5546cd..abe9f4a3d365 100644 --- a/src/components/specification/DeviceSpecification.tsx +++ b/src/components/specification/DeviceSpecification.tsx @@ -79,7 +79,7 @@ function storeInfo(url: string) { "category.yahboom.com": { name: "YahBoom" }, "microbit.org": { name: "MicroBit Educational Foundation" }, "amazon.com": { name: "Amazon" }, - "forwardedu.com": { name: "Forward Education"} + "forwardedu.com": { name: "Forward Education" }, } return infos[host] || { name: host } @@ -200,7 +200,9 @@ export default function DeviceSpecification(props: { by{" "} {company} @@ -231,6 +233,24 @@ export default function DeviceSpecification(props: { consume power the Jacdac bus. )} + {connector === "grove" && ( + + Grove connector. + This device has a Grove connector and is + not + {" "} + compatible with Jacdac cables. + + )} + {connector === "qwiic" && ( + + Qwiic connector. + This device has a Qwiic connector and is + not + {" "} + compatible with Jacdac cables. + + )} {requiredDeviceSpecs?.map(({ id, name }) => ( Requires {name}. @@ -330,21 +350,23 @@ export default function DeviceSpecification(props: { /> )} - {!!services?.length && ( - - -

- DeviceScript Clients -

- - } - nodes={services.map(serviceSpecificationFromClassIdentifier).map(srv => ({ - href: `https://microsoft.github.io/devicescript/api/clients/${srv.shortId}`, - title: srv.name, - }))} - /> + {!!services?.length && ( + + +

+ DeviceScript Clients +

+ + } + nodes={services + .map(serviceSpecificationFromClassIdentifier) + .map(srv => ({ + href: `https://microsoft.github.io/devicescript/api/clients/${srv.shortId}`, + title: srv.name, + }))} + /> )} Kit Devices} diff --git a/src/pages/tools/device-registration.tsx b/src/pages/tools/device-registration.tsx index 6cfeaa867b9b..922ad0142cad 100644 --- a/src/pages/tools/device-registration.tsx +++ b/src/pages/tools/device-registration.tsx @@ -668,6 +668,12 @@ export default function DeviceRegistration() { PCB edge connector, passive - passthrough for power and signal + + Grove connector + + + Qwiic connector + Choose the type of Jacdac connector present on the