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

fix touch pin for rev 0.3 board

Browse Source
This commit is contained in:
Matthias L. Jugel
2016-10-26 12:54:21 +02:00
parent 739be09ac9
commit d6d64f3edb
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,3 @@
/*basic.showString("RGB")
basic.setLedColor(Colors.Blue) basic.setLedColor(Colors.Blue)
basic.pause(500) basic.pause(500)
basic.setLedColor(Colors.Red) basic.setLedColor(Colors.Red)
@@ -8,7 +7,6 @@ basic.pause(500)
basic.setLedColor(Colors.Violet) basic.setLedColor(Colors.Violet)
basic.pause(500) basic.pause(500)
basic.setLedColor(0); basic.setLedColor(0);
basic.showString("Gesten")
input.onGesture(Gesture.Shake, () => { input.onGesture(Gesture.Shake, () => {
basic.showString("S") basic.showString("S")
}) })
@@ -39,7 +37,6 @@ input.onGesture(Gesture.ThreeG, () => {
input.onGesture(Gesture.SixG, () => { input.onGesture(Gesture.SixG, () => {
basic.showString("6") basic.showString("6")
}) })
*/
input.onPinPressed(TouchPin.P0, () => { input.onPinPressed(TouchPin.P0, () => {
basic.showNumber(0) basic.showNumber(0)
}) })

3
libs/core/enums.d.ts vendored
View File

@@ -37,7 +37,7 @@ declare namespace basic {
P0 = 7, // MICROBIT_ID_IO_P0 P0 = 7, // MICROBIT_ID_IO_P0
P1 = 8, // MICROBIT_ID_IO_P1 P1 = 8, // MICROBIT_ID_IO_P1
P2 = 9, // MICROBIT_ID_IO_P2 P2 = 9, // MICROBIT_ID_IO_P2
P3 = 33, // CALLIOPE_ID_IO_P3 P3 = 40, // CALLIOPE_ID_IO_P22
} }
@@ -264,6 +264,7 @@ declare namespace motors {
//P16 = MICROBIT_ID_IO_P16, //P16 = MICROBIT_ID_IO_P16,
P19 = 24, // MICROBIT_ID_IO_P19 P19 = 24, // MICROBIT_ID_IO_P19
P20 = 25, // MICROBIT_ID_IO_P20 P20 = 25, // MICROBIT_ID_IO_P20
P22 = 40, // CALLIOPE_ID_IO_P22
} }

2
libs/core/input.cpp
View File

@@ -29,7 +29,7 @@ enum class TouchPin {
P0 = MICROBIT_ID_IO_P0, P0 = MICROBIT_ID_IO_P0,
P1 = MICROBIT_ID_IO_P1, P1 = MICROBIT_ID_IO_P1,
P2 = MICROBIT_ID_IO_P2, P2 = MICROBIT_ID_IO_P2,
P3 = CALLIOPE_ID_IO_P3 P3 = CALLIOPE_ID_IO_P22
}; };
enum class AcceleratorRange { enum class AcceleratorRange {