Skip to content

Commit

Permalink
DistributedLogging fully re-enabled: Swapped out noArcadeShieldMode.t…
Browse files Browse the repository at this point in the history
…s for the base distributedLoggingProtocol, re-enabled DistributedLoggingScreen on home.ts. Had to cut memory by getting rid of the random taglines.
  • Loading branch information
KierPalin committed Nov 22, 2024
1 parent 9516205 commit d3147c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace microdata {

// Temp disabled elements relating to callbackObj (no mem)
else
new NoArcadeShieldMode(this);
new DistributedLoggingProtocol(this, false);
}

public pushScene(scene: Scene) {
Expand Down
11 changes: 4 additions & 7 deletions home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ namespace microdata {
private recordDataBtn: Button
private distributedLoggingBtn: Button
private viewBtn: Button
private tagline: string;

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

/* override */ startup() {
Expand Down Expand Up @@ -59,8 +56,8 @@ namespace microdata {
x: 20,
y,
onClick: () => {
// this.app.popScene()
// this.app.pushScene(new DistributedLoggingScreen(this.app)) // Temp disabled elements relating to callbackObj (no mem)
this.app.popScene()
this.app.pushScene(new DistributedLoggingScreen(this.app)) // Temp disabled elements relating to callbackObj (no mem)
},
})

Expand Down Expand Up @@ -124,12 +121,12 @@ namespace microdata {

if (!this.yOffset) {
Screen.print(
this.tagline,
"Mini-measurer",
Screen.LEFT_EDGE +
((Screen.WIDTH + wordLogo.width) >> 1)
+ dy
-
font.charWidth * this.tagline.length,
font.charWidth * "Mini-measurer".length,
Screen.TOP_EDGE +
OFFSET +
wordLogo.height +
Expand Down
1 change: 0 additions & 1 deletion pxt.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"dataRecorder.ts",
"tabularDataViewer.ts",
"generateGraph.ts",
"noArcadeShieldMode.ts",
"distributedLogging.ts"
],
"testFiles": [],
Expand Down

0 comments on commit d3147c0

Please sign in to comment.