diff --git a/libs/core/dal.d.ts b/libs/core/dal.d.ts index 703ef35d..32b413d5 100644 --- a/libs/core/dal.d.ts +++ b/libs/core/dal.d.ts @@ -431,6 +431,7 @@ declare const enum DAL { MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE = 400, MICROBIT_ACCELEROMETER_SHAKE_TOLERANCE = 400, MICROBIT_ACCELEROMETER_2G_TOLERANCE = 2048, + MICROBIT_ACCELEROMETER_3G_TOLERANCE = 3072, MICROBIT_ACCELEROMETER_6G_TOLERANCE = 6144, MICROBIT_ACCELEROMETER_8G_TOLERANCE = 8192, MICROBIT_ACCELEROMETER_GESTURE_DAMPING = 5, diff --git a/libs/core/enums.d.ts b/libs/core/enums.d.ts index 8def741a..cf010a58 100644 --- a/libs/core/enums.d.ts +++ b/libs/core/enums.d.ts @@ -266,37 +266,33 @@ declare namespace motors { P0 = 7, // MICROBIT_ID_IO_P0 P1 = 8, // MICROBIT_ID_IO_P1 P2 = 9, // MICROBIT_ID_IO_P2 - P3 = 10, // MICROBIT_ID_IO_P3 - P4 = 11, // MICROBIT_ID_IO_P4 - P5 = 12, // MICROBIT_ID_IO_P5 - P6 = 13, // MICROBIT_ID_IO_P6 - P7 = 14, // MICROBIT_ID_IO_P7 - //P8 = MICROBIT_ID_IO_P8, - P9 = 16, // MICROBIT_ID_IO_P9 - P10 = 17, // MICROBIT_ID_IO_P10 - P11 = 18, // MICROBIT_ID_IO_P11 - //P12 = MICROBIT_ID_IO_P12, - //P13 = MICROBIT_ID_IO_P13, - //P14 = MICROBIT_ID_IO_P14, - //P15 = MICROBIT_ID_IO_P15, + P3 = 40, // CALLIOPE_ID_IO_P22 + C4 = 10, // MICROBIT_ID_IO_P3 + C5 = 11, // MICROBIT_ID_IO_P4 + C6 = 17, // MICROBIT_ID_IO_P10 + C7 = 34, // CALLIOPE_ID_IO_P7 + C8 = 35, // CALLIOPE_ID_IO_P8 + C9 = 36, // CALLIOPE_ID_IO_P9 + C10 = 16, // MICROBIT_ID_IO_P9 + C11 = 14, // MICROBIT_ID_IO_P7 + C12 = 13, // MICROBIT_ID_IO_P6 + C13 = 37, // CALLIOPE_ID_IO_P13 + C14 = 38, // CALLIOPE_ID_IO_P14 + C15 = 39, // CALLIOPE_ID_IO_P15 //P16 = MICROBIT_ID_IO_P16, - P19 = 24, // MICROBIT_ID_IO_P19 - P20 = 25, // MICROBIT_ID_IO_P20 - P28 = 41, // CALLIOPE_ID_IO_P28 - P29 = 42, // CALLIOPE_ID_IO_P29 - P30 = 43, // CALLIOPE_ID_IO_P30 + C19 = 24, // MICROBIT_ID_IO_P19 + C20 = 25, // MICROBIT_ID_IO_P20 } declare enum AnalogPin { - P0 = 7, // MICROBIT_ID_IO_P0 + //P0 = MICROBIT_ID_IO_P0, -- does not work analogue P1 = 8, // MICROBIT_ID_IO_P1 P2 = 9, // MICROBIT_ID_IO_P2 - P3 = 10, // MICROBIT_ID_IO_P3 - P4 = 11, // MICROBIT_ID_IO_P4 - P10 = 17, // MICROBIT_ID_IO_P10 - P29 = 42, // CALLIOPE_ID_IO_P29 - P30 = 43, // CALLIOPE_ID_IO_P30 + //P3 = CALLIOPE_ID_IO_P22, -- does not work analogue + C4 = 10, // MICROBIT_ID_IO_P3 + C5 = 11, // MICROBIT_ID_IO_P4 + C6 = 17, // MICROBIT_ID_IO_P10 } diff --git a/libs/core/pins.cpp b/libs/core/pins.cpp index ed867511..38bd5c11 100644 --- a/libs/core/pins.cpp +++ b/libs/core/pins.cpp @@ -1,39 +1,35 @@ #include "ksbit.h" enum class DigitalPin { - P0 = MICROBIT_ID_IO_P0, - P1 = MICROBIT_ID_IO_P1, - P2 = MICROBIT_ID_IO_P2, - P3 = MICROBIT_ID_IO_P3, - P4 = MICROBIT_ID_IO_P4, - P5 = MICROBIT_ID_IO_P5, - P6 = MICROBIT_ID_IO_P6, - P7 = MICROBIT_ID_IO_P7, - //P8 = MICROBIT_ID_IO_P8, - P9 = MICROBIT_ID_IO_P9, - P10 = MICROBIT_ID_IO_P10, - P11 = MICROBIT_ID_IO_P11, - //P12 = MICROBIT_ID_IO_P12, - //P13 = MICROBIT_ID_IO_P13, - //P14 = MICROBIT_ID_IO_P14, - //P15 = MICROBIT_ID_IO_P15, + P0 = MICROBIT_ID_IO_P0, // edge connector 0 + P1 = MICROBIT_ID_IO_P1, // edge connector 1 + P2 = MICROBIT_ID_IO_P2, // edge connector 2 + P3 = CALLIOPE_ID_IO_P22, // edge connector 3 + C4 = MICROBIT_ID_IO_P3, // LED matrix C1 + C5 = MICROBIT_ID_IO_P4, // LED matrix C2 + C6 = MICROBIT_ID_IO_P10, // LED matrix C3 + C7 = CALLIOPE_ID_IO_P7, // LED matrix C4 + C8 = CALLIOPE_ID_IO_P8, // LED matrix C5 + C9 = CALLIOPE_ID_IO_P9, // LED matrix C6 + C10 = MICROBIT_ID_IO_P9, // LED matrix C7 + C11 = MICROBIT_ID_IO_P7, // LED matrix C8 + C12 = MICROBIT_ID_IO_P6, // LED matrix C9 + C13 = CALLIOPE_ID_IO_P13, // LED matrix R1 + C14 = CALLIOPE_ID_IO_P14, // LED matrix R2 + C15 = CALLIOPE_ID_IO_P15, // LED matrix R3 //P16 = MICROBIT_ID_IO_P16, - P19 = MICROBIT_ID_IO_P19, - P20 = MICROBIT_ID_IO_P20, - P28 = CALLIOPE_ID_IO_P28, - P29 = CALLIOPE_ID_IO_P29, - P30 = CALLIOPE_ID_IO_P30 + C19 = MICROBIT_ID_IO_P19, // SCL + C20 = MICROBIT_ID_IO_P20 // SDA }; enum class AnalogPin { - P0 = MICROBIT_ID_IO_P0, - P1 = MICROBIT_ID_IO_P1, - P2 = MICROBIT_ID_IO_P2, - P3 = MICROBIT_ID_IO_P3, - P4 = MICROBIT_ID_IO_P4, - P10 = MICROBIT_ID_IO_P10, - P29 = CALLIOPE_ID_IO_P29, - P30 = CALLIOPE_ID_IO_P30 + //P0 = MICROBIT_ID_IO_P0, -- does not work analogue + P1 = MICROBIT_ID_IO_P1, // edge connector 1 + P2 = MICROBIT_ID_IO_P2, // edge connector 2 + //P3 = CALLIOPE_ID_IO_P22, -- does not work analogue + C4 = MICROBIT_ID_IO_P3, + C5 = MICROBIT_ID_IO_P4, + C6 = MICROBIT_ID_IO_P10, }; enum class PulseValue { diff --git a/pxtarget.json b/pxtarget.json index 4f8ec1ba..a4faef50 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -99,21 +99,21 @@ "P1": "EDGE_P1", "P2": "EDGE_P2", "P3": "EDGE_P3", - "P4": "C_P4", - "P5": "C_P5", - "P6": "C_P6", - "P7": "C_P7", - "P8": "C_P8", - "P9": "C_P9", - "P10": "C_P10", - "P11": "C_P11", - "P12": "C_P12", - "P13": "C_P13", - "P14": "C_P14", - "P15": "C_P15", - "P16": "C_P16", - "P19": "C_P19", - "P20": "C_P20", + "C4": "C_P4", + "C5": "C_P5", + "C6": "C_P6", + "C7": "C_P7", + "C8": "C_P8", + "C9": "C_P9", + "C10": "C_P10", + "C11": "C_P11", + "C12": "C_P12", + "C13": "C_P13", + "C14": "C_P14", + "C15": "C_P15", + "C16": "C_P16", + "C19": "C_P19", + "C20": "C_P20", "EXT_PWR":"EXT_PWR", "SPKR":"EXT_PWR", "BTN_A": "BTN_A", @@ -127,15 +127,15 @@ "SCK": "P13" }, "i2cPins": { - "SDA": "P20", - "SCL": "P19" + "SDA": "C20", + "SCL": "C19" }, "analogInPins": [ - "P0", "P1", "P2", - "P3", - "P10" + "C4", + "C5", + "C6" ], "groundPins": [ "EDGE_GND" @@ -169,7 +169,7 @@ "yottaTarget": "bbc-microbit-classic-gcc", "yottaCorePackage": "pxt-calliope-core", "githubCorePackage": "microsoft/pxt-calliope-core", - "gittag": "v0.5.13", + "gittag": "v0.5.14", "serviceId": "calliope" }, "serial": {