Compare commits

...

12 Commits

Author SHA1 Message Date
ce24e9d923 0.5.75 2016-11-10 21:22:25 +01:00
7ee5b4112b remove undefined pins 2016-11-10 21:20:48 +01:00
d903901de2 Merge branch 'pin-update' 2016-11-10 21:05:31 +01:00
9d589971f5 0.5.74 2016-11-10 11:33:48 -08:00
c6807d67d8 0.5.73 2016-11-10 11:31:21 -08:00
05ff9282ac Bump pxt-core to 0.5.65 2016-11-10 11:31:19 -08:00
2825d09eae 0.5.72 2016-11-10 10:11:16 -08:00
15d4a594ae adding hover style on categories 2016-11-10 10:10:03 -08:00
a0b426bdf0 disable simulator crash, disable parts 2016-11-10 10:06:38 -08:00
580f1bf24e 0.5.71 2016-11-10 09:35:40 -08:00
29cc6eaded Bump pxt-core to 0.5.64 2016-11-10 09:35:36 -08:00
6671d1864c updated dal.d.ts 2016-11-10 09:13:25 -08:00
5 changed files with 16 additions and 11 deletions

View File

@ -185,7 +185,7 @@
"pinDistance": 65, "pinDistance": 65,
"pinLocations": [ "pinLocations": [
{"x": 89, "y": 48}, {"x": 89, "y": 48},
{"x": 395, "y": 48} ] {"x": 393, "y": 48} ]
}, },
"pinDefinitions": [ "pinDefinitions": [
{ "target": "M_OUT1", "style": "croc", "orientation": "-Z"}, { "target": "M_OUT1", "style": "croc", "orientation": "-Z"},

View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "0.5.70", "version": "0.5.75",
"description": "calliope target for PXT", "description": "calliope target for PXT",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -30,7 +30,7 @@
"typescript": "^1.8.7" "typescript": "^1.8.7"
}, },
"dependencies": { "dependencies": {
"pxt-core": "0.5.62", "pxt-core": "0.5.65",
"less": "^2.6.0", "less": "^2.6.0",
"semantic-ui-less": "^2.2.4" "semantic-ui-less": "^2.2.4"
} }

View File

@ -60,7 +60,7 @@
"autoRun": true, "autoRun": true,
"streams": true, "streams": true,
"aspectRatio": 1.13, "aspectRatio": 1.13,
"parts": true, "parts": false,
"partsAspectRatio": 0.69, "partsAspectRatio": 0.69,
"boardDefinition": { "boardDefinition": {
"visual": "calliope", "visual": "calliope",
@ -111,15 +111,14 @@
"C13": "C_P13", "C13": "C_P13",
"C14": "C_P14", "C14": "C_P14",
"C15": "C_P15", "C15": "C_P15",
"C16": "C_P16",
"C19": "C_P19", "C19": "C_P19",
"C20": "C_P20", "C20": "C_P20",
"EXT_PWR":"EXT_PWR", "EXT_PWR":"EXT_PWR",
"SPKR":"EXT_PWR", "SPKR":"EXT_PWR",
"BTN_A": "BTN_A", "BTN_A": "BTN_A",
"BTN_B": "BTN_B", "BTN_B": "BTN_B",
"M_OUT1": "M_OUT1", "MOTOR1": "M_OUT1",
"M_OUT2": "M_OUT2" "MOTOR2": "M_OUT2"
}, },
"spiPins": { "spiPins": {
"MOSI": "P15", "MOSI": "P15",
@ -127,8 +126,8 @@
"SCK": "P13" "SCK": "P13"
}, },
"i2cPins": { "i2cPins": {
"SDA": "C20", "SDA": "C_P20",
"SCL": "C19" "SCL": "C_P19"
}, },
"analogInPins": [ "analogInPins": [
"P1", "P1",

View File

@ -199,8 +199,9 @@ namespace pxsim {
if (force < sq(DAL.MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE)) if (force < sq(DAL.MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE))
return DAL.MICROBIT_ACCELEROMETER_EVT_FREEFALL; return DAL.MICROBIT_ACCELEROMETER_EVT_FREEFALL;
if (force > sq(DAL.MICROBIT_ACCELEROMETER_3G_TOLERANCE)) // TODO: fix this
return DAL.MICROBIT_ACCELEROMETER_EVT_3G; //if (force > sq(DAL.MICROBIT_ACCELEROMETER_3G_TOLERANCE))
// return DAL.MICROBIT_ACCELEROMETER_EVT_3G;
if (force > sq(DAL.MICROBIT_ACCELEROMETER_6G_TOLERANCE)) if (force > sq(DAL.MICROBIT_ACCELEROMETER_6G_TOLERANCE))
return DAL.MICROBIT_ACCELEROMETER_EVT_6G; return DAL.MICROBIT_ACCELEROMETER_EVT_6G;

View File

@ -4,6 +4,7 @@
@import 'themes/default/globals/site.variables'; @import 'themes/default/globals/site.variables';
@import 'themes/pxt/globals/site.variables'; @import 'themes/pxt/globals/site.variables';
@import 'site/globals/site.variables'; @import 'site/globals/site.variables';
@import 'themes/default/collections/menu.variables';
/* Reference import */ /* Reference import */
@import (reference) "semantic.less"; @import (reference) "semantic.less";
@ -44,6 +45,10 @@
border-radius:5px; border-radius:5px;
} }
.blocklyTreeRow:hover {
background: @invertedBackground !important;
}
/* This removes any padding at the top of the toolbox */ /* This removes any padding at the top of the toolbox */
.blocklyTreeRoot { .blocklyTreeRoot {
padding: 0px !important; padding: 0px !important;