Merge branch 'rev03-changes'

# Conflicts: # libs/core/motors.cpp # libs/core/music.cpp # package.json
2016-11-09 11:56:14 +01:00
parent 981910fb0a f666d3375e
commit e701d83dc5
8 changed files with 40 additions and 12 deletions
--- a/libs/core/input.cpp
+++ b/libs/core/input.cpp
@ -29,7 +29,7 @@ enum class TouchPin {
    P0 = MICROBIT_ID_IO_P0,
    P1 = MICROBIT_ID_IO_P1,
    P2 = MICROBIT_ID_IO_P2,
-    P3 = CALLIOPE_ID_IO_P3
+    P3 = CALLIOPE_ID_IO_P22
 };

 enum class AcceleratorRange {