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

fix typos, fix accelerometer

Browse Source
This commit is contained in:
Matthias L. Jugel 2017-02-04 14:26:21 +01:00
parent b31d6188f9
commit 4376d3cefe
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/calliope-test/calliope.ts
View File

@ -138,7 +138,7 @@ function getNoteName(frequency: number): string {
} }
} }
var notes = [ let notes = [
note(Note.E, BeatFraction.Quarter), note(Note.E, BeatFraction.Quarter), note(Note.F, BeatFraction.Quarter), note(Note.E, BeatFraction.Quarter), note(Note.E, BeatFraction.Quarter), note(Note.F, BeatFraction.Quarter),
note(Note.G, BeatFraction.Quarter), note(Note.G, BeatFraction.Quarter), note(Note.F, BeatFraction.Quarter), note(Note.G, BeatFraction.Quarter), note(Note.G, BeatFraction.Quarter), note(Note.F, BeatFraction.Quarter),
note(Note.E, BeatFraction.Quarter), note(Note.D, BeatFraction.Quarter), note(Note.C, BeatFraction.Quarter), note(Note.E, BeatFraction.Quarter), note(Note.D, BeatFraction.Quarter), note(Note.C, BeatFraction.Quarter),
@ -166,8 +166,8 @@ var notes = [
note(Note.C, BeatFraction.Eighth), note(Note.C, BeatFraction.Half) note(Note.C, BeatFraction.Eighth), note(Note.C, BeatFraction.Half)
]; ];
for (var t = 0; t < notes.length; t++) { for (let t = 0; t < notes.length; t++) {
music.playTone(notes[t][0], notes[t][1]); music.playTone(notes[t][0], notes[t][1]);
basic.showString(getNoteName(notes[t][0])); basic.showString(getNoteName(notes[t][0]));
music.rest(whole - notes[t][1]); music.rest(whole - notes[t][1]);
} }

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

@ -88,13 +88,13 @@
"PinPullMode.PullUp|block": "up", "PinPullMode.PullUp|block": "up",
"Rotation.Pitch|block": "pitch", "Rotation.Pitch|block": "pitch",
"Rotation.Roll|block": "roll", "Rotation.Roll|block": "roll",
"String.charAt|block": "char from %this|at %pos", "String.charAt|block": "char from %this=text|at %pos",
"String.compare|block": "compare %this| to %that", "String.compare|block": "compare %this=text| to %that",
"String.concat|block": "join %this|%other", "String.concat|block": "join %this=text|%other",
"String.fromCharCode|block": "text from char code %code", "String.fromCharCode|block": "text from char code %code",
"String.isEmpty|block": "%this| is empty", "String.isEmpty|block": "%this=text| is empty",
"String.length|block": "length of %VALUE", "String.length|block": "length of %VALUE",
"String.substr|block": "substring of %this|from %start|of length %length", "String.substr|block": "substring of %this=text|from %start|of length %length",
"String|block": "String", "String|block": "String",
"basic.clearScreen|block": "clear screen", "basic.clearScreen|block": "clear screen",
"basic.color|block": "%c", "basic.color|block": "%c",

2
pxtarget.json
View File

@ -170,7 +170,7 @@
"yottaTarget": "bbc-microbit-classic-gcc", "yottaTarget": "bbc-microbit-classic-gcc",
"yottaCorePackage": "microbit", "yottaCorePackage": "microbit",
"githubCorePackage": "calliope-mini/microbit", "githubCorePackage": "calliope-mini/microbit",
"gittag": "2.0.0-rc7-calliope-p3", "gittag": "2.0.0-rc7-calliope-p6",
"serviceId": "microbit" "serviceId": "microbit"
}, },
"serial": { "serial": {

4
sim/state/accelerometer.ts
View File

@ -223,10 +223,10 @@ namespace pxsim {
return DAL.MICROBIT_ACCELEROMETER_EVT_TILT_UP; return DAL.MICROBIT_ACCELEROMETER_EVT_TILT_UP;
if (this.getZ() < (-1000 + DAL.MICROBIT_ACCELEROMETER_TILT_TOLERANCE)) if (this.getZ() < (-1000 + DAL.MICROBIT_ACCELEROMETER_TILT_TOLERANCE))
return DAL.MICROBIT_ACCELEROMETER_EVT_FACE_UP; return DAL.MICROBIT_ACCELEROMETER_EVT_FACE_DOWN;
if (this.getZ() > (1000 - DAL.MICROBIT_ACCELEROMETER_TILT_TOLERANCE)) if (this.getZ() > (1000 - DAL.MICROBIT_ACCELEROMETER_TILT_TOLERANCE))
return DAL.MICROBIT_ACCELEROMETER_EVT_FACE_DOWN; return DAL.MICROBIT_ACCELEROMETER_EVT_FACE_UP;
return 0; return 0;
} }