Skip to content
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

Jump to bottom

Add ESFM system #1559

Merged
merged 41 commits into from
Jan 16, 2024
Merged

Add ESFM system #1559

merged 41 commits into from
Jan 16, 2024

Conversation

Kagamiin
Copy link
Collaborator

@Kagamiin Kagamiin commented Oct 25, 2023 •
edited
Loading

Description

Adding the "ESS ES1xxx series (ESFM)" system, including:

  • Emulation core (ESFMu v1.1) and dispatch
  • Additions to instrument format
  • Instrument editor (all layouts)
    • Custom operator routing preview
    • FM preview
  • Macros
  • Pattern effects
    • Additions to playback commands

System ID: 0xd1

Documentation/manual additions are coming up in a separate PR.

Known issues

  • OP4 noise mode 3 ("Top") is not properly emulated yet by ESFMu. A warning has been added in the UI when that option is selected, warning that its behavior will change in the future.

Kagamiin added 28 commits October 15, 2023 11:46
@Kagamiin
WIP: adding ESFM (ESS ES1488/ESS ES1868 etc.) system
779afcb
@Kagamiin
Fix operator order in GUI for ESFM
696433c
@Kagamiin
Adding alternate layout for ESFM
6733f4d
@Kagamiin
Removing unused code
cfa0628
@Kagamiin
Adding classic layout; fixing operator swapping and KSL bit order
484b6f4
@Kagamiin
bump ct range to 24; fix bug in modern layout for OPL and ESFM
84e0ec9
@Kagamiin
WIP: adding fixed pitch mode; fix UB in ESFM driver
4a0295f
@Kagamiin
Adding operator routing visualization
39001dc
@Kagamiin
Implement fixed frequency mode for modern and classic layouts
aee939b
@Kagamiin
Merge branch 'master' into feature/esfm
8ae86f7
@Kagamiin
Implement ESFM macros
a01ddd3
@Kagamiin
Adding ESFM letter-style instrument icon
6ce2fd0 
Thanks to Electric Keet for providing me with the icon!
@Kagamiin
Updating ESFMu with envelope delay fix; fixing macro op ordering
821b567
@Kagamiin
Implementing pattern effects, detune on FM preview, default instrument
a1b7e52
@Kagamiin
Merge branch 'master' into feature/esfm
dde56c0
@Kagamiin
Some refactoring
64baa7c
@Kagamiin
Updating ESFMu - accuracy improvements for noise mode
96fbd15
@Kagamiin
Small fix for potential undefined behavior in ESFM emulator
39f29f4
@Kagamiin
Fix hard reset handling; add detune effect; change some labels
23b1c41
@Kagamiin
Changing detune effect description for consistency
b799383
@Kagamiin
Removing dash from system name
7d0eee7 
Because it causes problems with e.g. KDE in the window title.
@Kagamiin
Removing placeholder
928ff5c
@Kagamiin
Adding system presets for ESFM
f25d254
@Kagamiin
Rectifying ESFM preset name
6ae49e4
@Kagamiin
Changing ESFM chip ID (0xd0 is taken)
91e6d84
@Kagamiin
Adding placeholder for Namco C352
d47fcd9
@Kagamiin
Merge branch 'master' into feature/esfm
85db9ca
@Kagamiin
Removing stray space
59d56b1
tildearrow
tildearrow requested changes Oct 26, 2023
View reviewed changes
Copy link
Owner

@tildearrow tildearrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for the final boss? Three, two, one......
Go!

.gitignore Outdated Show resolved Hide resolved
extern/ESFMu/.clangd Outdated Show resolved Hide resolved
src/engine/platform/esfm.cpp Outdated Show resolved Hide resolved
src/engine/platform/esfm.cpp Outdated Show resolved Hide resolved
src/engine/platform/esfm.cpp Outdated Show resolved Hide resolved
src/engine/sysDef.cpp Outdated Show resolved Hide resolved
src/engine/sysDef.cpp Outdated Show resolved Hide resolved
src/gui/insEdit.cpp Outdated Show resolved Hide resolved
src/gui/insEdit.cpp Outdated Show resolved Hide resolved
src/gui/sysConf.cpp Show resolved Hide resolved
@Kagamiin
Code review suggestions
170248e 
Haven't had a good peer review in ages.
@freq-mod freq-mod requested a review from tildearrow December 8, 2023 10:49
tildearrow
tildearrow reviewed Dec 9, 2023
View reviewed changes
Copy link
Owner

@tildearrow tildearrow left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait until 0.6.2.

@tildearrow
Copy link
Owner

Due to negative feedback, I am merging this for 0.6.1.

tildearrow
tildearrow approved these changes Jan 16, 2024
View reviewed changes
Copy link
Owner

@tildearrow tildearrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To-do:

  • Check KVS
  • Code style in insEdit.cpp line 3613 and 4782
    • Line 5207 hack

@tildearrow tildearrow merged commit 0acd62f into tildearrow:master Jan 16, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Eknous-P Eknous-P Eknous-P left review comments

@tildearrow tildearrow tildearrow approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Kagamiin @tildearrow @Eknous-P