From fae97ff42fa8fa6cd573fa211911864f5dcbbb1d Mon Sep 17 00:00:00 2001 From: "Tom Ball (MSR)" Date: Fri, 30 Aug 2024 17:28:57 -0700 Subject: [PATCH] remove jacdac for now --- pxt.json | 8 +------- sensorFactory.ts | 8 ++++++++ sensorSelect.ts | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pxt.json b/pxt.json index c9eecef..4c94586 100644 --- a/pxt.json +++ b/pxt.json @@ -7,13 +7,7 @@ "radio": "*", "microphone": "*", "datalogger": "*", - "pxt-arcadeshield": "github:microsoft/pxt-arcadeshield#v0.1.0", - "jacdac": "github:microsoft/pxt-jacdac#v1.9.28", - "jacdac-light-level": "github:microsoft/pxt-jacdac/light-level#v1.9.28", - "jacdac-soil-moisture": "github:microsoft/pxt-jacdac/tree/master/soil-moisture#v1.9.28", - "jacdac-distance": "github:microsoft/pxt-jacdac/tree/master/distance#v1.9.28", - "jacdac-temperature": "github:microsoft/pxt-jacdac/tree/master/temperature#v1.9.28", - "jacdac-flex": "github:microsoft/pxt-jacdac/tree/master/flex#v1.9.28" + "pxt-arcadeshield": "github:microsoft/pxt-arcadeshield#v0.1.0" }, "files": [ "keymap.ts", diff --git a/sensorFactory.ts b/sensorFactory.ts index 0c6f53b..8e12242 100644 --- a/sensorFactory.ts +++ b/sensorFactory.ts @@ -18,11 +18,19 @@ namespace microcode { else if ("Logo Pressed" || "Logo Press" || "LP") return new LogoPressSensor(); else if ("Volume" || "Volume" || "V") return new VolumeSensor(); else if ("Compass" || "Compass" || "C") return new CompassHeadingSensor(); + /* else if ("Jac Light" || "Jacdac Light" || "JL") return new JacdacLightSensor(); else if ("Jac Moist" || "Jacdac Moisture" || "JM") return new JacdacSoilMoistureSensor(); else if ("Jac Dist" || "Jacdac Distance" || "JD") return new JacdacDistanceSensor(); else if ("Jac Flex" || "Jacdac Flex" || "JF") return new JacdacFlexSensor(); else if ("Jac Temp" || "Jacdac Temperature" || "JT") return new JacdacTemperatureSensor(); + "jacdac": "github:microsoft/pxt-jacdac#v1.9.28", + "jacdac-light-level": "github:microsoft/pxt-jacdac/light-level#v1.9.28", + "jacdac-soil-moisture": "github:microsoft/pxt-jacdac/tree/master/soil-moisture#v1.9.28", + "jacdac-distance": "github:microsoft/pxt-jacdac/tree/master/distance#v1.9.28", + "jacdac-temperature": "github:microsoft/pxt-jacdac/tree/master/temperature#v1.9.28", + "jacdac-flex": "github:microsoft/pxt-jacdac/tree/master/flex#v1.9.28" + */ else return new AccelerometerXSensor() } } diff --git a/sensorSelect.ts b/sensorSelect.ts index 3a5a5ee..254aff8 100644 --- a/sensorSelect.ts +++ b/sensorSelect.ts @@ -36,14 +36,14 @@ namespace microcode { this.cursor.resetOutlineColourOnMove = true const icons: string[] = [ "accelerometer", "accelerometer", "accelerometer", "right_turn", "right_spin", "pin_0", "pin_1", "pin_2", - "led_light_sensor", "thermometer", "magnet", "finger_press", "speaker", "compass", "microbitLogoWhiteBackground", - "microbitLogoWhiteBackground", "microbitLogoWhiteBackground", "microbitLogoWhiteBackground", "microbitLogoWhiteBackground" + "led_light_sensor", "thermometer", "magnet", "finger_press", "speaker", "compass", + // "microbitLogoWhiteBackground","microbitLogoWhiteBackground", "microbitLogoWhiteBackground", "microbitLogoWhiteBackground", "microbitLogoWhiteBackground" ] const ariaIDs: string[] = [ "accelerometer X", "accelerometer Y", "accelerometer Z", "Pitch", "Roll", "A. Pin 0", "A. Pin 1", "A. Pin 2", "led_light_sensor", - "thermometer", "S10", "Logo Press", "Volume", "Compass", "Jacdac Flex", "Jacdac Temperature", "Jacdac Light", - "Jacdac Moisture", "Jacdac Distance" + "thermometer", "S10", "Logo Press", "Volume", "Compass", + // "Jacdac Flex", "Jacdac Temperature", "Jacdac Light", "Jacdac Moisture", "Jacdac Distance" ] //-----------------------------------------------------