Skip to content

[stable9.0] Fix sim digitalReadPin and make digital pins toggle switches (#7117) #7121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Robert Knight (microbit-robert) wants to merge 1 commit into
base: stable9.0
Choose a base branch
from
+43 −13
Open

[stable9.0] Fix sim digitalReadPin and make digital pins toggle switches (#7117) #7121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sim/state/edgeconnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace pxsim.pins {
let pin = getPin(pinId);
if (!pin) return -1;
pin.mode = PinFlags.Digital | PinFlags.Input;
return pin.value > 100 ? 1 : 0;
return pin.value > 0 ? 1 : 0;
}

export function digitalWritePin(pinId: number, value: number) {
Expand Down
2 changes: 1 addition & 1 deletion sim/state/edgeconnectorsim.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace pxsim {

digitalReadPin(): number {
this.mode = PinFlags.Digital | PinFlags.Input;
return this.value > 100 ? 1 : 0;
return this.value > 0 ? 1 : 0;
}

digitalWritePin(value: number) {
Expand Down
52 changes: 41 additions & 11 deletions sim/visuals/microbit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,6 @@ path.sim-board {
else if (pin.mode & PinFlags.Digital) {
v = pin.value > 0 ? "0%" : "100%";
if (text) text.textContent = pin.value > 0 ? "1" : "0";
ariaValueNow = pin.value > 0 ? 1 : 0;
}
else if (pin.mode & PinFlags.Touch) {
v = pin.touched ? "0%" : "100%";
Expand All @@ -653,11 +652,27 @@ path.sim-board {
this.pins[index].removeAttribute("aria-valuenow");
this.pins[index].removeAttribute("aria-valuetext");
this.pins[index].removeAttribute("aria-readonly");
this.pins[index].removeAttribute("aria-checked");
} else if (pin.mode & PinFlags.Digital) {
this.pins[index].setAttribute("role", "switch");
this.pins[index].ariaLabel = this.pins[index].firstChild.textContent;
this.pins[index].setAttribute("aria-checked", pin.value > 0 ? "true" : "false");
this.pins[index].removeAttribute("aria-valuemin");
this.pins[index].removeAttribute("aria-valuemax");
this.pins[index].removeAttribute("aria-orientation");
this.pins[index].removeAttribute("aria-valuenow");
this.pins[index].removeAttribute("aria-valuetext");
if (pin.mode & PinFlags.Input) {
this.pins[index].removeAttribute("aria-readonly");
} else {
this.pins[index].setAttribute("aria-readonly", "true");
}
} else {
this.pins[index].removeAttribute("aria-checked");
this.pins[index].setAttribute("role", "slider");
this.pins[index].ariaLabel = this.pins[index].firstChild.textContent;
this.pins[index].setAttribute("aria-valuemin", "0");
this.pins[index].setAttribute("aria-valuemax", pin.mode & PinFlags.Analog ? "1023" : "1");
this.pins[index].setAttribute("aria-valuemax", "1023");
this.pins[index].setAttribute("aria-orientation", "vertical");
this.pins[index].setAttribute("aria-valuenow", ariaValueNow.toString() ?? "");
// Check that the text content isn't just a plain int and only set aria-valuetext if required.
Expand Down Expand Up @@ -1534,11 +1549,9 @@ path.sim-board {
let state = this.board;
let pin = state.edgeConnectorState.pins[index];
let svgpin = this.pins[index];
if (pin.mode & PinFlags.Input && !(pin.mode & PinFlags.Touch)) {
if (pin.mode & PinFlags.Input && pin.mode & PinFlags.Analog && !(pin.mode & PinFlags.Touch)) {
let cursor = svg.cursorPoint(pt, this.element, ev);
let maxValue = pin.mode & PinFlags.Analog ? 1023 : 1;
let v = (400 - cursor.y) / 40 * maxValue;
pin.value = Math.max(0, Math.min(maxValue, Math.floor(v)));
pin.value = analogPinValueFromCursorY(cursor.y);
}
this.updatePin(pin, index);
},
Expand All @@ -1548,11 +1561,9 @@ path.sim-board {
let pin = state.edgeConnectorState.pins[index];
let svgpin = this.pins[index];
U.addClass(svgpin, "touched");
if (pin.mode & PinFlags.Input && !(pin.mode & PinFlags.Touch)) {
if (pin.mode & PinFlags.Input && pin.mode & PinFlags.Analog && !(pin.mode & PinFlags.Touch)) {
let cursor = svg.cursorPoint(pt, this.element, ev);
let maxValue = pin.mode & PinFlags.Analog ? 1023 : 1;
let v = (400 - cursor.y) / 40 * maxValue;
pin.value = Math.max(0, Math.min(maxValue, Math.floor(v)));
pin.value = analogPinValueFromCursorY(cursor.y);
}
this.updatePin(pin, index);
},
Expand All @@ -1575,6 +1586,15 @@ path.sim-board {
this.updatePin(pin, index);
}
});
// Toggle on click rather than pointerdown as screen readers in browse mode
// activate a switch by dispatching a click.
pin.addEventListener("click", () => {
const pin = this.board.edgeConnectorState.pins[index];
if (pin.mode & PinFlags.Digital && pin.mode & PinFlags.Input) {
pin.value = pin.value > 0 ? 0 : 1;
this.updatePin(pin, index);
}
});
})
}

Expand Down Expand Up @@ -1781,9 +1801,15 @@ path.sim-board {
return undefined;
}

const analogPinValueFromCursorY = (y: number): number => {
const fraction = (400 - y) / 40;
return Math.max(0, Math.min(1023, Math.floor(fraction * 1023)));
}

const pinKeyHandler = (e: KeyboardEvent, currentValue: number, min: number, max: number, pinMode: PinFlags): number | undefined => {
const key = e.key;
if (isHandledKey(key)) {
const isToggleKey = pinMode & PinFlags.Digital && (key === " " || key === "Enter");
if (isHandledKey(key) || isToggleKey) {
if (!(pinMode & PinFlags.Input)) {
e.preventDefault();
accessibility.setLiveContent(pxsim.localization.lf("This pin is read-only"));
Expand All @@ -1795,6 +1821,10 @@ path.sim-board {
return undefined;
}
}
if (isToggleKey) {
e.preventDefault();
return currentValue > 0 ? 0 : 1;
}
// The pin value for a digital pin may be higher than 1 depending on how its value was set.
const currentValueClamped = Math.min(max, currentValue);
return commonKeyHandler(e, currentValueClamped, min, max);
Expand Down