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

fixing pin mapping

Browse Source
This commit is contained in:
Peli de Halleux 2016-09-29 15:20:45 -07:00
parent 4b583e221b
commit 00278036a4
6 changed files with 265 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/microbit/control.cpp
View File

@ -34,15 +34,15 @@ enum EventBusSource {
MICROBIT_ID_IO_P5_ = MICROBIT_ID_IO_P5,
MICROBIT_ID_IO_P6_ = MICROBIT_ID_IO_P6,
MICROBIT_ID_IO_P7_ = MICROBIT_ID_IO_P7,
MICROBIT_ID_IO_P8_ = MICROBIT_ID_IO_P8,
//MICROBIT_ID_IO_P8_ = MICROBIT_ID_IO_P8,
MICROBIT_ID_IO_P9_ = MICROBIT_ID_IO_P9,
MICROBIT_ID_IO_P10_ = MICROBIT_ID_IO_P10,
MICROBIT_ID_IO_P11_ = MICROBIT_ID_IO_P11,
MICROBIT_ID_IO_P12_ = MICROBIT_ID_IO_P12,
MICROBIT_ID_IO_P13_ = MICROBIT_ID_IO_P13,
MICROBIT_ID_IO_P14_ = MICROBIT_ID_IO_P14,
MICROBIT_ID_IO_P15_ = MICROBIT_ID_IO_P15,
MICROBIT_ID_IO_P16_ = MICROBIT_ID_IO_P16,
//MICROBIT_ID_IO_P12_ = MICROBIT_ID_IO_P12,
//MICROBIT_ID_IO_P13_ = MICROBIT_ID_IO_P13,
//MICROBIT_ID_IO_P14_ = MICROBIT_ID_IO_P14,
//MICROBIT_ID_IO_P15_ = MICROBIT_ID_IO_P15,
//MICROBIT_ID_IO_P16_ = MICROBIT_ID_IO_P16,
MICROBIT_ID_IO_P19_ = MICROBIT_ID_IO_P19,
MICROBIT_ID_IO_P20_ = MICROBIT_ID_IO_P20,
MES_DEVICE_INFO_ID_ = MES_DEVICE_INFO_ID,

227
libs/microbit/dal.d.ts vendored
View File

@ -79,6 +79,7 @@ declare const enum DAL {
MICROBIT_BLE_PAIRING_TIMEOUT = 90,
MICROBIT_BLE_POWER_LEVELS = 8,
MICROBIT_BLE_MAXIMUM_BONDS = 4,
MICROBIT_BLE_EDDYSTONE_URL_ADV_INTERVAL = 400,
// built/yt/yotta_modules/microbit-dal/inc//bluetooth/MicroBitButtonService.h
// built/yt/yotta_modules/microbit-dal/inc//bluetooth/MicroBitDFUService.h
MICROBIT_DFU_OPCODE_START_DFU = 1,
@ -88,6 +89,7 @@ declare const enum DAL {
// built/yt/yotta_modules/microbit-dal/inc//bluetooth/MicroBitIOPinService.h
MICROBIT_IO_PIN_SERVICE_PINCOUNT = 19,
MICROBIT_IO_PIN_SERVICE_DATA_SIZE = 10,
MICROBIT_PWM_PIN_SERVICE_DATA_SIZE = 2,
// built/yt/yotta_modules/microbit-dal/inc//bluetooth/MicroBitLEDService.h
MICROBIT_BLE_MAXIMUM_SCROLLTEXT = 20,
// built/yt/yotta_modules/microbit-dal/inc//bluetooth/MicroBitMagnetometerService.h
@ -131,15 +133,9 @@ declare const enum DAL {
MICROBIT_ID_IO_P5 = 12,
MICROBIT_ID_IO_P6 = 13,
MICROBIT_ID_IO_P7 = 14,
MICROBIT_ID_IO_P8 = 15,
MICROBIT_ID_IO_P9 = 16,
MICROBIT_ID_IO_P10 = 17,
MICROBIT_ID_IO_P11 = 18,
MICROBIT_ID_IO_P12 = 19,
MICROBIT_ID_IO_P13 = 20,
MICROBIT_ID_IO_P14 = 21,
MICROBIT_ID_IO_P15 = 22,
MICROBIT_ID_IO_P16 = 23,
MICROBIT_ID_IO_P19 = 24,
MICROBIT_ID_IO_P20 = 25,
MICROBIT_ID_BUTTON_AB = 26,
@ -149,6 +145,13 @@ declare const enum DAL {
MICROBIT_ID_RADIO_DATA_READY = 30,
MICROBIT_ID_MULTIBUTTON_ATTACH = 31,
MICROBIT_ID_SERIAL = 32,
CALLIOPE_ID_IO_P0 = 33,
CALLIOPE_ID_IO_P7 = 34,
CALLIOPE_ID_IO_P8 = 35,
CALLIOPE_ID_IO_P9 = 36,
CALLIOPE_ID_IO_P13 = 37,
CALLIOPE_ID_IO_P14 = 38,
CALLIOPE_ID_IO_P15 = 39,
MICROBIT_ID_MESSAGE_BUS_LISTENER = 1021,
MICROBIT_ID_NOTIFY_ONE = 1022,
MICROBIT_ID_NOTIFY = 1023,
@ -186,15 +189,220 @@ declare const enum DAL {
MICROBIT_DISPLAY_EVT_FREE = 1,
MICROBIT_SERIAL_EVT_TX_EMPTY = 2,
MICROBIT_UART_S_EVT_TX_EMPTY = 3,
// built/yt/yotta_modules/microbit-dal/inc//drivers/CalliopeRGB.h
RGB_LED_DEFAULT_GREEN = 0,
RGB_LED_DEFAULT_RED = 0,
RGB_LED_DEFAULT_BLUE = 0,
RGB_LED_DEFAULT_WHITE = 0,
RGB_KEEP_VALUE = -1,
RGB_LED_MAX_INTENSITY = 50,
// built/yt/yotta_modules/microbit-dal/inc//drivers/CalliopeSoundMotor.h
CALLIOPE_SM_DEFAULT_DUTY_M = 50,
CALLIOPE_SM_DEFAULT_DUTY_S = 100,
CALLIOPE_SM_DEFAULT_FREQUENCY_S = 4000,
CALLIOPE_SM_DEFAULT_SILENT_MODE = 1,
CALLIOPE_SM_PRESCALER_M = 2,
CALLIOPE_SM_PRESCALER_S = 0,
CALLIOPE_SM_PRESCALER_S_LF = 4,
CALLIOPE_SM_PERIOD_M = 100,
CALLIOPE_MIN_FREQUENCY_HZ_S_NP = 245,
CALLIOPE_MIN_FREQUENCY_HZ_S = 20,
CALLIOPE_MAX_FREQUENCY_HZ_S = 20000,
CALLIOPE_BOARD_FREQUENCY = 16000000,
// built/yt/yotta_modules/microbit-dal/inc//drivers/DynamicPwm.h
NO_PWMS = 3,
MICROBIT_DEFAULT_PWM_PERIOD = 20000,
PWM_PERSISTENCE_TRANSIENT = 1,
PWM_PERSISTENCE_PERSISTENT = 2,
// built/yt/yotta_modules/microbit-dal/inc//drivers/MicroBitAccelerometer.h
// built/yt/yotta_modules/microbit-dal/inc//drivers/MicroBitAccelerometer-bmx.h
BMX055_ACC_WHOAMI = 0x00,
BMX055_ACC_D_X_LSB = 0x02,
BMX055_ACC_D_X_MSB = 0x03,
BMX055_ACC_D_Y_LSB = 0x04,
BMX055_ACC_D_Y_MSB = 0x05,
BMX055_ACC_D_Z_LSB = 0x06,
BMX055_ACC_D_Z_MSB = 0x07,
BMX055_ACC_D_TEMP = 0x08,
BMX055_ACC_INT_STATUS_0 = 0x09,
BMX055_ACC_INT_STATUS_1 = 0x0A,
BMX055_ACC_INT_STATUS_2 = 0x0B,
BMX055_ACC_INT_STATUS_3 = 0x0C,
BMX055_ACC_FIFO_STATUS = 0x0E,
BMX055_ACC_PMU_RANGE = 0x0F,
BMX055_ACC_PMU_BW = 0x10,
BMX055_ACC_PMU_LPW = 0x11,
BMX055_ACC_PMU_LOW_POWER = 0x12,
BMX055_ACC_D_HBW = 0x13,
BMX055_ACC_BGW_SOFTRESET = 0x14,
BMX055_ACC_INT_EN_0 = 0x16,
BMX055_ACC_INT_EN_1 = 0x17,
BMX055_ACC_INT_EN_2 = 0x18,
BMX055_ACC_INT_MAP_0 = 0x19,
BMX055_ACC_INT_MAP_1 = 0x1A,
BMX055_ACC_INT_MAP_2 = 0x1B,
BMX055_ACC_INT_SRC = 0x1E,
BMX055_ACC_INT_OUT_CTRL = 0x20,
BMX055_ACC_INT_RST_LATCH = 0x21,
BMX055_ACC_INT_0 = 0x22,
BMX055_ACC_INT_1 = 0x23,
BMX055_ACC_INT_2 = 0x24,
BMX055_ACC_INT_3 = 0x25,
BMX055_ACC_INT_4 = 0x26,
BMX055_ACC_INT_5 = 0x27,
BMX055_ACC_INT_6 = 0x28,
BMX055_ACC_INT_7 = 0x29,
BMX055_ACC_INT_8 = 0x2A,
BMX055_ACC_INT_9 = 0x2B,
BMX055_ACC_INT_A = 0x2C,
BMX055_ACC_INT_B = 0x2D,
BMX055_ACC_INT_C = 0x2E,
BMX055_ACC_INT_D = 0x2F,
BMX055_ACC_FIFO_CONFIG_0 = 0x30,
BMX055_ACC_PMU_SELF_TEST = 0x32,
BMX055_ACC_TRIM_NVM_CTRL = 0x33,
BMX055_ACC_BGW_SPI3_WDT = 0x34,
BMX055_ACC_OFC_CTRL = 0x36,
BMX055_ACC_OFC_SETTING = 0x37,
BMX055_ACC_OFC_OFFSET_X = 0x38,
BMX055_ACC_OFC_OFFSET_Y = 0x39,
BMX055_ACC_OFC_OFFSET_Z = 0x3A,
BMX055_ACC_TRIM_GPO = 0x3B,
BMX055_ACC_TRIM_GP1 = 0x3C,
BMX055_ACC_FIFO_CONFIG_1 = 0x3E,
BMX055_ACC_FIFO_DATA = 0x3F,
BMX055_GYRO_WHOAMI = 0x00,
BMX055_GYRO_RATE_X_LSB = 0x02,
BMX055_GYRO_RATE_X_MSB = 0x03,
BMX055_GYRO_RATE_Y_LSB = 0x04,
BMX055_GYRO_RATE_Y_MSB = 0x05,
BMX055_GYRO_RATE_Z_LSB = 0x06,
BMX055_GYRO_RATE_Z_MSB = 0x07,
BMX055_GYRO_INT_STATUS_0 = 0x09,
BMX055_GYRO_INT_STATUS_1 = 0x0A,
BMX055_GYRO_INT_STATUS_2 = 0x0B,
BMX055_GYRO_INT_STATUS_3 = 0x0C,
BMX055_GYRO_FIFO_STATUS = 0x0E,
BMX055_GYRO_RANGE = 0x0F,
BMX055_GYRO_BW = 0x10,
BMX055_GYRO_LPM1 = 0x11,
BMX055_GYRO_LPM2 = 0x12,
BMX055_GYRO_RATE_HBW = 0x13,
BMX055_GYRO_BGW_SOFTRESET = 0x14,
BMX055_GYRO_INT_EN_0 = 0x15,
BMX055_GYRO_INT_EN_1 = 0x16,
BMX055_GYRO_INT_MAP_0 = 0x17,
BMX055_GYRO_INT_MAP_1 = 0x18,
BMX055_GYRO_INT_MAP_2 = 0x19,
BMX055_GYRO_INT_SRC_1 = 0x1A,
BMX055_GYRO_INT_SRC_2 = 0x1B,
BMX055_GYRO_INT_SRC_3 = 0x1C,
BMX055_GYRO_FIFO_EN = 0x1E,
BMX055_GYRO_INT_RST_LATCH = 0x21,
BMX055_GYRO_HIGH_TH_X = 0x22,
BMX055_GYRO_HIGH_DUR_X = 0x23,
BMX055_GYRO_HIGH_TH_Y = 0x24,
BMX055_GYRO_HIGH_DUR_Y = 0x25,
BMX055_GYRO_HIGH_TH_Z = 0x26,
BMX055_GYRO_HIGH_DUR_Z = 0x27,
BMX055_GYRO_SOC = 0x31,
BMX055_GYRO_A_FOC = 0x32,
BMX055_GYRO_TRIM_NVM_CTRL = 0x33,
BMX055_GYRO_BGW_SPI3_WDT = 0x34,
BMX055_GYRO_OFC1 = 0x36,
BMX055_GYRO_OFC2 = 0x37,
BMX055_GYRO_OFC3 = 0x38,
BMX055_GYRO_OFC4 = 0x39,
BMX055_GYRO_TRIM_GP0 = 0x3A,
BMX055_GYRO_TRIM_GP1 = 0x3B,
BMX055_GYRO_BIST = 0x3C,
BMX055_GYRO_FIFO_CONFIG_0 = 0x3D,
BMX055_GYRO_FIFO_CONFIG_1 = 0x3E,
BMX055_MAG_WHOAMI = 0x40,
BMX055_MAG_Reserved = 0x41,
BMX055_MAG_XOUT_LSB = 0x42,
BMX055_MAG_XOUT_MSB = 0x43,
BMX055_MAG_YOUT_LSB = 0x44,
BMX055_MAG_YOUT_MSB = 0x45,
BMX055_MAG_ZOUT_LSB = 0x46,
BMX055_MAG_ZOUT_MSB = 0x47,
BMX055_MAG_ROUT_LSB = 0x48,
BMX055_MAG_ROUT_MSB = 0x49,
BMX055_MAG_INT_STATUS = 0x4A,
BMX055_MAG_PWR_CNTL1 = 0x4B,
BMX055_MAG_PWR_CNTL2 = 0x4C,
BMX055_MAG_INT_EN_1 = 0x4D,
BMX055_MAG_INT_EN_2 = 0x4E,
BMX055_MAG_LOW_THS = 0x4F,
BMX055_MAG_HIGH_THS = 0x50,
BMX055_MAG_REP_XY = 0x51,
BMX055_MAG_REP_Z = 0x52,
BMM050_DIG_X1 = 0x5D,
BMM050_DIG_Y1 = 0x5E,
BMM050_DIG_Z4_LSB = 0x62,
BMM050_DIG_Z4_MSB = 0x63,
BMM050_DIG_X2 = 0x64,
BMM050_DIG_Y2 = 0x65,
BMM050_DIG_Z2_LSB = 0x68,
BMM050_DIG_Z2_MSB = 0x69,
BMM050_DIG_Z1_LSB = 0x6A,
BMM050_DIG_Z1_MSB = 0x6B,
BMM050_DIG_XYZ1_LSB = 0x6C,
BMM050_DIG_XYZ1_MSB = 0x6D,
BMM050_DIG_Z3_LSB = 0x6E,
BMM050_DIG_Z3_MSB = 0x6F,
BMM050_DIG_XY2 = 0x70,
BMM050_DIG_XY1 = 0x71,
BMX055_ACC_ADDRESS = 0x18,
BMX055_GYRO_ADDRESS = 0x68,
BMX055_MAG_ADDRESS = 0x10,
MS5637_ADDRESS = 0x76,
AFS_2G = 0x03,
AFS_4G = 0x05,
AFS_8G = 0x08,
AFS_16G = 0x0C,
ABW_8Hz = 0,
ABW_16Hz = 1,
ABW_31Hz = 2,
ABW_63Hz = 3,
ABW_125Hz = 4,
ABW_250Hz = 5,
ABW_500Hz = 6,
ABW_100Hz = 7,
GFS_2000DPS = 0,
GFS_1000DPS = 1,
GFS_500DPS = 2,
GFS_250DPS = 3,
GFS_125DPS = 4,
G_2000Hz523Hz = 0,
G_2000Hz230Hz = 1,
G_1000Hz116Hz = 2,
G_400Hz47Hz = 3,
G_200Hz23Hz = 4,
G_100Hz12Hz = 5,
G_200Hz64Hz = 6,
G_100Hz32Hz = 7,
MODR_10Hz = 0,
MODR_2Hz = 1,
MODR_6Hz = 2,
MODR_8Hz = 3,
MODR_15Hz = 4,
MODR_20Hz = 5,
MODR_25Hz = 6,
MODR_30Hz = 7,
lowPower = 0,
Regular = 1,
enhancedRegular = 2,
highAccuracy = 3,
ADC_256 = 0x00,
ADC_512 = 0x02,
ADC_1024 = 0x04,
ADC_2048 = 0x06,
ADC_4096 = 0x08,
ADC_8192 = 0x0A,
ADC_D1 = 0x40,
ADC_D2 = 0x50,
MICROBIT_ACCEL_PITCH_ROLL_VALID = 0x02,
MICROBIT_ACCEL_ADDED_TO_IDLE = 0x04,
MMA8653_DEFAULT_ADDR = 0x3A,
MMA8653_STATUS = 0x00,
MMA8653_OUT_X_MSB = 0x01,
MMA8653_WHOAMI = 0x0D,
@ -231,6 +439,7 @@ declare const enum DAL {
MICROBIT_ACCELEROMETER_SHAKE_DAMPING = 10,
MICROBIT_ACCELEROMETER_SHAKE_RTX = 30,
MICROBIT_ACCELEROMETER_SHAKE_COUNT_THRESHOLD = 4,
// built/yt/yotta_modules/microbit-dal/inc//drivers/MicroBitAccelerometer.h
// built/yt/yotta_modules/microbit-dal/inc//drivers/MicroBitButton.h
MICROBIT_BUTTON_EVT_DOWN = 1,
MICROBIT_BUTTON_EVT_UP = 2,
@ -335,6 +544,7 @@ declare const enum DAL {
IO_STATUS_TOUCH_IN = 0x10,
IO_STATUS_EVENT_ON_EDGE = 0x20,
IO_STATUS_EVENT_PULSE_ON_EDGE = 0x40,
IO_STATUS_EVENTBUS_ENABLED = 0x80,
MICROBIT_PIN_MAX_OUTPUT = 1023,
MICROBIT_PIN_MAX_SERVO_RANGE = 180,
MICROBIT_PIN_DEFAULT_SERVO_RANGE = 2000,
@ -349,6 +559,7 @@ declare const enum DAL {
MICROBIT_PIN_EVT_PULSE_LO = 5,
PIN_CAPABILITY_DIGITAL = 0x01,
PIN_CAPABILITY_ANALOG = 0x02,
PIN_CAPABILITY_TOUCH = 0x04,
// built/yt/yotta_modules/microbit-dal/inc//drivers/MicroBitRadio.h
MICROBIT_RADIO_STATUS_INITIALISED = 0x0001,
MICROBIT_RADIO_BASE_ADDRESS = 0x75626974,

36
libs/microbit/enums.d.ts vendored
View File

@ -151,15 +151,15 @@ declare namespace input {
MICROBIT_ID_IO_P5 = 12, // MICROBIT_ID_IO_P5
MICROBIT_ID_IO_P6 = 13, // MICROBIT_ID_IO_P6
MICROBIT_ID_IO_P7 = 14, // MICROBIT_ID_IO_P7
MICROBIT_ID_IO_P8 = 15, // MICROBIT_ID_IO_P8
//MICROBIT_ID_IO_P8_ = MICROBIT_ID_IO_P8,
MICROBIT_ID_IO_P9 = 16, // MICROBIT_ID_IO_P9
MICROBIT_ID_IO_P10 = 17, // MICROBIT_ID_IO_P10
MICROBIT_ID_IO_P11 = 18, // MICROBIT_ID_IO_P11
MICROBIT_ID_IO_P12 = 19, // MICROBIT_ID_IO_P12
MICROBIT_ID_IO_P13 = 20, // MICROBIT_ID_IO_P13
MICROBIT_ID_IO_P14 = 21, // MICROBIT_ID_IO_P14
MICROBIT_ID_IO_P15 = 22, // MICROBIT_ID_IO_P15
MICROBIT_ID_IO_P16 = 23, // MICROBIT_ID_IO_P16
//MICROBIT_ID_IO_P12_ = MICROBIT_ID_IO_P12,
//MICROBIT_ID_IO_P13_ = MICROBIT_ID_IO_P13,
//MICROBIT_ID_IO_P14_ = MICROBIT_ID_IO_P14,
//MICROBIT_ID_IO_P15_ = MICROBIT_ID_IO_P15,
//MICROBIT_ID_IO_P16_ = MICROBIT_ID_IO_P16,
MICROBIT_ID_IO_P19 = 24, // MICROBIT_ID_IO_P19
MICROBIT_ID_IO_P20 = 25, // MICROBIT_ID_IO_P20
MES_DEVICE_INFO_ID = 1103, // MES_DEVICE_INFO_ID
@ -250,15 +250,15 @@ declare namespace led {
P5 = 12, // MICROBIT_ID_IO_P5
P6 = 13, // MICROBIT_ID_IO_P6
P7 = 14, // MICROBIT_ID_IO_P7
P8 = 15, // MICROBIT_ID_IO_P8
//P8 = MICROBIT_ID_IO_P8,
P9 = 16, // MICROBIT_ID_IO_P9
P10 = 17, // MICROBIT_ID_IO_P10
P11 = 18, // MICROBIT_ID_IO_P11
P12 = 19, // MICROBIT_ID_IO_P12
P13 = 20, // MICROBIT_ID_IO_P13
P14 = 21, // MICROBIT_ID_IO_P14
P15 = 22, // MICROBIT_ID_IO_P15
P16 = 23, // MICROBIT_ID_IO_P16
//P12 = MICROBIT_ID_IO_P12,
//P13 = MICROBIT_ID_IO_P13,
//P14 = MICROBIT_ID_IO_P14,
//P15 = MICROBIT_ID_IO_P15,
//P16 = MICROBIT_ID_IO_P16,
P19 = 24, // MICROBIT_ID_IO_P19
P20 = 25, // MICROBIT_ID_IO_P20
}
@ -294,12 +294,12 @@ declare namespace led {
P0 = 7, // MICROBIT_ID_IO_P0
P1 = 8, // MICROBIT_ID_IO_P1
P2 = 9, // MICROBIT_ID_IO_P2
P8 = 15, // MICROBIT_ID_IO_P8
P12 = 19, // MICROBIT_ID_IO_P12
P13 = 20, // MICROBIT_ID_IO_P13
P14 = 21, // MICROBIT_ID_IO_P14
P15 = 22, // MICROBIT_ID_IO_P15
P16 = 23, // MICROBIT_ID_IO_P16
//P8 = MICROBIT_ID_IO_P8,
//P12 = MICROBIT_ID_IO_P12,
//P13 = MICROBIT_ID_IO_P13,
//P14 = MICROBIT_ID_IO_P14,
//P15 = MICROBIT_ID_IO_P15,
//P16 = MICROBIT_ID_IO_P16
}

24
libs/microbit/pins.cpp
View File

@ -9,15 +9,15 @@ enum class DigitalPin {
P5 = MICROBIT_ID_IO_P5,
P6 = MICROBIT_ID_IO_P6,
P7 = MICROBIT_ID_IO_P7,
P8 = MICROBIT_ID_IO_P8,
//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,
P16 = MICROBIT_ID_IO_P16,
//P12 = MICROBIT_ID_IO_P12,
//P13 = MICROBIT_ID_IO_P13,
//P14 = MICROBIT_ID_IO_P14,
//P15 = MICROBIT_ID_IO_P15,
//P16 = MICROBIT_ID_IO_P16,
P19 = MICROBIT_ID_IO_P19,
P20 = MICROBIT_ID_IO_P20,
};
@ -55,15 +55,15 @@ MicroBitPin *getPin(int id) {
case MICROBIT_ID_IO_P5: return &uBit.io.P5;
case MICROBIT_ID_IO_P6: return &uBit.io.P6;
case MICROBIT_ID_IO_P7: return &uBit.io.P7;
case MICROBIT_ID_IO_P8: return &uBit.io.P8;
//case MICROBIT_ID_IO_P8: return &uBit.io.P8;
case MICROBIT_ID_IO_P9: return &uBit.io.P9;
case MICROBIT_ID_IO_P10: return &uBit.io.P10;
case MICROBIT_ID_IO_P11: return &uBit.io.P11;
case MICROBIT_ID_IO_P12: return &uBit.io.P12;
case MICROBIT_ID_IO_P13: return &uBit.io.P13;
case MICROBIT_ID_IO_P14: return &uBit.io.P14;
case MICROBIT_ID_IO_P15: return &uBit.io.P15;
case MICROBIT_ID_IO_P16: return &uBit.io.P16;
//case MICROBIT_ID_IO_P12: return &uBit.io.P12;
//case MICROBIT_ID_IO_P13: return &uBit.io.P13;
//case MICROBIT_ID_IO_P14: return &uBit.io.P14;
//case MICROBIT_ID_IO_P15: return &uBit.io.P15;
//case MICROBIT_ID_IO_P16: return &uBit.io.P16;
case MICROBIT_ID_IO_P19: return &uBit.io.P19;
case MICROBIT_ID_IO_P20: return &uBit.io.P20;
default: return NULL;

12
libs/microbit/serial.cpp
View File

@ -4,12 +4,12 @@ enum class SerialPin {
P0 = MICROBIT_ID_IO_P0,
P1 = MICROBIT_ID_IO_P1,
P2 = MICROBIT_ID_IO_P2,
P8 = MICROBIT_ID_IO_P8,
P12 = MICROBIT_ID_IO_P12,
P13 = MICROBIT_ID_IO_P13,
P14 = MICROBIT_ID_IO_P14,
P15 = MICROBIT_ID_IO_P15,
P16 = MICROBIT_ID_IO_P16
//P8 = MICROBIT_ID_IO_P8,
//P12 = MICROBIT_ID_IO_P12,
//P13 = MICROBIT_ID_IO_P13,
//P14 = MICROBIT_ID_IO_P14,
//P15 = MICROBIT_ID_IO_P15,
//P16 = MICROBIT_ID_IO_P16
};
enum class BaudRate {

8
pxtarget.json
View File

@ -179,10 +179,10 @@
},
"compileService": {
"yottaTarget": "bbc-microbit-classic-gcc",
"yottaCorePackage": "pxt-microbit-core",
"githubCorePackage": "microsoft/pxt-microbit-core",
"gittag": "v0.5.0",
"serviceId": "ws"
"yottaCorePackage": "pxt-calliope-core",
"githubCorePackage": "microsoft/pxt-calliope-core",
"gittag": "v0.5.2",
"serviceId": "calliope"
},
"serial": {
"manufacturerFilter": "^mbed$",