Skip to content

Commit 1983a04

Browse files
committed
fixes
1 parent 0e03c64 commit 1983a04

4 files changed

Lines changed: 1285 additions & 490 deletions

File tree

dataViewSelect.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,6 @@ namespace microdata {
2424

2525
// Includes the header:
2626
this.dataloggerEmpty = datalogger.getNumberOfRows() <= 1
27-
28-
//---------
29-
// Control:
30-
//---------
31-
32-
// No data in log (first row are headers)
33-
if (this.dataloggerEmpty) {
34-
context.onEvent(
35-
ControllerButtonEvent.Pressed,
36-
controller.A.id,
37-
() => {
38-
this.app.popScene()
39-
this.app.pushScene(new SensorSelect(this.app, MicroDataSceneEnum.RecordingConfigSelect))
40-
}
41-
)
42-
43-
context.onEvent(
44-
ControllerButtonEvent.Pressed,
45-
controller.B.id,
46-
() => {
47-
this.app.popScene()
48-
this.app.pushScene(new Home(this.app))
49-
}
50-
)
51-
}
5227

5328
const y = Screen.HEIGHT * 0.234 // y = 30 on an Arcade Shield of height 128 pixels
5429

@@ -101,6 +76,31 @@ namespace microdata {
10176
},
10277
})
10378
]])
79+
80+
//---------
81+
// Control:
82+
//---------
83+
84+
// No data in log (first row are headers)
85+
if (this.dataloggerEmpty) {
86+
context.onEvent(
87+
ControllerButtonEvent.Pressed,
88+
controller.A.id,
89+
() => {
90+
this.app.popScene()
91+
this.app.pushScene(new SensorSelect(this.app, MicroDataSceneEnum.RecordingConfigSelect))
92+
}
93+
)
94+
}
95+
96+
context.onEvent(
97+
ControllerButtonEvent.Pressed,
98+
controller.B.id,
99+
() => {
100+
this.app.popScene()
101+
this.app.pushScene(new Home(this.app))
102+
}
103+
)
104104
}
105105

106106
draw() {

home.ts

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

7676
private drawVersion() {
7777
const font = bitmaps.font5
78-
const text = "v1.7.4"
78+
const text = "v1.7.5"
7979
Screen.print(
8080
text,
8181
Screen.RIGHT_EDGE - (font.charWidth * text.length),

pxt.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "1.7.5",
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.33",
6+
"core": "file:../core",
7+
"radio": "file:../radio",
8+
"microphone": "file:../microphone",
9+
"datalogger": "file:../datalogger",
10+
"user-interface-base": "file:../user-interface-base",
1111
"jacdac": "github:jacdac/pxt-jacdac#v1.9.40",
1212
"jacdac-light-level": "github:jacdac/pxt-jacdac/light-level#v1.9.40",
1313
"jacdac-soil-moisture": "github:jacdac/pxt-jacdac/soil-moisture#v1.9.40",

0 commit comments

Comments
 (0)