Skip to content

feat: Move audio driver setting from config.h to keyboard.json Form Editor #923

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

Merged
yoichiro merged 1 commit into from
Apr 12, 2026
Merged

feat: Move audio driver setting from config.h to keyboard.json Form Editor #923

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
27 changes: 0 additions & 27 deletions src/components/workbench/dialogs/ConfigHSettingsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import React, {
useMemo,
} from 'react';
import {
Autocomplete,
FormControlLabel,
Stack,
Switch,
Expand Down Expand Up @@ -148,7 +147,6 @@ export function ConfigHSettingsPanel(props: ConfigHSettingsPanelProps) {
// --- Audio ---
const [audioPin, setAudioPin] = useState('');
const [audioPinAlt, setAudioPinAlt] = useState('');
const [audioDriver, setAudioDriver] = useState('');
const [audioVoices, setAudioVoices] = useState(false);
const [audioInitDelay, setAudioInitDelay] = useState(false);

Expand Down Expand Up @@ -224,7 +222,6 @@ export function ConfigHSettingsPanel(props: ConfigHSettingsPanelProps) {
// Audio
setAudioPin(getNumeric(defines, 'AUDIO_PIN'));
setAudioPinAlt(getNumeric(defines, 'AUDIO_PIN_ALT'));
setAudioDriver(getNumeric(defines, 'AUDIO_DRIVER'));
setAudioVoices(getFlag(defines, 'AUDIO_VOICES'));
setAudioInitDelay(getFlag(defines, 'AUDIO_INIT_DELAY'));
} catch {
Expand Down Expand Up @@ -314,7 +311,6 @@ export function ConfigHSettingsPanel(props: ConfigHSettingsPanelProps) {
// Audio
setStr('AUDIO_PIN', audioPin);
setStr('AUDIO_PIN_ALT', audioPinAlt);
setStr('AUDIO_DRIVER', audioDriver);
setBool('AUDIO_VOICES', audioVoices);
setBool('AUDIO_INIT_DELAY', audioInitDelay);

Expand Down Expand Up @@ -359,7 +355,6 @@ export function ConfigHSettingsPanel(props: ConfigHSettingsPanelProps) {
usbVbusPin,
audioPin,
audioPinAlt,
audioDriver,
audioVoices,
audioInitDelay,
]);
Expand Down Expand Up @@ -943,28 +938,6 @@ export function ConfigHSettingsPanel(props: ConfigHSettingsPanelProps) {
'Secondary audio output pin for stereo or alternative output'
)}
/>
<Autocomplete
size="small"
freeSolo
options={[
'pwm_hardware',
'pwm_software',
'dac_basic',
'dac_additive',
]}
value={audioDriver}
onInputChange={(_e, value) => setAudioDriver(value)}
renderInput={(params) => (
<TextField
{...params}
label="AUDIO_DRIVER"
placeholder="pwm_hardware"
helperText={t(
'Audio driver (pwm_hardware, pwm_software, dac_basic, dac_additive)'
)}
/>
)}
/>
<SwitchField
label="AUDIO_VOICES"
checked={audioVoices}
Expand Down
62 changes: 61 additions & 1 deletion src/components/workbench/dialogs/KeyboardJsonEditorDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ export function KeyboardJsonSettingsPanel(
Record<string, boolean>
>({});

// Audio
const [audioDriver, setAudioDriver] = useState('');

// Encoder
const [encoderRotary, setEncoderRotary] = useState<EncoderEntry[]>([]);

Expand Down Expand Up @@ -302,6 +305,9 @@ export function KeyboardJsonSettingsPanel(
: {}
);

// Audio
setAudioDriver(json.audio?.driver ?? '');

// Encoder
if (Array.isArray(json.encoder?.rotary)) {
setEncoderRotary(
Expand Down Expand Up @@ -560,6 +566,17 @@ export function KeyboardJsonSettingsPanel(
}
}

// Audio
if (audioDriver) {
json.audio = json.audio || {};
json.audio.driver = audioDriver;
} else if (json.audio) {
delete json.audio.driver;
if (Object.keys(json.audio).length === 0) {
delete json.audio;
}
}

// Encoder
if (encoderRotary.length > 0) {
json.encoder = json.encoder || {};
Expand Down Expand Up @@ -618,6 +635,7 @@ export function KeyboardJsonSettingsPanel(
rgblightBriSteps,
rgblightMaxBrightness,
rgblightAnimations,
audioDriver,
encoderRotary,
features,
]);
Expand Down Expand Up @@ -752,6 +770,15 @@ export function KeyboardJsonSettingsPanel(
alignItems: 'flex-start',
}}
/>
<Tab
label={t('Audio')}
sx={{
minHeight: 36,
py: 0.5,
textTransform: 'none',
alignItems: 'flex-start',
}}
/>
<Tab
label={t('Encoder')}
sx={{
Expand Down Expand Up @@ -1372,8 +1399,41 @@ export function KeyboardJsonSettingsPanel(
</Stack>
)}

{/* === Encoder Tab === */}
{/* === Audio Tab === */}
{activeTab === 5 && (
<Stack spacing={3}>
<div>
<SectionHeader>{t('Audio')}</SectionHeader>
<Stack spacing={2} sx={{ mt: 1 }}>
<Autocomplete
size="small"
freeSolo
options={[
'pwm_hardware',
'pwm_software',
'dac_basic',
'dac_additive',
]}
value={audioDriver}
onInputChange={(_e, value) => setAudioDriver(value)}
renderInput={(params) => (
<TextField
{...params}
label={t('Driver')}
placeholder="pwm_hardware"
helperText={t(
'Audio driver (pwm_hardware, pwm_software, dac_basic, dac_additive)'
)}
/>
)}
/>
</Stack>
</div>
</Stack>
)}

{/* === Encoder Tab === */}
{activeTab === 6 && (
<Stack spacing={3}>
{/* Encoder Section */}
<div>
Expand Down
Loading