Skip to content

Commit d3147c0

Browse files
committed
DistributedLogging fully re-enabled: Swapped out noArcadeShieldMode.ts for the base distributedLoggingProtocol, re-enabled DistributedLoggingScreen on home.ts. Had to cut memory by getting rid of the random taglines.
1 parent 9516205 commit d3147c0

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace microdata {
3636

3737
// Temp disabled elements relating to callbackObj (no mem)
3838
else
39-
new NoArcadeShieldMode(this);
39+
new DistributedLoggingProtocol(this, false);
4040
}
4141

4242
public pushScene(scene: Scene) {

home.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ namespace microdata {
1212
private recordDataBtn: Button
1313
private distributedLoggingBtn: Button
1414
private viewBtn: Button
15-
private tagline: string;
1615

1716
constructor(app: AppInterface) {
1817
super(app)
19-
this.tagline = ["Lets measure!", "Hello :)", "Lets experiment!", "Mini-measurer",
20-
"Record & view", "Data Science toolkit", "Start experimenting!", "for the micro:bit v2"][randint(0, 7)]
2118
}
2219

2320
/* override */ startup() {
@@ -59,8 +56,8 @@ namespace microdata {
5956
x: 20,
6057
y,
6158
onClick: () => {
62-
// this.app.popScene()
63-
// this.app.pushScene(new DistributedLoggingScreen(this.app)) // Temp disabled elements relating to callbackObj (no mem)
59+
this.app.popScene()
60+
this.app.pushScene(new DistributedLoggingScreen(this.app)) // Temp disabled elements relating to callbackObj (no mem)
6461
},
6562
})
6663

@@ -124,12 +121,12 @@ namespace microdata {
124121

125122
if (!this.yOffset) {
126123
Screen.print(
127-
this.tagline,
124+
"Mini-measurer",
128125
Screen.LEFT_EDGE +
129126
((Screen.WIDTH + wordLogo.width) >> 1)
130127
+ dy
131128
-
132-
font.charWidth * this.tagline.length,
129+
font.charWidth * "Mini-measurer".length,
133130
Screen.TOP_EDGE +
134131
OFFSET +
135132
wordLogo.height +

pxt.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"dataRecorder.ts",
3434
"tabularDataViewer.ts",
3535
"generateGraph.ts",
36-
"noArcadeShieldMode.ts",
3736
"distributedLogging.ts"
3837
],
3938
"testFiles": [],

0 commit comments

Comments
 (0)