fix naming and pin selection

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,

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
+    P3 = 40,  // CALLIOPE_ID_IO_P22
-    P4 = 11,  // MICROBIT_ID_IO_P4
+    C4 = 10,  // MICROBIT_ID_IO_P3
-    P5 = 12,  // MICROBIT_ID_IO_P5
+    C5 = 11,  // MICROBIT_ID_IO_P4
-    P6 = 13,  // MICROBIT_ID_IO_P6
+    C6 = 17,  // MICROBIT_ID_IO_P10
-    P7 = 14,  // MICROBIT_ID_IO_P7
+    C7 = 34,  // CALLIOPE_ID_IO_P7
-    //P8 = MICROBIT_ID_IO_P8,
+    C8 = 35,  // CALLIOPE_ID_IO_P8
-    P9 = 16,  // MICROBIT_ID_IO_P9
+    C9 = 36,  // CALLIOPE_ID_IO_P9
-    P10 = 17,  // MICROBIT_ID_IO_P10
+    C10 = 16,  // MICROBIT_ID_IO_P9
-    P11 = 18,  // MICROBIT_ID_IO_P11
+    C11 = 14,  // MICROBIT_ID_IO_P7
-    //P12 = MICROBIT_ID_IO_P12,
+    C12 = 13,  // MICROBIT_ID_IO_P6
-    //P13 = MICROBIT_ID_IO_P13,
+    C13 = 37,  // CALLIOPE_ID_IO_P13
-    //P14 = MICROBIT_ID_IO_P14,
+    C14 = 38,  // CALLIOPE_ID_IO_P14
-    //P15 = MICROBIT_ID_IO_P15,
+    C15 = 39,  // CALLIOPE_ID_IO_P15
     //P16 = MICROBIT_ID_IO_P16,
-    P19 = 24,  // MICROBIT_ID_IO_P19
+    C19 = 24,  // MICROBIT_ID_IO_P19
-    P20 = 25,  // MICROBIT_ID_IO_P20
+    C20 = 25,  // MICROBIT_ID_IO_P20
-    P28 = 41,  // CALLIOPE_ID_IO_P28
-    P29 = 42,  // CALLIOPE_ID_IO_P29
-    P30 = 43,  // CALLIOPE_ID_IO_P30
     }
 
 
     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
+    //P3 = CALLIOPE_ID_IO_P22, -- does not work analogue
-    P4 = 11,  // MICROBIT_ID_IO_P4
+    C4 = 10,  // MICROBIT_ID_IO_P3
-    P10 = 17,  // MICROBIT_ID_IO_P10
+    C5 = 11,  // MICROBIT_ID_IO_P4
-    P29 = 42,  // CALLIOPE_ID_IO_P29
+    C6 = 17,  // MICROBIT_ID_IO_P10
-    P30 = 43,  // CALLIOPE_ID_IO_P30
     }
 
 

libs/core/pins.cpp

@@ -1,39 +1,35 @@
 #include "ksbit.h"
 
 enum class DigitalPin {
-    P0 = MICROBIT_ID_IO_P0,
+    P0 = MICROBIT_ID_IO_P0,   // edge connector 0
-    P1 = MICROBIT_ID_IO_P1,
+    P1 = MICROBIT_ID_IO_P1,   // edge connector 1
-    P2 = MICROBIT_ID_IO_P2,
+    P2 = MICROBIT_ID_IO_P2,   // edge connector 2
-    P3 = MICROBIT_ID_IO_P3,
+    P3 = CALLIOPE_ID_IO_P22,  // edge connector 3
-    P4 = MICROBIT_ID_IO_P4,
+    C4 = MICROBIT_ID_IO_P3,   // LED matrix C1
-    P5 = MICROBIT_ID_IO_P5,
+    C5 = MICROBIT_ID_IO_P4,   // LED matrix C2
-    P6 = MICROBIT_ID_IO_P6,
+    C6 = MICROBIT_ID_IO_P10,  // LED matrix C3
-    P7 = MICROBIT_ID_IO_P7,
+    C7 = CALLIOPE_ID_IO_P7,   // LED matrix C4
-    //P8 = MICROBIT_ID_IO_P8,
+    C8 = CALLIOPE_ID_IO_P8,   // LED matrix C5
-    P9 = MICROBIT_ID_IO_P9,
+    C9 = CALLIOPE_ID_IO_P9,   // LED matrix C6
-    P10 = MICROBIT_ID_IO_P10,
+    C10 = MICROBIT_ID_IO_P9,  // LED matrix C7
-    P11 = MICROBIT_ID_IO_P11,
+    C11 = MICROBIT_ID_IO_P7,  // LED matrix C8
-    //P12 = MICROBIT_ID_IO_P12,
+    C12 = MICROBIT_ID_IO_P6,  // LED matrix C9
-    //P13 = MICROBIT_ID_IO_P13,
+    C13 = CALLIOPE_ID_IO_P13, // LED matrix R1
-    //P14 = MICROBIT_ID_IO_P14,
+    C14 = CALLIOPE_ID_IO_P14, // LED matrix R2
-    //P15 = MICROBIT_ID_IO_P15,
+    C15 = CALLIOPE_ID_IO_P15, // LED matrix R3
     //P16 = MICROBIT_ID_IO_P16,
-    P19 = MICROBIT_ID_IO_P19,
+    C19 = MICROBIT_ID_IO_P19, // SCL
-    P20 = MICROBIT_ID_IO_P20,
+    C20 = MICROBIT_ID_IO_P20  // SDA
-    P28 = CALLIOPE_ID_IO_P28,
-    P29 = CALLIOPE_ID_IO_P29,
-    P30 = CALLIOPE_ID_IO_P30
 };
 
 enum class AnalogPin {
-    P0 = MICROBIT_ID_IO_P0,
+    //P0 = MICROBIT_ID_IO_P0, -- does not work analogue
-    P1 = MICROBIT_ID_IO_P1,
+    P1 = MICROBIT_ID_IO_P1,   // edge connector 1
-    P2 = MICROBIT_ID_IO_P2,
+    P2 = MICROBIT_ID_IO_P2,   // edge connector 2
-    P3 = MICROBIT_ID_IO_P3,
+    //P3 = CALLIOPE_ID_IO_P22, -- does not work analogue
-    P4 = MICROBIT_ID_IO_P4,
+    C4 = MICROBIT_ID_IO_P3,
-    P10 = MICROBIT_ID_IO_P10,
+    C5 = MICROBIT_ID_IO_P4,
-    P29 = CALLIOPE_ID_IO_P29,
+    C6 = MICROBIT_ID_IO_P10,
-    P30 = CALLIOPE_ID_IO_P30
 };
 
 enum class PulseValue {

libs/core/pxtparts.json

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

package.json

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

pxtarget.json

@@ -60,7 +60,7 @@
         "autoRun": true,
         "streams": true,
         "aspectRatio": 1.13,
-        "parts": false,
+        "parts": true,
         "partsAspectRatio": 0.69,
         "boardDefinition": {
             "visual": "calliope",
@@ -99,21 +99,21 @@
                 "P1": "EDGE_P1",
                 "P2": "EDGE_P2",
                 "P3": "EDGE_P3",
-                "P4": "C_P4",
+                "C4": "C_P4",
-                "P5": "C_P5",
+                "C5": "C_P5",
-                "P6": "C_P6",
+                "C6": "C_P6",
-                "P7": "C_P7",
+                "C7": "C_P7",
-                "P8": "C_P8",
+                "C8": "C_P8",
-                "P9": "C_P9",
+                "C9": "C_P9",
-                "P10": "C_P10",
+                "C10": "C_P10",
-                "P11": "C_P11",
+                "C11": "C_P11",
-                "P12": "C_P12",
+                "C12": "C_P12",
-                "P13": "C_P13",
+                "C13": "C_P13",
-                "P14": "C_P14",
+                "C14": "C_P14",
-                "P15": "C_P15",
+                "C15": "C_P15",
-                "P16": "C_P16",
+                "C16": "C_P16",
-                "P19": "C_P19",
+                "C19": "C_P19",
-                "P20": "C_P20",
+                "C20": "C_P20",
                 "EXT_PWR":"EXT_PWR", 
                 "SPKR":"EXT_PWR", 
                 "BTN_A": "BTN_A", 
@@ -127,15 +127,15 @@
                 "SCK": "P13"
             },
             "i2cPins": {
-                "SDA": "P20",
+                "SDA": "C20",
-                "SCL": "P19"
+                "SCL": "C19"
             },
             "analogInPins": [
-                "P0",
                 "P1",
                 "P2",
-                "P3",
+                "C4",
-                "P10"
+                "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": {

sim/state/accelerometer.ts

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

theme/style.less

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