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

5
libs/core/_locales/core-jsdoc-strings.json
View File

@ -50,9 +50,11 @@
"Array.unshift": "Add one element to the beginning of an array and return the new length of the array.",
"Array@type": "Add, remove, and replace items in lists.",
"Boolean.toString": "Returns a string representation of an object.",
"Buffer.concat": "Return concatenation of current buffer and the given buffer",
"Buffer.fill": "Fill (a fragment) of the buffer with given value.",
"Buffer.getNumber": "Read a number in specified format from the buffer.",
"Buffer.getUint8": "Reads an unsigned byte at a particular location",
"Buffer.indexOf": "Return position of other buffer in current buffer",
"Buffer.length": "Returns the length of a Buffer object.",
"Buffer.rotate": "Rotate buffer left in place.\n\n\n\nstart. eg: -1",
"Buffer.rotate|param|length": "number of elements in buffer. If negative, length is set as the buffer length minus",
@ -197,6 +199,7 @@
"String.substr|param|length": "number of characters to extract",
"String.substr|param|start": "first character index; can be negative from counting from the end, eg:0",
"String@type": "Combine, split, and search text strings.",
"StringMap": "A dictionary from string key to string values",
"basic": "Provides access to basic micro:bit functionality.",
"basic.clearScreen": "Turn off all LEDs",
"basic.forever": "Repeats the code forever in the background. On each iteration, allows other codes to run.",
@ -546,6 +549,8 @@
"serial.setRxBufferSize|param|size": "length of the rx buffer in bytes, eg: 32",
"serial.setTxBufferSize": "Sets the size of the TX buffer in bytes",
"serial.setTxBufferSize|param|size": "length of the tx buffer in bytes, eg: 32",
"serial.setWriteLinePadding": "Sets the padding length for lines sent with \"write line\".",
"serial.setWriteLinePadding|param|length": "the number of bytes alignment, eg: 0",
"serial.writeBuffer": "Send a buffer through serial connection",
"serial.writeLine": "Print a line of text to the serial port",
"serial.writeNumber": "Print a numeric value to the serial port",

4
libs/core/_locales/core-strings.json
View File

@ -232,8 +232,11 @@
"String.charAt|block": "char from %this=text|at %pos",
"String.compare|block": "compare %this=text| to %that",
"String.fromCharCode|block": "text from char code %code",
"String.includes|block": "%this=text|includes %searchValue",
"String.indexOf|block": "%this=text|find index of %searchValue",
"String.isEmpty|block": "%this=text| is empty",
"String.length|block": "length of %VALUE",
"String.split|block": "split %this=text|at %separator",
"String.substr|block": "substring of %this=text|from %start|of length %length",
"String|block": "String",
"basic.clearScreen|block": "clear screen",
@ -367,6 +370,7 @@
"serial.redirect|block": "serial|redirect to|TX %tx|RX %rx|at baud rate %rate",
"serial.setRxBufferSize|block": "serial set rx buffer size to $size",
"serial.setTxBufferSize|block": "serial set tx buffer size to $size",
"serial.setWriteLinePadding|block": "serial set write line padding to $length",
"serial.writeBuffer|block": "serial|write buffer %buffer=serial_readbuffer",
"serial.writeLine|block": "serial|write line %text",
"serial.writeNumbers|block": "serial|write numbers %values",

2
libs/core/images.cpp
View File

@ -1,6 +1,6 @@
#include "pxt.h"
PXT_VTABLE(RefMImage)
PXT_VTABLE(RefMImage, ValType::Object)
RefMImage::RefMImage(ImageData *d) : PXT_VTABLE_INIT(RefMImage), img(d) {
img->incr();