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

10
libs/core/motors.cpp
View File

@ -51,17 +51,17 @@ namespace motors {
//% weight=80
void dualMotorPower(Motor motor, int duty_percent) {
switch(motor) {
case Motor::A: if (duty_percent <= 0) uBit.soundmotor.MotorA_Off();
case Motor::A: if (duty_percent <= 0) uBit.soundmotor.MotorA_Off();
else uBit.soundmotor.MotorA_On(duty_percent); break;
case Motor::B: if (duty_percent <= 0) uBit.soundmotor.MotorB_Off();
case Motor::B: if (duty_percent <= 0) uBit.soundmotor.MotorB_Off();
else uBit.soundmotor.MotorB_On(duty_percent); break;
case Motor::AB: if (duty_percent <= 0) {
uBit.soundmotor.MotorA_Off();
uBit.soundmotor.MotorB_Off();
} else {
uBit.soundmotor.MotorA_On(duty_percent);
uBit.soundmotor.MotorB_On(duty_percent);
}
uBit.soundmotor.MotorA_On(duty_percent);
uBit.soundmotor.MotorB_On(duty_percent);
}
break;
}
}