Skip to content

Fix TMR export for combined timer effects #31

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
paator merged 4 commits into from
Jun 26, 2026
Merged

Fix TMR export for combined timer effects #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44a25b4
Test A/B sync-buzzer export emits a linked alternating chain
ruguevara Jun 15, 2026
1aba6b1
Sync-buzzer export bugfix
ruguevara Jun 19, 2026
5c5d1b6
Fix merged TMR timer chain export
ruguevara Jun 26, 2026
c8fd3d8
Serve public module imports in dev
ruguevara Jun 26, 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
8 changes: 7 additions & 1 deletion src/lib/services/file/ay-export-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export type HardwareSidState = {

export type HardwareSyncBuzzerState = {
enabled: boolean;
pwm: boolean;
period: number;
periodLow: number;
waveform: number[];
waveformLoop: number;
};
Expand Down Expand Up @@ -212,7 +214,7 @@ function createDisabledSidState(): HardwareSidState {
}

function createDisabledSyncBuzzerState(): HardwareSyncBuzzerState {
return { enabled: false, period: 0, waveform: [0], waveformLoop: 0 };
return { enabled: false, pwm: false, period: 0, periodLow: 0, waveform: [0], waveformLoop: 0 };
}

function createDisabledFmState(): HardwareFmState {
Expand Down Expand Up @@ -294,7 +296,9 @@ export function extractHardwareSyncBuzzerStates(registerState: {
!!timerEffect?.enabled && timerEffect.kind === TIMER_EFFECT_KIND_ENVELOPE_SHAPE;
result.push({
enabled,
pwm: enabled && timerEffect.pwmMode === TIMER_PWM_MODE_BY_DUTY_INDEX,
period: timerEffect?.period ?? 0,
periodLow: timerEffect?.periodLow ?? timerEffect?.period ?? 0,
waveform: [...(timerEffect?.waveform ?? [0])],
waveformLoop: timerEffect?.waveformLoop ?? 0
});
Expand Down Expand Up @@ -380,7 +384,9 @@ export function syncBuzzerStatesEqual(
): boolean {
return (
a.enabled === b.enabled &&
a.pwm === b.pwm &&
a.period === b.period &&
a.periodLow === b.periodLow &&
a.waveformLoop === b.waveformLoop &&
a.waveform.length === b.waveform.length &&
a.waveform.every((value, index) => value === b.waveform[index])
Expand Down
20 changes: 10 additions & 10 deletions src/lib/services/file/psg-export.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,16 @@ class PsgExportService {

onProgress?.(10, 'Loading processor modules...');
const baseUrl = import.meta.env.BASE_URL;
const { default: AyumiState } = await import(`${baseUrl}ayumi-state.js`);
const { default: AyumiState } = await import(/* @vite-ignore */ `${baseUrl}ayumi-state.js`);
const { default: TrackerPatternProcessor } = await import(
`${baseUrl}tracker-pattern-processor.js`
/* @vite-ignore */ `${baseUrl}tracker-pattern-processor.js`
);
const { default: AYAudioDriver } = await import(`${baseUrl}ay-audio-driver.js`);
const { default: AYAudioDriver } = await import(/* @vite-ignore */ `${baseUrl}ay-audio-driver.js`);
const { default: AYChipRegisterState } = await import(
`${baseUrl}ay-chip-register-state.js`
/* @vite-ignore */ `${baseUrl}ay-chip-register-state.js`
);
const { default: VirtualChannelMixer } = await import(
`${baseUrl}virtual-channel-mixer.js`
/* @vite-ignore */ `${baseUrl}virtual-channel-mixer.js`
);

const modules: PsgExportModules = {
Expand Down Expand Up @@ -456,16 +456,16 @@ export async function captureSongRegisterFrames(
modules = options.modules;
} else {
const baseUrl = import.meta.env.BASE_URL;
const { default: AyumiState } = await import(`${baseUrl}ayumi-state.js`);
const { default: AyumiState } = await import(/* @vite-ignore */ `${baseUrl}ayumi-state.js`);
const { default: TrackerPatternProcessor } = await import(
`${baseUrl}tracker-pattern-processor.js`
/* @vite-ignore */ `${baseUrl}tracker-pattern-processor.js`
);
const { default: AYAudioDriver } = await import(`${baseUrl}ay-audio-driver.js`);
const { default: AYAudioDriver } = await import(/* @vite-ignore */ `${baseUrl}ay-audio-driver.js`);
const { default: AYChipRegisterState } = await import(
`${baseUrl}ay-chip-register-state.js`
/* @vite-ignore */ `${baseUrl}ay-chip-register-state.js`
);
const { default: VirtualChannelMixer } = await import(
`${baseUrl}virtual-channel-mixer.js`
/* @vite-ignore */ `${baseUrl}virtual-channel-mixer.js`
);
modules = {
AyumiState,
Expand Down
Loading
Loading