c63e2c85f1
* working on new part definitions * draft of new part definitions * updates comments * starting new allocator * starting from the old allocator * alloc internals renaming * alloc minor renaming * alloc internal renaming * progress on new parts definition * progress on new part defs allocator * refactors BBLoc; progress on new allocator * more progress on new allocator * finishing new allocator * deleting old allocator * moves new allocator and part definitions * porting to new part definitions * refactors instructions for new definitions * debugging new allocator * fixes ground and power wire colros * fixing new part definition bugs * fixes wire end offsets; fixes NeoPixel placement * fixes colorGroup issue * fixes led matrix wiring * naming tweaks * fixes instructions regressions * typo
289 lines
12 KiB
TypeScript
289 lines
12 KiB
TypeScript
/// <reference path="../../node_modules/pxt-core/built/pxtsim.d.ts"/>
|
|
/// <reference path="../../libs/microbit/dal.d.ts"/>
|
|
/// <reference path="../../libs/microbit/shims.d.ts"/>
|
|
/// <reference path="../../libs/microbit/enums.d.ts"/>
|
|
/// <reference path="../state/neopixel.ts"/>
|
|
/// <reference path="../simlib.ts"/>
|
|
|
|
//TODO move to utils
|
|
namespace pxsim.visuals {
|
|
//expects rgb from 0,255, gives h in [0,360], s in [0, 100], l in [0, 100]
|
|
export function rgbToHsl(rgb: [number, number, number]): [number, number, number] {
|
|
let [r, g, b] = rgb;
|
|
let [r$, g$, b$] = [r / 255, g / 255, b / 255];
|
|
let cMin = Math.min(r$, g$, b$);
|
|
let cMax = Math.max(r$, g$, b$);
|
|
let cDelta = cMax - cMin;
|
|
let h: number, s: number, l: number;
|
|
let maxAndMin = cMax + cMin;
|
|
|
|
//lum
|
|
l = (maxAndMin / 2) * 100
|
|
|
|
if (cDelta === 0)
|
|
s = h = 0;
|
|
else {
|
|
//hue
|
|
if (cMax === r$)
|
|
h = 60 * (((g$ - b$) / cDelta) % 6);
|
|
else if (cMax === g$)
|
|
h = 60 * (((b$ - r$) / cDelta) + 2);
|
|
else if (cMax === b$)
|
|
h = 60 * (((r$ - g$) / cDelta) + 4);
|
|
|
|
//sat
|
|
if (l > 50)
|
|
s = 100 * (cDelta / (2 - maxAndMin));
|
|
else
|
|
s = 100 * (cDelta / maxAndMin);
|
|
}
|
|
|
|
return [Math.floor(h), Math.floor(s), Math.floor(l)];
|
|
}
|
|
}
|
|
|
|
namespace pxsim.visuals {
|
|
const PIXEL_SPACING = PIN_DIST * 3;
|
|
const PIXEL_RADIUS = PIN_DIST;
|
|
const CANVAS_WIDTH = 1.2 * PIN_DIST;
|
|
const CANVAS_HEIGHT = 12 * PIN_DIST;
|
|
const CANVAS_VIEW_WIDTH = CANVAS_WIDTH;
|
|
const CANVAS_VIEW_HEIGHT = CANVAS_HEIGHT;
|
|
const CANVAS_VIEW_PADDING = PIN_DIST * 4;
|
|
const CANVAS_LEFT = 1.4 * PIN_DIST;
|
|
const CANVAS_TOP = PIN_DIST;
|
|
|
|
// For the instructions parts list
|
|
export function mkNeoPixelPart(xy: Coord = [0, 0]): SVGElAndSize {
|
|
const NP_PART_XOFF = -13.5;
|
|
const NP_PART_YOFF = -11;
|
|
const NP_PART_WIDTH = 87.5;
|
|
const NP_PART_HEIGHT = 190;
|
|
const NEOPIXEL_PART_IMG = `<svg viewBox="-5 -1 53 112" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com">
|
|
<rect x="2.5" width="38" height="100" style="fill: rgb(68, 68, 68);"/>
|
|
<rect x="11.748" y="3.2" width="1.391" height="2.553" style="fill: none; stroke-linejoin: round; stroke-width: 3; stroke: rgb(165, 103, 52);"/>
|
|
<rect x="20.75" y="3.2" width="1.391" height="2.553" style="fill: none; stroke-linejoin: round; stroke-width: 3; stroke: rgb(165, 103, 52);"/>
|
|
<rect x="29.75" y="3.2" width="1.391" height="2.553" style="fill: none; stroke-linejoin: round; stroke-width: 3; stroke: rgb(165, 103, 52);"/>
|
|
<g>
|
|
<rect x="9" y="16.562" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="9" y="22.562" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="9" y="28.563" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="11.607" y="14.833" width="19.787" height="18.697" style="fill: rgb(0, 0, 0);"/>
|
|
<ellipse style="fill: rgb(216, 216, 216);" cx="21.5" cy="24.181" rx="7" ry="7"/>
|
|
</g>
|
|
<path d="M -7.25 -103.2 L -2.5 -100.003 L -12 -100.003 L -7.25 -103.2 Z" style="fill: rgb(68, 68, 68);" transform="matrix(-1, 0, 0, -1, 0, 0)" bx:shape="triangle -12 -103.2 9.5 3.197 0.5 0 1@ad6f5cac"/>
|
|
<path d="M -16.75 -103.197 L -12 -100 L -21.5 -100 L -16.75 -103.197 Z" style="fill: rgb(68, 68, 68);" transform="matrix(-1, 0, 0, -1, 0, 0)" bx:shape="triangle -21.5 -103.197 9.5 3.197 0.5 0 1@07d73149"/>
|
|
<path d="M -26.25 -103.2 L -21.5 -100.003 L -31 -100.003 L -26.25 -103.2 Z" style="fill: rgb(68, 68, 68);" transform="matrix(-1, 0, 0, -1, 0, 0)" bx:shape="triangle -31 -103.2 9.5 3.197 0.5 0 1@54403e2d"/>
|
|
<path d="M -35.75 -103.197 L -31 -100 L -40.5 -100 L -35.75 -103.197 Z" style="fill: rgb(68, 68, 68);" transform="matrix(-1, 0, 0, -1, 0, 0)" bx:shape="triangle -40.5 -103.197 9.5 3.197 0.5 0 1@21c9b772"/>
|
|
<g transform="matrix(1, 0, 0, 1, 0.000002, 29.999994)">
|
|
<rect x="9" y="16.562" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="9" y="22.562" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="9" y="28.563" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="11.607" y="14.833" width="19.787" height="18.697" style="fill: rgb(0, 0, 0);"/>
|
|
<ellipse style="fill: rgb(216, 216, 216);" cx="21.5" cy="24.181" rx="7" ry="7"/>
|
|
</g>
|
|
<g transform="matrix(1, 0, 0, 1, 0.000005, 59.999992)">
|
|
<rect x="9" y="16.562" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="9" y="22.562" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="9" y="28.563" width="25" height="3.238" style="fill: rgb(216, 216, 216);"/>
|
|
<rect x="11.607" y="14.833" width="19.787" height="18.697" style="fill: rgb(0, 0, 0);"/>
|
|
<ellipse style="fill: rgb(216, 216, 216);" cx="21.5" cy="24.181" rx="7" ry="7"/>
|
|
</g>
|
|
</svg>`;
|
|
let [x, y] = xy;
|
|
let l = x + NP_PART_XOFF;
|
|
let t = y + NP_PART_YOFF;
|
|
let w = NP_PART_WIDTH;
|
|
let h = NP_PART_HEIGHT;
|
|
let img = <SVGImageElement>svg.elt("image");
|
|
svg.hydrate(img, {
|
|
class: "sim-neopixel-strip", x: l, y: t, width: w, height: h,
|
|
href: svg.toDataUri(NEOPIXEL_PART_IMG)
|
|
});
|
|
return { el: img, x: l, y: t, w: w, h: h };
|
|
}
|
|
export class NeoPixel {
|
|
public el: SVGElement;
|
|
public cy: number;
|
|
|
|
constructor(xy: Coord = [0, 0]) {
|
|
let el = <SVGElement>svg.elt("rect");
|
|
let r = PIXEL_RADIUS;
|
|
let [cx, cy] = xy;
|
|
let y = cy - r;
|
|
svg.hydrate(el, { x: "-50%", y: y, width: "100%", height: r * 2, class: "sim-neopixel" });
|
|
this.el = el;
|
|
this.cy = cy;
|
|
}
|
|
|
|
public setRgb(rgb: [number, number, number]) {
|
|
let hsl = rgbToHsl(rgb);
|
|
let [h, s, l] = hsl;
|
|
//We ignore luminosity since it doesn't map well to real-life brightness
|
|
let fill = `hsl(${h}, ${s}%, 70%)`;
|
|
this.el.setAttribute("fill", fill);
|
|
}
|
|
}
|
|
|
|
export class NeoPixelCanvas {
|
|
public canvas: SVGSVGElement;
|
|
public pin: number;
|
|
public pixels: NeoPixel[];
|
|
private viewBox: [number, number, number, number];
|
|
private background: SVGRectElement;
|
|
|
|
constructor(pin: number) {
|
|
this.pixels = [];
|
|
this.pin = pin;
|
|
let el = <SVGSVGElement>svg.elt("svg");
|
|
svg.hydrate(el, {
|
|
"class": `sim-neopixel-canvas`,
|
|
"x": "0px",
|
|
"y": "0px",
|
|
"width": `${CANVAS_WIDTH}px`,
|
|
"height": `${CANVAS_HEIGHT}px`,
|
|
});
|
|
this.canvas = el;
|
|
this.background = <SVGRectElement>svg.child(el, "rect", { class: "sim-neopixel-background hidden" });
|
|
this.updateViewBox(-CANVAS_VIEW_WIDTH / 2, 0, CANVAS_VIEW_WIDTH, CANVAS_VIEW_HEIGHT);
|
|
}
|
|
|
|
private updateViewBox(x: number, y: number, w: number, h: number) {
|
|
this.viewBox = [x, y, w, h];
|
|
svg.hydrate(this.canvas, { "viewBox": `${x} ${y} ${w} ${h}` });
|
|
svg.hydrate(this.background, { "x": x, "y": y, "width": w, "height": h });
|
|
}
|
|
|
|
public update(colors: RGBW[]) {
|
|
if (!colors || colors.length <= 0)
|
|
return;
|
|
|
|
for (let i = 0; i < colors.length; i++) {
|
|
let pixel = this.pixels[i];
|
|
if (!pixel) {
|
|
let cxy: Coord = [0, CANVAS_VIEW_PADDING + i * PIXEL_SPACING];
|
|
pixel = this.pixels[i] = new NeoPixel(cxy);
|
|
svg.hydrate(pixel.el, { title: `offset: ${i}` });
|
|
this.canvas.appendChild(pixel.el);
|
|
}
|
|
let color = colors[i];
|
|
pixel.setRgb(color);
|
|
}
|
|
|
|
//show the canvas if it's hidden
|
|
svg.removeClass(this.background, "hidden");
|
|
|
|
//resize if necessary
|
|
let [first, last] = [this.pixels[0], this.pixels[this.pixels.length - 1]]
|
|
let yDiff = last.cy - first.cy;
|
|
let newH = yDiff + CANVAS_VIEW_PADDING * 2;
|
|
let [oldX, oldY, oldW, oldH] = this.viewBox;
|
|
if (oldH < newH) {
|
|
let scalar = newH / oldH;
|
|
let newW = oldW * scalar;
|
|
this.updateViewBox(-newW / 2, oldY, newW, newH);
|
|
}
|
|
}
|
|
|
|
public setLoc(xy: Coord) {
|
|
let [x, y] = xy;
|
|
svg.hydrate(this.canvas, { x: x, y: y });
|
|
}
|
|
};
|
|
|
|
function digitalPinToPinNumber(gpioPin: string): number {
|
|
const MICROBIT_ID_IO_P0 = 7; //TODO: don't hardcode this, import enums.d.ts
|
|
if (gpioPin == "*") {
|
|
return MICROBIT_ID_IO_P0;
|
|
}
|
|
let pinSplit = gpioPin.split("DigitalPin.P");
|
|
U.assert(pinSplit.length === 2, "Unknown format for pin (for NeoPixel): " + gpioPin);
|
|
let pinNumStr = pinSplit[1];
|
|
let pinNum = Number(pinNumStr) + MICROBIT_ID_IO_P0;
|
|
return pinNum
|
|
}
|
|
function parseNeoPixelMode(modeStr: string): NeoPixelMode {
|
|
const modeMap: Map<NeoPixelMode> = {
|
|
"NeoPixelMode.RGB": NeoPixelMode.RGB,
|
|
"NeoPixelMode.RGBW": NeoPixelMode.RGBW,
|
|
"*": NeoPixelMode.RGB,
|
|
};
|
|
let mode: NeoPixelMode = null;
|
|
for (let key in modeMap) {
|
|
if (key == modeStr) {
|
|
mode = modeMap[key];
|
|
break;
|
|
}
|
|
}
|
|
U.assert(mode != null, "Unknown NeoPixelMode: " + modeStr);
|
|
return mode;
|
|
}
|
|
|
|
export class NeoPixelView implements IBoardPart<NeoPixelState> {
|
|
public style: string = `
|
|
.sim-neopixel-canvas {
|
|
}
|
|
.sim-neopixel-canvas-parent:hover {
|
|
transform-origin: center;
|
|
transform: scale(4) translateY(-60px);
|
|
}
|
|
.sim-neopixel-canvas .hidden {
|
|
visibility:hidden;
|
|
}
|
|
.sim-neopixel-background {
|
|
fill: rgba(255,255,255,0.9);
|
|
}
|
|
.sim-neopixel-strip {
|
|
}
|
|
`;
|
|
public element: SVGElement;
|
|
public overElement: SVGElement;
|
|
public defs: SVGElement[];
|
|
private state: NeoPixelState;
|
|
private canvas: NeoPixelCanvas;
|
|
private part: SVGElAndSize;
|
|
private stripGroup: SVGGElement;
|
|
private lastLocation: Coord;
|
|
private pin: number;
|
|
private mode: NeoPixelMode;
|
|
|
|
public init(bus: EventBus, state: NeoPixelState, svgEl: SVGSVGElement, otherParams: Map<string>): void {
|
|
U.assert(!!otherParams["mode"], "NeoPixels assumes a RGB vs RGBW mode is passed to it");
|
|
U.assert(!!otherParams["pin"], "NeoPixels assumes a pin is passed to it");
|
|
let modeStr = otherParams["mode"];
|
|
this.mode = parseNeoPixelMode(modeStr);
|
|
this.state = state;
|
|
this.stripGroup = <SVGGElement>svg.elt("g");
|
|
this.element = this.stripGroup;
|
|
let pinStr = otherParams["pin"];
|
|
this.pin = digitalPinToPinNumber(pinStr);
|
|
this.lastLocation = [0, 0];
|
|
let part = mkNeoPixelPart();
|
|
this.part = part;
|
|
this.stripGroup.appendChild(part.el);
|
|
let canvas = new NeoPixelCanvas(this.pin);
|
|
this.canvas = canvas;
|
|
let canvasG = svg.elt("g", { class: "sim-neopixel-canvas-parent" });
|
|
this.overElement = canvasG;
|
|
canvasG.appendChild(canvas.canvas);
|
|
this.updateStripLoc();
|
|
}
|
|
public moveToCoord(xy: Coord): void {
|
|
let [x, y] = xy;
|
|
let loc: Coord = [x, y];
|
|
this.lastLocation = loc;
|
|
this.updateStripLoc();
|
|
}
|
|
private updateStripLoc() {
|
|
let [x, y] = this.lastLocation;
|
|
U.assert(typeof x === "number" && typeof y === "number", "invalid x,y for NeoPixel strip");
|
|
this.canvas.setLoc([x + CANVAS_LEFT, y + CANVAS_TOP]);
|
|
svg.hydrate(this.part.el, { transform: `translate(${x} ${y})` }); //TODO: update part's l,h, etc.
|
|
}
|
|
public updateState(): void {
|
|
let colors = this.state.getColors(this.pin, this.mode);
|
|
this.canvas.update(colors);
|
|
}
|
|
public updateTheme(): void { }
|
|
}
|
|
} |