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

Merge branch 'rev03-changes'

Browse Source 
# Conflicts:
#	libs/core/motors.cpp
#	libs/core/music.cpp
#	package.json
This commit is contained in:
Matthias L. Jugel
2016-11-09 11:56:14 +01:00
parent 981910fb0a f666d3375e
commit e701d83dc5
8 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/core/music.ts
View File

@ -167,7 +167,7 @@ namespace music {
let beat = 60000 / beatsPerMinute;
if (fraction == BeatFraction.Whole) return beat;
else if (fraction == BeatFraction.Half) return beat / 2;
else if (fraction == BeatFraction.Quarter) return beat / 4
else if (fraction == BeatFraction.Quarter) return beat / 4;
else if (fraction == BeatFraction.Eighth) return beat / 8;
else return beat / 16;
}