Skip to content

Commit a73b863

Browse files
committed
Removed jacdacSensor usage; adjusted sensorSelect as appropriate, re-added noArcadeShieldMode and its distributedLogging.
1 parent d3147c0 commit a73b863

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-16
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 DistributedLoggingProtocol(this, false);
39+
new NoArcadeShieldMode(this);
4040
}
4141

4242
public pushScene(scene: Scene) {

noArcadeShieldMode.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace microdata {
3838
};
3939

4040
/** For module inside of B button. */
41-
const SENSOR_SELECTION_SIZE = 4;
41+
const SENSOR_SELECTION_SIZE = 5;
4242
/** How long should each LED picture be shown for? Series of pictures divide this by how many there are. */
4343
const SHOW_EACH_SENSOR_FOR_MS: number = 1000;
4444

@@ -369,7 +369,7 @@ namespace microdata {
369369
return [new MagnetSensor()]
370370

371371
case UI_SENSOR_SELECT_STATE.RADIO:
372-
// new DistributedLoggingProtocol(this.app, false);
372+
new DistributedLoggingProtocol(this.app, false);
373373
return []
374374

375375
default:

pxt.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
"version.ts",
2626
"utils.ts",
2727
"sensors.ts",
28-
"jacdacSensors.ts",
2928
"liveDataViewer.ts",
3029
"dataViewSelect.ts",
3130
"loggingConfig.ts",
3231
"sensorSelect.ts",
3332
"dataRecorder.ts",
3433
"tabularDataViewer.ts",
3534
"generateGraph.ts",
36-
"distributedLogging.ts"
35+
"distributedLogging.ts",
36+
"noArcadeShieldMode.ts"
3737
],
3838
"testFiles": [],
3939
"targetVersions": {

sensorSelect.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,20 @@ namespace microdata {
4747
this.cursor.resetOutlineColourOnMove = true
4848
const icons: string[] = [
4949
"accelerometer", "accelerometer", "accelerometer", "right_turn", "right_spin", "pin_0", "pin_1", "pin_2",
50-
"led_light_sensor", "thermometer", "magnet", "finger_press", "microphone", "compass", "microbitLogoWhiteBackground",
51-
"microbitLogoWhiteBackground", "microbitLogoWhiteBackground", "microbitLogoWhiteBackground", "microbitLogoWhiteBackground"
50+
"led_light_sensor", "thermometer", "magnet", "finger_press", "microphone", "compass"
5251
]
5352

5453
const ariaIDs: string[] = [
5554
"Accelerometer X", "Accelerometer Y", "Accelerometer Z", "Pitch", "Roll", "Analog Pin 0", "Analog Pin 1", "Analog Pin 2", "Light",
56-
"Temperature", "Magnet", "Logo Press", "Microphone", "Compass", "Jacdac Flex", "Jacdac Temperature", "Jacdac Light",
57-
"Jacdac Moisture", "Jacdac Distance"
55+
"Temperature", "Magnet", "Logo Press", "Microphone", "Compass"
5856
]
5957

6058
//-----------------------------------------------------
6159
// Organise buttons in 4x5 grid: same as GridNavigator:
6260
//-----------------------------------------------------
6361

6462
let x: number = -60;
65-
let y: number = -41
63+
let y: number = -40
6664
for (let i = 0; i < icons.length; i++) {
6765
this.btns.push(new Button({
6866
parent: null,
@@ -129,7 +127,7 @@ namespace microdata {
129127
x += 30
130128
if (x > 60) {
131129
x = -60
132-
y += Screen.HEIGHT * 0.21875 // 28 on 128 pixel high Arcade Shield
130+
y += Screen.HEIGHT * 0.34 // 0.21875 // 28 on 128 pixel high Arcade Shield
133131
}
134132
}
135133

sensors.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,7 @@ namespace microdata {
465465
else if (name == "Logo Pressed" || name == "Logo Press" || name == "LP") return new LogoPressSensor();
466466
else if (name == "Volume" || name == "Microphone" || name == "V") return new VolumeSensor();
467467
else if (name == "Compass" || name == "C") return new CompassHeadingSensor();
468-
else if (name == "Jac Light" || name == "Jacdac Light" || name == "JL") return new JacdacLightSensor();
469-
else if (name == "Jac Moist" || name == "Jacdac Moisture" || name == "JM") return new JacdacSoilMoistureSensor();
470-
else if (name == "Jac Dist" || name == "Jacdac Distance" || name == "JD") return new JacdacDistanceSensor();
471-
// else if (name == "Jac Flex" || name == "Jacdac Flex" || name == "JF") return new JacdacFlexSensor(); //
472-
else return new JacdacTemperatureSensor()
468+
else return new AccelerometerXSensor()
473469
}
474470

475471
//---------------------

0 commit comments

Comments
 (0)