Skip to content

feat(mixer): add buzzer to unified PWM/PINIO/LED output selection #2654

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
sensei-hacker wants to merge 10 commits into
base: maintenance-10.x
Choose a base branch
from
Open

feat(mixer): add buzzer to unified PWM/PINIO/LED output selection #2654

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7947c8
feat(mixer): add BEEPER as a runtime-assignable timer output mode
sensei-hacker Jun 7, 2026
198349b
fix(mixer): show Buzzer in JS-computed output table when BEEPER mode …
sensei-hacker Jun 8, 2026
96aad44
feat(mixer): move timer output mode selectors into Output Mapping table
sensei-hacker Jun 8, 2026
3ea94ff
feat(mixer): use colspan timer row so all output cells are uniform he…
sensei-hacker Jun 8, 2026
0093daf
feat(mixer): show compile-time buzzer pad in Output Mapping table
sensei-hacker Jun 8, 2026
73fdbf9
feat(mixer): label LED/Buzzer pads and pre-select their mode in timer…
sensei-hacker Jun 8, 2026
59caa55
fix(mixer): correct timer override fallback and gap-fill guard
sensei-hacker Jun 8, 2026
8e03a7a
style(mixer): address SonarQube minor issues
sensei-hacker Jun 8, 2026
68162b8
refactor(mixer): extract helpers to reduce cognitive complexity
sensei-hacker Jun 9, 2026
e95a469
mixer adjustment for small screenS: show timer label once per group, …
sensei-hacker Jun 9, 2026
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
Prev Previous commit
Next Next commit
style(mixer): address SonarQube minor issues 
Use for-of loops and Array.at(-1) as suggested by static analysis.
  • Loading branch information
@sensei-hacker
sensei-hacker committed Jun 8, 2026
commit 8e03a7aa3c629d6b0cb328444b957046b2dc4510
14 changes: 7 additions & 7 deletions js/outputMapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ var OutputMappingCollection = function () {

function isTimerDefault(timerId, flag) {
let found = false;
for (let i = 0; i < data.length; i++) {
if (data[i]['timerId'] !== timerId) continue;
let flags = data[i]['usageFlags'];
for (const entry of data) {
if (entry['timerId'] !== timerId) continue;
const flags = entry['usageFlags'];
if (BitHelper.bit_check(flags, TIM_USE_MOTOR) || BitHelper.bit_check(flags, TIM_USE_SERVO)) return false;
if (BitHelper.bit_check(flags, flag)) found = true;
}
Expand All @@ -129,11 +129,11 @@ var OutputMappingCollection = function () {
self.isTimerDefaultLed = function(timerId) {
// LED can also be identified by specialLabels, so check both.
let hasLed = false;
for (let i = 0; i < data.length; i++) {
if (data[i]['timerId'] !== timerId) continue;
let flags = data[i]['usageFlags'];
for (const entry of data) {
if (entry['timerId'] !== timerId) continue;
const flags = entry['usageFlags'];
if (BitHelper.bit_check(flags, TIM_USE_MOTOR) || BitHelper.bit_check(flags, TIM_USE_SERVO)) return false;
if (BitHelper.bit_check(flags, TIM_USE_LED) || data[i]['specialLabels'] === SPECIAL_LABEL_LED) hasLed = true;
if (BitHelper.bit_check(flags, TIM_USE_LED) || entry['specialLabels'] === SPECIAL_LABEL_LED) hasLed = true;
}
return hasLed;
}
Expand Down
4 changes: 2 additions & 2 deletions tabs/mixer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ mixerTab.initialize = function (callback, scrollPosition) {
for (let i = 0; i < outputCount; i++) {
let timerId = FC.OUTPUT_MAPPING.getTimerId(i);
let color = FC.OUTPUT_MAPPING.getOutputTimerColor(i);
if (groups.length > 0 && groups[groups.length - 1].timerId === timerId) {
groups[groups.length - 1].count++;
if (groups.length > 0 && groups.at(-1).timerId === timerId) {
groups.at(-1).count++;
} else {
groups.push({ timerId, count: 1, color });
}
Expand Down