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

Update pxt/common-packages and fix build (#2323)

Browse Source 
* fix build off of pxt/ and pxt-common-packages master

* check in generated files
This commit is contained in:
Joey Wunderlich
2019-07-30 09:45:32 -07:00
committed by GitHub
parent 98490b1c69
commit 34fd7e0600
9 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sim/state/buttonpairsim.ts
View File

@ -146,8 +146,9 @@ namespace pxsim.visuals {
let btng = <SVGGElement>svg.elt("g");
let btn = svg.child(btng, "rect", { class: "sim-button-virtual", x: x, y: y, rx: corner, ry: corner, width: w, height: w});
let btnTxt = mkTxt(cx + txtXOff, cy + txtYOff, txtSize, 0, "A+B");
svg.addClass(btnTxt, "sim-text")
svg.addClass(btnTxt, "sim-text-virtual");
U.addClass(btnTxt, "sim-text")
U.addClass(btnTxt, "sim-text-virtual");
btng.appendChild(btnTxt);
return btng;
@ -157,7 +158,7 @@ namespace pxsim.visuals {
this.abBtn.style.visibility = "hidden";
let el = svg.elt("g");
svg.addClass(el, "sim-buttonpair")
U.addClass(el, "sim-buttonpair")
el.appendChild(this.aBtn);
el.appendChild(this.bBtn);
el.appendChild(this.abBtn);

3
sim/state/ledmatrix.ts
View File

@ -28,7 +28,7 @@ namespace pxsim {
this.data = data;
}
public print() {
console.debug(`Image id:${this.id} refs:${this.refcnt} size:${this.width}x${Image.height}`)
console.debug(`Image id:${this.id} size:${this.width}x${Image.height}`)
}
public get(x: number, y: number): number {
x = x >> 0;
@ -76,7 +76,6 @@ namespace pxsim {
export function createInternalImage(width: number): Image {
width = width >> 0;
let img = createImage(width)
pxsim.runtime.unregisterLiveObject(img, true)
return img
}

10
sim/visuals/microbit.ts
View File

@ -308,7 +308,7 @@ path.sim-board {
this.recordPinCoords();
this.buildDom();
if (props && props.wireframe)
svg.addClass(this.element, "sim-wireframe");
U.addClass(this.element, "sim-wireframe");
if (props && props.theme)
this.updateTheme();
@ -412,8 +412,8 @@ path.sim-board {
this.updateButtonAB();
this.updateGestures();
if (!runtime || runtime.dead) svg.addClass(this.element, "grayscale");
else svg.removeClass(this.element, "grayscale");
if (!runtime || runtime.dead) U.addClass(this.element, "grayscale");
else U.removeClass(this.element, "grayscale");
}
private updateGestures() {
@ -970,7 +970,7 @@ path.sim-board {
let state = this.board;
let pin = state.edgeConnectorState.pins[index];
let svgpin = this.pins[index];
svg.addClass(svgpin, "touched");
U.addClass(svgpin, "touched");
if (pin.mode & PinFlags.Input) {
let cursor = svg.cursorPoint(pt, this.element, ev);
let v = (400 - cursor.y) / 40 * 1023
@ -983,7 +983,7 @@ path.sim-board {
let state = this.board;
let pin = state.edgeConnectorState.pins[index];
let svgpin = this.pins[index];
svg.removeClass(svgpin, "touched");
U.removeClass(svgpin, "touched");
this.updatePin(pin, index);
return false;
},

2
sim/visuals/neopixel.ts
View File

@ -132,7 +132,7 @@ namespace pxsim.visuals {
}
//show the canvas if it's hidden
svg.removeClass(this.background, "hidden");
U.removeClass(this.background, "hidden");
//resize if necessary
let [first, last] = [this.pixels[0], this.pixels[this.pixels.length - 1]]