Merge remote-tracking branch 'origin/master' into V3

This commit is contained in:
Amerlander 2020-09-09 22:34:29 +02:00
commit dac9ec48aa
9 changed files with 49 additions and 8 deletions

39
.github/workflows/pxt-buildtarget.yml vendored Normal file
View File

@ -0,0 +1,39 @@
name: pxt-buildtarget
on:
push:
branches:
- master
create:
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [8.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: npm install
run: |
sudo apt-get install xvfb
sudo npm install -g pxt
npm install
- name: pxt ci
run: |
pxt ci
env:
CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
PXT_ACCESS_TOKEN: ${{ secrets.PXT_ACCESS_TOKEN }}
PXT_RELEASE_REPO: ${{ secrets.PXT_RELEASE_REPO }}
NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
CHROME_BIN: chromium-browser
DISPLAY: :99.0
CI: true

View File

@ -439,6 +439,7 @@
"input.runningTimeMicros": "Gets the number of microseconds elapsed since power on.", "input.runningTimeMicros": "Gets the number of microseconds elapsed since power on.",
"input.setAccelerometerRange": "Sets the accelerometer sample range in gravities.", "input.setAccelerometerRange": "Sets the accelerometer sample range in gravities.",
"input.setAccelerometerRange|param|range": "a value describe the maximum strengh of acceleration measured", "input.setAccelerometerRange|param|range": "a value describe the maximum strengh of acceleration measured",
"input.soundLevel": "gets the level of loudness in 0-100%",
"input.temperature": "Gets the temperature in Celsius degrees (°C).", "input.temperature": "Gets the temperature in Celsius degrees (°C).",
"led": "Control of the LED screen.", "led": "Control of the LED screen.",
"led.brightness": "Get the screen brightness from 0 (off) to 255 (full bright).", "led.brightness": "Get the screen brightness from 0 (off) to 255 (full bright).",

View File

@ -327,6 +327,7 @@
"input.runningTimeMicros|block": "running time (micros)", "input.runningTimeMicros|block": "running time (micros)",
"input.runningTime|block": "running time (ms)", "input.runningTime|block": "running time (ms)",
"input.setAccelerometerRange|block": "set accelerometer|range %range", "input.setAccelerometerRange|block": "set accelerometer|range %range",
"input.soundLevel|block": "Loudness",
"input.temperature|block": "temperature (°C)", "input.temperature|block": "temperature (°C)",
"input|block": "input", "input|block": "input",
"led.brightness|block": "brightness", "led.brightness|block": "brightness",

View File

@ -470,10 +470,8 @@ declare namespace motors {
declare const enum AnalogPin { declare const enum AnalogPin {
P0 = 112, // MICROBIT_ID_IO_P12
P1 = 100, // MICROBIT_ID_IO_P0 P1 = 100, // MICROBIT_ID_IO_P0
P2 = 101, // MICROBIT_ID_IO_P1 P2 = 101, // MICROBIT_ID_IO_P1
P3 = 116, // MICROBIT_ID_IO_P16
C4 = 103, // MICROBIT_ID_IO_P3 C4 = 103, // MICROBIT_ID_IO_P3
C5 = 104, // MICROBIT_ID_IO_P4 C5 = 104, // MICROBIT_ID_IO_P4
C6 = 110, // MICROBIT_ID_IO_P10 C6 = 110, // MICROBIT_ID_IO_P10

View File

@ -342,7 +342,7 @@ namespace pins {
void analogPitch(int frequency, int ms) { void analogPitch(int frequency, int ms) {
// init pins if needed // init pins if needed
if (NULL == pitchPin) { if (NULL == pitchPin) {
pitchPin = getPin((int)AnalogPin::P0); pitchPin = getPin((int)DigitalPin::P0);
#ifdef SOUND_MIRROR_EXTENSION #ifdef SOUND_MIRROR_EXTENSION
pitchPin2 = &SOUND_MIRROR_EXTENSION; pitchPin2 = &SOUND_MIRROR_EXTENSION;
#endif #endif

View File

@ -2,5 +2,5 @@
"input": "Events and data from sensors", "input": "Events and data from sensors",
"input.onLoudSound": "Registers an event that runs when a loud sound is detected", "input.onLoudSound": "Registers an event that runs when a loud sound is detected",
"input.setLoudSoundThreshold": "Sets the minimum threshold for a loud sound", "input.setLoudSoundThreshold": "Sets the minimum threshold for a loud sound",
"input.soundLevel": "Reads the loudness through the microphone from 0 (silent) to 255 (loud)" "input.soundLevel": "gets the level of loudness in 0-100%\n\nReads the loudness through the microphone from 0 (silent) to 255 (loud)"
} }

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "3.0.22", "version": "3.0.26",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "3.0.22", "version": "3.0.26",
"description": "micro:bit target for Microsoft MakeCode (PXT)", "description": "micro:bit target for Microsoft MakeCode (PXT)",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -46,6 +46,6 @@
}, },
"dependencies": { "dependencies": {
"pxt-common-packages": "7.0.4", "pxt-common-packages": "7.0.4",
"pxt-core": "6.0.20" "pxt-core": "6.0.23"
} }
} }

View File

@ -35,6 +35,7 @@
"deployDrives": "MINI", "deployDrives": "MINI",
"driveName": "MINI", "driveName": "MINI",
"hexMimeType": "application/x-microbit-hex", "hexMimeType": "application/x-microbit-hex",
"moveHexEof": true,
"openocdScript": "source [find interface/cmsis-dap.cfg]; source [find target/nrf51.cfg]", "openocdScript": "source [find interface/cmsis-dap.cfg]; source [find target/nrf51.cfg]",
"flashUsableEnd": 242688, "flashUsableEnd": 242688,
"flashEnd": 242688, "flashEnd": 242688,
@ -456,5 +457,6 @@
} }
} }
}, },
"uploadDocs": true "uploadDocs": true,
"ignoreDocsErrors": true
} }