Skip to content

Commit c7d40a1

Browse files
committed
Making MicroData only use local depencies (file:../), removing jacdac dependencies, and removing headless mode. This is useful for Wireless Display-Shield (WDS) compilation.
1 parent e582559 commit c7d40a1

3 files changed

Lines changed: 12 additions & 73 deletions

File tree

app.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ namespace microdata {
2929
reportEvent("app.start")
3030

3131
this.sceneManager = new SceneManager()
32-
datalogger.includeTimestamp(FlashLogTimeStampFormat.None)
32+
// datalogger.includeTimestamp(FlashLogTimeStampFormat.None)
3333

34-
const arcadeShieldConnected = shieldhelpers.shieldPresent();
35-
if (arcadeShieldConnected)
36-
this.pushScene(new microdata.Home(this));
37-
else
38-
new HeadlessMode(this);
34+
// const arcadeShieldConnected = shieldhelpers.shieldPresent();
35+
// if (arcadeShieldConnected)
36+
this.pushScene(new microdata.Home(this));
37+
// else
38+
// new HeadlessMode(this);
3939
}
4040

4141
public pushScene(scene: Scene) {

pxt.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@
33
"version": "1.7.4",
44
"description": "Data science with micro:bit v2",
55
"dependencies": {
6-
"core": "*",
7-
"radio": "*",
8-
"microphone": "*",
9-
"datalogger": "*",
10-
"user-interface-base": "github:microbit-apps/user-interface-base#v0.0.17",
11-
"jacdac": "github:microsoft/pxt-jacdac#v1.9.28",
12-
"jacdac-light-level": "github:microsoft/pxt-jacdac/light-level#v1.9.28",
13-
"jacdac-soil-moisture": "github:microsoft/pxt-jacdac/soil-moisture#v1.9.28",
14-
"jacdac-distance": "github:microsoft/pxt-jacdac/distance#v1.9.28",
15-
"jacdac-temperature": "github:microsoft/pxt-jacdac/temperature#v1.9.28",
16-
"jacdac-flex": "github:microsoft/pxt-jacdac/flex#v1.9.28"
6+
"core": "file:../core",
7+
"radio": "file:../radio",
8+
"microphone": "file:../microphone",
9+
"datalogger": "file:../datalogger",
10+
"user-interface-base": "file:../user-interface-base"
1711
},
1812
"files": [
1913
"analytics.ts",

sensors.ts

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ namespace microdata {
447447
isJacdacSensor: false
448448
});
449449

450-
else if (name == "Compass" || name == "C")
450+
else
451451
return new Sensor({
452452
name: "Compass",
453453
rName: "C",
@@ -461,61 +461,6 @@ namespace microdata {
461461
// Jacdac Sensors:
462462
// See https://github.com/microsoft/pxt-jacdac
463463
//--------------------------------------------
464-
465-
else if (name == "Jac Light" || name == "Jacdac Light" || name == "JL")
466-
return new Sensor({
467-
name: "Jac Light",
468-
rName: "JL",
469-
f: () => modules.lightLevel1.isConnected() ? modules.lightLevel1.lightLevel() : undefined,
470-
min: 0,
471-
max: 100,
472-
isJacdacSensor: true,
473-
setupFn: () => modules.lightLevel1.start()
474-
});
475-
476-
else if (name == "Jac Moist" || name == "Jacdac Moisture" || name == "JM")
477-
return new Sensor({
478-
name: "Jac Moist",
479-
rName: "JM",
480-
f: () => modules.soilMoisture1.isConnected() ? modules.soilMoisture1.moisture() : undefined,
481-
min: 0,
482-
max: 100,
483-
isJacdacSensor: true,
484-
setupFn: () => modules.soilMoisture1.start()
485-
});
486-
487-
else if (name == "Jac Dist" || name == "Jacdac Distance" || name == "JD")
488-
return new Sensor({
489-
name: "Jac Dist",
490-
rName: "JD",
491-
f: () => modules.distance1.isConnected() ? modules.distance1.distance() : undefined,
492-
min: 0,
493-
max: 4,
494-
isJacdacSensor: true,
495-
setupFn: () => modules.distance1.start()
496-
});
497-
498-
else if (name == "Jac Flex" || name == "Jacdac Flex" || name == "JF")
499-
return new Sensor({
500-
name: "Jac Flex",
501-
rName: "JF",
502-
f: () => modules.flex1.isConnected() ? modules.flex1.bending() : undefined,
503-
min: -100,
504-
max: 100,
505-
isJacdacSensor: true,
506-
setupFn: () => modules.flex1.start()
507-
});
508-
509-
else
510-
return new Sensor({
511-
name: "Jac Temp",
512-
rName: "JT",
513-
f: () => modules.temperature1.isConnected() ? modules.temperature1.temperature() : undefined,
514-
min: -40,
515-
max: 120,
516-
isJacdacSensor: true,
517-
setupFn: () => modules.temperature1.start()
518-
});
519464
}
520465

521466

0 commit comments

Comments
 (0)