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

Upgrades (#14)

Browse Source 
* enable tracing

* more config adjustments

* upgrading images

* upgrading input

* upgrading led

* upgraded pins api

* upgrade runtime

* upgrading pxt.h

* upgrading basic.cpp

* upgraded control

* upgraded control.ts

* upgrading core.cpp

* updating shims

* fixing merge issues

* upgrading BLE config
This commit is contained in:
Peli de Halleux
2017-12-14 11:00:47 -08:00
committed by GitHub
parent a1f1911eb0
commit 2250aa9d4b
16 changed files with 854 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,47 @@ declare namespace basic {
*/
//% block="6g"
SixG = 10, // MICROBIT_ACCELEROMETER_EVT_6G
/**
* Raised when a 8G shock is detected
*/
//% block="8g"
EightG = 11, // MICROBIT_ACCELEROMETER_EVT_8G
}
declare const enum MesDpadButtonInfo {
//% block="A down"
ADown = 1, // MES_DPAD_BUTTON_A_DOWN
//% block="A up"
AUp = 2, // MES_DPAD_BUTTON_A_UP
//% block="B down"
BDown = 3, // MES_DPAD_BUTTON_B_DOWN
//% block="B up"
BUp = 4, // MES_DPAD_BUTTON_B_UP
//% block="C down"
CDown = 5, // MES_DPAD_BUTTON_C_DOWN
//% block="C up"
CUp = 6, // MES_DPAD_BUTTON_C_UP
//% block="D down"
DDown = 7, // MES_DPAD_BUTTON_D_DOWN
//% block="D up"
DUp = 8, // MES_DPAD_BUTTON_D_UP
//% block="1 down"
_1Down = 9, // MES_DPAD_BUTTON_1_DOWN
//% block="1 up"
_1Up = 10, // MES_DPAD_BUTTON_1_UP
//% block="2 down"
_2Down = 11, // MES_DPAD_BUTTON_2_DOWN
//% block="2 up"
_2Up = 12, // MES_DPAD_BUTTON_2_UP
//% block="3 down"
_3Down = 13, // MES_DPAD_BUTTON_3_DOWN
//% block="3 up"
_3Up = 14, // MES_DPAD_BUTTON_3_UP
//% block="4 down"
_4Down = 15, // MES_DPAD_BUTTON_4_DOWN
//% block="4 up"
_4Up = 16, // MES_DPAD_BUTTON_4_UP
}
declare namespace input {
}
@@ -138,98 +179,191 @@ declare namespace input {
declare const enum EventBusSource {
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_BUTTON_A = 1, // MICROBIT_ID_BUTTON_A
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_BUTTON_B = 2, // MICROBIT_ID_BUTTON_B
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_BUTTON_AB = 26, // MICROBIT_ID_BUTTON_AB
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_RADIO = 29, // MICROBIT_ID_RADIO
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_GESTURE = 27, // MICROBIT_ID_GESTURE
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_ACCELEROMETER = 4, // MICROBIT_ID_ACCELEROMETER
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P0 = 7, // MICROBIT_ID_IO_P0
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P1 = 8, // MICROBIT_ID_IO_P1
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P2 = 9, // MICROBIT_ID_IO_P2
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P3 = 10, // MICROBIT_ID_IO_P3
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P4 = 11, // MICROBIT_ID_IO_P4
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P5 = 12, // MICROBIT_ID_IO_P5
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P6 = 13, // MICROBIT_ID_IO_P6
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P7 = 14, // MICROBIT_ID_IO_P7
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P8 = 15, // MICROBIT_ID_IO_P8
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P9 = 16, // MICROBIT_ID_IO_P9
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P10 = 17, // MICROBIT_ID_IO_P10
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P11 = 18, // MICROBIT_ID_IO_P11
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P12 = 19, // MICROBIT_ID_IO_P12
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P13 = 20, // MICROBIT_ID_IO_P13
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P14 = 21, // MICROBIT_ID_IO_P14
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P15 = 22, // MICROBIT_ID_IO_P15
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P16 = 23, // MICROBIT_ID_IO_P16
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P19 = 24, // MICROBIT_ID_IO_P19
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P20 = 25, // MICROBIT_ID_IO_P20
//% blockIdentity="control.eventSourceId"
MICROBIT_ID_IO_P21 = 50, // MICROBIT_ID_IO_P21
//% blockIdentity="control.eventSourceId"
MES_DEVICE_INFO_ID = 1103, // MES_DEVICE_INFO_ID
//% blockIdentity="control.eventSourceId"
MES_SIGNAL_STRENGTH_ID = 1101, // MES_SIGNAL_STRENGTH_ID
//% blockIdentity="control.eventSourceId"
MES_DPAD_CONTROLLER_ID = 1104, // MES_DPAD_CONTROLLER_ID
//% blockIdentity="control.eventSourceId"
MES_BROADCAST_GENERAL_ID = 2000, // MES_BROADCAST_GENERAL_ID
}
declare const enum EventBusValue {
//% blockIdentity="control.eventValueId"
MICROBIT_EVT_ANY = 0, // MICROBIT_EVT_ANY
//% blockIdentity="control.eventValueId"
MICROBIT_BUTTON_EVT_DOWN = 1, // MICROBIT_BUTTON_EVT_DOWN
//% blockIdentity="control.eventValueId"
MICROBIT_BUTTON_EVT_UP = 2, // MICROBIT_BUTTON_EVT_UP
//% blockIdentity="control.eventValueId"
MICROBIT_BUTTON_EVT_CLICK = 3, // MICROBIT_BUTTON_EVT_CLICK
//% blockIdentity="control.eventValueId"
MICROBIT_RADIO_EVT_DATAGRAM = 1, // MICROBIT_RADIO_EVT_DATAGRAM
//% blockIdentity="control.eventValueId"
MICROBIT_ACCELEROMETER_EVT_DATA_UPDATE = 1, // MICROBIT_ACCELEROMETER_EVT_DATA_UPDATE
//% blockIdentity="control.eventValueId"
MICROBIT_PIN_EVT_RISE = 2, // MICROBIT_PIN_EVT_RISE
//% blockIdentity="control.eventValueId"
MICROBIT_PIN_EVT_FALL = 3, // MICROBIT_PIN_EVT_FALL
//% blockIdentity="control.eventValueId"
MICROBIT_PIN_EVT_PULSE_HI = 4, // MICROBIT_PIN_EVT_PULSE_HI
//% blockIdentity="control.eventValueId"
MICROBIT_PIN_EVT_PULSE_LO = 5, // MICROBIT_PIN_EVT_PULSE_LO
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_ALARM1 = 6, // MES_ALERT_EVT_ALARM1
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_ALARM2 = 7, // MES_ALERT_EVT_ALARM2
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_ALARM3 = 8, // MES_ALERT_EVT_ALARM3
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_ALARM4 = 9, // MES_ALERT_EVT_ALARM4
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_ALARM5 = 10, // MES_ALERT_EVT_ALARM5
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_ALARM6 = 11, // MES_ALERT_EVT_ALARM6
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_DISPLAY_TOAST = 1, // MES_ALERT_EVT_DISPLAY_TOAST
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_FIND_MY_PHONE = 5, // MES_ALERT_EVT_FIND_MY_PHONE
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_PLAY_RINGTONE = 4, // MES_ALERT_EVT_PLAY_RINGTONE
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_PLAY_SOUND = 3, // MES_ALERT_EVT_PLAY_SOUND
//% blockIdentity="control.eventValueId"
MES_ALERT_EVT_VIBRATE = 2, // MES_ALERT_EVT_VIBRATE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_LAUNCH_PHOTO_MODE = 1, // MES_CAMERA_EVT_LAUNCH_PHOTO_MODE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_LAUNCH_VIDEO_MODE = 2, // MES_CAMERA_EVT_LAUNCH_VIDEO_MODE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_START_VIDEO_CAPTURE = 4, // MES_CAMERA_EVT_START_VIDEO_CAPTURE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_STOP_PHOTO_MODE = 6, // MES_CAMERA_EVT_STOP_PHOTO_MODE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_STOP_VIDEO_CAPTURE = 5, // MES_CAMERA_EVT_STOP_VIDEO_CAPTURE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_STOP_VIDEO_MODE = 7, // MES_CAMERA_EVT_STOP_VIDEO_MODE
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_TAKE_PHOTO = 3, // MES_CAMERA_EVT_TAKE_PHOTO
//% blockIdentity="control.eventValueId"
MES_CAMERA_EVT_TOGGLE_FRONT_REAR = 8, // MES_CAMERA_EVT_TOGGLE_FRONT_REAR
//% blockIdentity="control.eventValueId"
MES_DEVICE_DISPLAY_OFF = 5, // MES_DEVICE_DISPLAY_OFF
//% blockIdentity="control.eventValueId"
MES_DEVICE_DISPLAY_ON = 6, // MES_DEVICE_DISPLAY_ON
//% blockIdentity="control.eventValueId"
MES_DEVICE_GESTURE_DEVICE_SHAKEN = 4, // MES_DEVICE_GESTURE_DEVICE_SHAKEN
//% blockIdentity="control.eventValueId"
MES_DEVICE_INCOMING_CALL = 7, // MES_DEVICE_INCOMING_CALL
//% blockIdentity="control.eventValueId"
MES_DEVICE_INCOMING_MESSAGE = 8, // MES_DEVICE_INCOMING_MESSAGE
//% blockIdentity="control.eventValueId"
MES_DEVICE_ORIENTATION_LANDSCAPE = 1, // MES_DEVICE_ORIENTATION_LANDSCAPE
//% blockIdentity="control.eventValueId"
MES_DEVICE_ORIENTATION_PORTRAIT = 2, // MES_DEVICE_ORIENTATION_PORTRAIT
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_1_DOWN = 9, // MES_DPAD_BUTTON_1_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_1_UP = 10, // MES_DPAD_BUTTON_1_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_2_DOWN = 11, // MES_DPAD_BUTTON_2_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_2_UP = 12, // MES_DPAD_BUTTON_2_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_3_DOWN = 13, // MES_DPAD_BUTTON_3_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_3_UP = 14, // MES_DPAD_BUTTON_3_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_4_DOWN = 15, // MES_DPAD_BUTTON_4_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_4_UP = 16, // MES_DPAD_BUTTON_4_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_A_DOWN = 1, // MES_DPAD_BUTTON_A_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_A_UP = 2, // MES_DPAD_BUTTON_A_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_B_DOWN = 3, // MES_DPAD_BUTTON_B_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_B_UP = 4, // MES_DPAD_BUTTON_B_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_C_DOWN = 5, // MES_DPAD_BUTTON_C_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_C_UP = 6, // MES_DPAD_BUTTON_C_UP
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_D_DOWN = 7, // MES_DPAD_BUTTON_D_DOWN
//% blockIdentity="control.eventValueId"
MES_DPAD_BUTTON_D_UP = 8, // MES_DPAD_BUTTON_D_UP
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_FORWARD = 6, // MES_REMOTE_CONTROL_EVT_FORWARD
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_NEXTTRACK = 4, // MES_REMOTE_CONTROL_EVT_NEXTTRACK
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_PAUSE = 2, // MES_REMOTE_CONTROL_EVT_PAUSE
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_PLAY = 1, // MES_REMOTE_CONTROL_EVT_PLAY
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_PREVTRACK = 5, // MES_REMOTE_CONTROL_EVT_PREVTRACK
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_REWIND = 7, // MES_REMOTE_CONTROL_EVT_REWIND
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_STOP = 3, // MES_REMOTE_CONTROL_EVT_STOP
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_VOLUMEDOWN = 9, // MES_REMOTE_CONTROL_EVT_VOLUMEDOWN
//% blockIdentity="control.eventValueId"
MES_REMOTE_CONTROL_EVT_VOLUMEUP = 8, // MES_REMOTE_CONTROL_EVT_VOLUMEUP
}
declare namespace control {