added parts to microbit
This commit is contained in:
Peli de Halleux
parent
03beec9c49
commit
e681cc8c97
@ -27,6 +27,7 @@
|
|||||||
"serial.cpp",
|
"serial.cpp",
|
||||||
"serial.ts",
|
"serial.ts",
|
||||||
"buffer.cpp",
|
"buffer.cpp",
|
||||||
|
"pxtparts.json",
|
||||||
"_locales/fr/microbit-jsdoc-strings.json"
|
"_locales/fr/microbit-jsdoc-strings.json"
|
||||||
],
|
],
|
||||||
"public": true,
|
"public": true,
|
||||||
|
|||||||
78
libs/microbit/pxtparts.json
Normal file
78
libs/microbit/pxtparts.json
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
{
|
||||||
|
"ledmatrix": {
|
||||||
|
"visual": "ledmatrix",
|
||||||
|
"breadboardColumnsNeeded": 8,
|
||||||
|
"breadboardStartRow": "h",
|
||||||
|
"pinAllocation": {
|
||||||
|
"type": "auto",
|
||||||
|
"gpioPinsNeeded": [5, 5]
|
||||||
|
},
|
||||||
|
"assemblyStep": 0,
|
||||||
|
"wires": [
|
||||||
|
{"start": ["breadboard", "j", 0], "end": ["GPIO", 5], "color": "purple", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "j", 1], "end": ["GPIO", 6], "color": "purple", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "j", 2], "end": ["GPIO", 7], "color": "purple", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "j", 3], "end": ["GPIO", 8], "color": "purple", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "a", 7], "end": ["GPIO", 9], "color": "purple", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "a", 0], "end": ["GPIO", 0], "color": "green", "assemblyStep": 2},
|
||||||
|
{"start": ["breadboard", "a", 1], "end": ["GPIO", 1], "color": "green", "assemblyStep": 2},
|
||||||
|
{"start": ["breadboard", "a", 2], "end": ["GPIO", 2], "color": "green", "assemblyStep": 2},
|
||||||
|
{"start": ["breadboard", "a", 3], "end": ["GPIO", 3], "color": "green", "assemblyStep": 2},
|
||||||
|
{"start": ["breadboard", "j", 4], "end": ["GPIO", 4], "color": "green", "assemblyStep": 2}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"buttonpair": {
|
||||||
|
"visual": "buttonpair",
|
||||||
|
"breadboardColumnsNeeded": 6,
|
||||||
|
"breadboardStartRow": "f",
|
||||||
|
"pinAllocation": {
|
||||||
|
"type": "predefined",
|
||||||
|
"pins": ["P13", "P12"]
|
||||||
|
},
|
||||||
|
"assemblyStep": 0,
|
||||||
|
"wires": [
|
||||||
|
{"start": ["breadboard", "j", 0], "end": ["GPIO", 0], "color": "yellow", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "a", 2], "end": "ground", "color": "blue", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "j", 3], "end": ["GPIO", 1], "color": "orange", "assemblyStep": 2},
|
||||||
|
{"start": ["breadboard", "a", 5], "end": "ground", "color": "blue", "assemblyStep": 2}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"neopixel": {
|
||||||
|
"visual": "neopixel",
|
||||||
|
"breadboardColumnsNeeded": 5,
|
||||||
|
"breadboardStartRow": "h",
|
||||||
|
"pinAllocation": {
|
||||||
|
"type": "factoryfunction",
|
||||||
|
"functionName": "neopixel.create",
|
||||||
|
"pinArgPositions": [0],
|
||||||
|
"otherArgPositions": [1]
|
||||||
|
},
|
||||||
|
"assemblyStep": 0,
|
||||||
|
"wires": [
|
||||||
|
{"start": ["breadboard", "j", 1], "end": "ground", "color": "blue", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "j", 2], "end": "threeVolt", "color": "red", "assemblyStep": 2},
|
||||||
|
{"start": ["breadboard", "j", 3], "end": ["GPIO", 0], "color": "green", "assemblyStep": 2}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"speaker": {
|
||||||
|
"visual": {
|
||||||
|
"image": "/parts/speaker.svg",
|
||||||
|
"width": 500,
|
||||||
|
"height": 500,
|
||||||
|
"firstPin": [180, 135],
|
||||||
|
"pinDist": 70,
|
||||||
|
"extraColumnOffset": 1
|
||||||
|
},
|
||||||
|
"breadboardColumnsNeeded": 5,
|
||||||
|
"breadboardStartRow": "f",
|
||||||
|
"pinAllocation": {
|
||||||
|
"type": "auto",
|
||||||
|
"gpioPinsNeeded": 1
|
||||||
|
},
|
||||||
|
"assemblyStep": 0,
|
||||||
|
"wires": [
|
||||||
|
{"start": ["breadboard", "j", 1], "end": ["GPIO", 0], "color": "#ff80fa", "assemblyStep": 1},
|
||||||
|
{"start": ["breadboard", "j", 3], "end": "ground", "color": "blue", "assemblyStep": 1}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,3 +1,5 @@
|
|||||||
|
/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
|
||||||
|
|
||||||
namespace pxsim {
|
namespace pxsim {
|
||||||
export class DalBoard extends BaseBoard {
|
export class DalBoard extends BaseBoard {
|
||||||
id: string;
|
id: string;
|
||||||
@ -69,12 +71,14 @@ namespace pxsim {
|
|||||||
}
|
}
|
||||||
|
|
||||||
initAsync(msg: SimulatorRunMessage): Promise<void> {
|
initAsync(msg: SimulatorRunMessage): Promise<void> {
|
||||||
|
super.initAsync(msg);
|
||||||
|
|
||||||
let options = (msg.options || {}) as RuntimeOptions;
|
let options = (msg.options || {}) as RuntimeOptions;
|
||||||
|
|
||||||
let boardDef = CURRENT_BOARD; //TODO: read from pxt.json/pxttarget.json
|
let boardDef = CURRENT_BOARD; //TODO: read from pxt.json/pxttarget.json
|
||||||
|
|
||||||
let cmpsList = msg.parts;
|
let cmpsList = msg.parts;
|
||||||
let cmpDefs = PART_DEFINITIONS; //TODO: read from pxt.json/pxttarget.json
|
let cmpDefs = msg.partDefinitions || {}; //TODO: read from pxt.json/pxttarget.json
|
||||||
let fnArgs = msg.fnArgs;
|
let fnArgs = msg.fnArgs;
|
||||||
|
|
||||||
let viewHost = new visuals.BoardHost({
|
let viewHost = new visuals.BoardHost({
|
||||||
|
|||||||
@ -1,73 +1,10 @@
|
|||||||
/// <reference path="../node_modules/pxt-core/typings/bluebird/bluebird.d.ts"/>
|
/// <reference path="../node_modules/pxt-core/typings/bluebird/bluebird.d.ts"/>
|
||||||
|
/// <reference path="../node_modules/pxt-core/built/pxtparts.d.ts"/>
|
||||||
/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
|
/// <reference path="../node_modules/pxt-core/built/pxtsim.d.ts"/>
|
||||||
/// <reference path="../libs/microbit/dal.d.ts"/>
|
/// <reference path="../libs/microbit/dal.d.ts"/>
|
||||||
/// <reference path="./visuals/neopixel.ts"/>
|
/// <reference path="./visuals/neopixel.ts"/>
|
||||||
|
|
||||||
namespace pxsim {
|
namespace pxsim {
|
||||||
export interface PinBlockDefinition {
|
|
||||||
x: number,
|
|
||||||
y: number,
|
|
||||||
labelPosition: "above" | "below";
|
|
||||||
labels: string[]
|
|
||||||
}
|
|
||||||
export interface BoardImageDefinition {
|
|
||||||
image: string,
|
|
||||||
outlineImage?: string,
|
|
||||||
width: number,
|
|
||||||
height: number,
|
|
||||||
pinDist: number,
|
|
||||||
pinBlocks: PinBlockDefinition[],
|
|
||||||
};
|
|
||||||
export interface BoardDefinition {
|
|
||||||
visual: BoardImageDefinition | string,
|
|
||||||
gpioPinBlocks?: string[][],
|
|
||||||
gpioPinMap: {[pin: string]: string},
|
|
||||||
groundPins: string[],
|
|
||||||
threeVoltPins: string[],
|
|
||||||
attachPowerOnRight?: boolean,
|
|
||||||
onboardComponents?: string[]
|
|
||||||
useCrocClips?: boolean,
|
|
||||||
marginWhenBreadboarding?: [number, number, number, number],
|
|
||||||
}
|
|
||||||
export interface FactoryFunctionPinAlloc {
|
|
||||||
type: "factoryfunction",
|
|
||||||
functionName: string,
|
|
||||||
pinArgPositions: number[],
|
|
||||||
otherArgPositions?: number[],
|
|
||||||
}
|
|
||||||
export interface PredefinedPinAlloc {
|
|
||||||
type: "predefined",
|
|
||||||
pins: string[],
|
|
||||||
}
|
|
||||||
export interface AutoPinAlloc {
|
|
||||||
type: "auto",
|
|
||||||
gpioPinsNeeded: number | number[],
|
|
||||||
}
|
|
||||||
export interface PartVisualDefinition {
|
|
||||||
image: string,
|
|
||||||
width: number,
|
|
||||||
height: number,
|
|
||||||
pinDist: number,
|
|
||||||
extraColumnOffset?: number,
|
|
||||||
firstPin: [number, number],
|
|
||||||
}
|
|
||||||
export interface PartDefinition {
|
|
||||||
visual: string | PartVisualDefinition,
|
|
||||||
breadboardColumnsNeeded: number,
|
|
||||||
breadboardStartRow: string,
|
|
||||||
wires: WireDefinition[],
|
|
||||||
assemblyStep: number,
|
|
||||||
pinAllocation: FactoryFunctionPinAlloc | PredefinedPinAlloc | AutoPinAlloc,
|
|
||||||
}
|
|
||||||
export interface WireDefinition {
|
|
||||||
start: WireLocationDefinition,
|
|
||||||
end: WireLocationDefinition,
|
|
||||||
color: string,
|
|
||||||
assemblyStep: number
|
|
||||||
};
|
|
||||||
export type WireLocationDefinition =
|
|
||||||
["breadboard", string, number] | ["GPIO", number] | "ground" | "threeVolt";
|
|
||||||
|
|
||||||
export const MICROBIT_DEF: BoardDefinition = {
|
export const MICROBIT_DEF: BoardDefinition = {
|
||||||
visual: "microbit",
|
visual: "microbit",
|
||||||
gpioPinBlocks: [
|
gpioPinBlocks: [
|
||||||
@ -107,118 +44,6 @@ namespace pxsim {
|
|||||||
marginWhenBreadboarding: [0, 0, 80, 0],
|
marginWhenBreadboarding: [0, 0, 80, 0],
|
||||||
}
|
}
|
||||||
|
|
||||||
export const PART_DEFINITIONS: Map<PartDefinition> = {
|
|
||||||
"ledmatrix": {
|
|
||||||
visual: "ledmatrix",
|
|
||||||
breadboardColumnsNeeded: 8,
|
|
||||||
breadboardStartRow: "h",
|
|
||||||
pinAllocation: {
|
|
||||||
type: "auto",
|
|
||||||
gpioPinsNeeded: [5, 5],
|
|
||||||
},
|
|
||||||
assemblyStep: 0,
|
|
||||||
wires: [
|
|
||||||
{start: ["breadboard", `j`, 0], end: ["GPIO", 5], color: "purple", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", `j`, 1], end: ["GPIO", 6], color: "purple", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", `j`, 2], end: ["GPIO", 7], color: "purple", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", `j`, 3], end: ["GPIO", 8], color: "purple", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", `a`, 7], end: ["GPIO", 9], color: "purple", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", `a`, 0], end: ["GPIO", 0], color: "green", assemblyStep: 2},
|
|
||||||
{start: ["breadboard", `a`, 1], end: ["GPIO", 1], color: "green", assemblyStep: 2},
|
|
||||||
{start: ["breadboard", `a`, 2], end: ["GPIO", 2], color: "green", assemblyStep: 2},
|
|
||||||
{start: ["breadboard", `a`, 3], end: ["GPIO", 3], color: "green", assemblyStep: 2},
|
|
||||||
{start: ["breadboard", `j`, 4], end: ["GPIO", 4], color: "green", assemblyStep: 2},
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"buttonpair": {
|
|
||||||
visual: "buttonpair",
|
|
||||||
breadboardColumnsNeeded: 6,
|
|
||||||
breadboardStartRow: "f",
|
|
||||||
pinAllocation: {
|
|
||||||
type: "predefined",
|
|
||||||
pins: ["P13", "P12"],
|
|
||||||
},
|
|
||||||
assemblyStep: 0,
|
|
||||||
wires: [
|
|
||||||
{start: ["breadboard", "j", 0], end: ["GPIO", 0], color: "yellow", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", "a", 2], end: "ground", color: "blue", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", "j", 3], end: ["GPIO", 1], color: "orange", assemblyStep: 2},
|
|
||||||
{start: ["breadboard", "a", 5], end: "ground", color: "blue", assemblyStep: 2},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
"neopixel": {
|
|
||||||
visual: "neopixel",
|
|
||||||
breadboardColumnsNeeded: 5,
|
|
||||||
breadboardStartRow: "h",
|
|
||||||
pinAllocation: {
|
|
||||||
type: "factoryfunction",
|
|
||||||
functionName: "neopixel.create",
|
|
||||||
pinArgPositions: [0],
|
|
||||||
otherArgPositions: [1],
|
|
||||||
},
|
|
||||||
assemblyStep: 0,
|
|
||||||
wires: [
|
|
||||||
{start: ["breadboard", "j", 1], end: "ground", color: "blue", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", "j", 2], end: "threeVolt", color: "red", assemblyStep: 2},
|
|
||||||
{start: ["breadboard", "j", 3], end: ["GPIO", 0], color: "green", assemblyStep: 2},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
"speaker": {
|
|
||||||
visual: {
|
|
||||||
image: svg.toDataUri(`<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<g transform="matrix(1, 0, 0, 1, -0.00023, -58.230297)">
|
|
||||||
<ellipse style="fill: rgb(70, 70, 70);" cx="250.58" cy="308.81" rx="215" ry="215"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(1, 0, 0, 1.000001, -232.069031, 248.780606)" cx="482.069" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(1, 0, 0, 0.999999, -232.067871, 110.041956)" cx="482.067" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="389.12" cy="308.23" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="110.88" cy="308.23" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="250" cy="169.393" rx="23.028" ry="23.028"/>
|
|
||||||
<g transform="matrix(1, 0, 0, 1, -0.000009, 0.000015)">
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="250" cy="238.513" rx="23.028" ry="23.028" transform="matrix(1.000001, 0, 0, 0.999999, 69.996739, 69.71816)"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(1, 0, 0, 0.999999, -302.064453, 110.043115)" cx="482.064" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
</g>
|
|
||||||
<g transform="matrix(0.866026, 0.5, -0.5, 0.866026, 7.386552, -105.261086)">
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(0.999999, 0, 0, 0.999999, -65.212313, 177.387415)" cx="482.068" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="555.975" cy="236.836" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="277.735" cy="236.836" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="416.855" cy="97.999" rx="23.028" ry="23.028"/>
|
|
||||||
</g>
|
|
||||||
<g transform="matrix(0.5, 0.866026, -0.866026, 0.5, 246.635941, -171.170502)">
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(0.999999, 0, 0, 0.999999, -65.212313, 177.387415)" cx="482.068" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="555.975" cy="236.836" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="277.735" cy="236.836" rx="23.028" ry="23.028"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="416.855" cy="97.999" rx="23.028" ry="23.028"/>
|
|
||||||
</g>
|
|
||||||
<g transform="matrix(-0.5, 0.866026, -0.866026, -0.5, 641.934998, 245.84082)">
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="250" cy="238.513" rx="23.028" ry="23.028" transform="matrix(1.000001, 0, 0, 0.999999, 69.996739, 69.71816)"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(1, 0, 0, 0.999999, -302.064453, 110.043115)" cx="482.064" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
</g>
|
|
||||||
<g transform="matrix(-0.500001, -0.866026, 0.866026, -0.500001, 108.063393, 678.85083)">
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" cx="250" cy="238.513" rx="23.028" ry="23.028" transform="matrix(1.000001, 0, 0, 0.999999, 69.996739, 69.71816)"/>
|
|
||||||
<ellipse style="fill: rgb(0, 0, 0);" transform="matrix(1, 0, 0, 0.999999, -302.064453, 110.043115)" cx="482.064" cy="198.188" rx="23.028" ry="23.028"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>`),
|
|
||||||
width: 500,
|
|
||||||
height: 500,
|
|
||||||
firstPin: [180, 135],
|
|
||||||
pinDist: 70,
|
|
||||||
extraColumnOffset: 1,
|
|
||||||
},
|
|
||||||
breadboardColumnsNeeded: 5,
|
|
||||||
breadboardStartRow: "f",
|
|
||||||
pinAllocation: {
|
|
||||||
type: "auto",
|
|
||||||
gpioPinsNeeded: 1,
|
|
||||||
},
|
|
||||||
assemblyStep: 0,
|
|
||||||
wires: [
|
|
||||||
{start: ["breadboard", "j", 1], end: ["GPIO", 0], color: "#ff80fa", assemblyStep: 1},
|
|
||||||
{start: ["breadboard", "j", 3], end: "ground", color: "blue", assemblyStep: 1},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
export const builtinComponentSimVisual: Map<() => visuals.IBoardComponent<any>> = {
|
export const builtinComponentSimVisual: Map<() => visuals.IBoardComponent<any>> = {
|
||||||
"buttonpair": () => new visuals.ButtonPairView(),
|
"buttonpair": () => new visuals.ButtonPairView(),
|
||||||
"ledmatrix": () => new visuals.LedMatrixView(),
|
"ledmatrix": () => new visuals.LedMatrixView(),
|
||||||
|
|||||||
@ -620,6 +620,9 @@ ${tsPackage}
|
|||||||
let parts = (getQsVal("parts") || "").split(" ");
|
let parts = (getQsVal("parts") || "").split(" ");
|
||||||
parts.sort();
|
parts.sort();
|
||||||
|
|
||||||
|
// parts definitions
|
||||||
|
let partDefinitions = JSON.parse(getQsVal("partdefs") || "{}") as pxsim.Map<PartDefinition>
|
||||||
|
|
||||||
//fn args
|
//fn args
|
||||||
let fnArgs = JSON.parse((getQsVal("fnArgs") || "{}"));
|
let fnArgs = JSON.parse((getQsVal("fnArgs") || "{}"));
|
||||||
|
|
||||||
@ -637,7 +640,7 @@ ${tsPackage}
|
|||||||
style.textContent += STYLE;
|
style.textContent += STYLE;
|
||||||
|
|
||||||
const boardDef = CURRENT_BOARD;
|
const boardDef = CURRENT_BOARD;
|
||||||
const cmpDefs = PART_DEFINITIONS;
|
const cmpDefs = partDefinitions;
|
||||||
|
|
||||||
//props
|
//props
|
||||||
let dummyBreadboard = new visuals.Breadboard({});
|
let dummyBreadboard = new visuals.Breadboard({});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user