gearmulator

Emulation of classic VA synths of the late 90s/2000s that are based on Motorola 56300 family DSPs
Log | Files | Refs | Submodules | README | LICENSE

commit 606ebeb69cce2d7a01df18d86192f3cdfb16a0e0
parent ccd4f26ad588dc6b44db319fcb5be48bb1d1ad71
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Wed, 24 Jul 2024 00:04:34 +0200

rename encoder to knob

Diffstat:
Msource/nord/n2x/n2xLib/n2xfrontpanel.cpp | 42++++++++++++++++++++++++++++++++++++------
Msource/nord/n2x/n2xLib/n2xfrontpanel.h | 4++--
Msource/nord/n2x/n2xLib/n2xtypes.h | 2+-
3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/source/nord/n2x/n2xLib/n2xfrontpanel.cpp b/source/nord/n2x/n2xLib/n2xfrontpanel.cpp @@ -19,12 +19,42 @@ namespace n2x uint8_t FrontPanelCS4::read8(mc68k::PeriphAddress _addr) { - switch (m_panel.cs6().getEncoderType()) + const auto knobType = m_panel.cs6().getKnobType(); + + switch (knobType) { - case EncoderType::PitchBend: - case EncoderType::ModWheel: - return 0; // pretend we're a rack unit - default: + case KnobType::PitchBend: + case KnobType::ModWheel: return 0; // pretend we're a rack unit + case KnobType::MasterVol: return 0xff; + case KnobType::AmpGain: return 0xff; + +/* case KnobType::Osc1Fm: return 0; + case KnobType::Porta: return 0; + case KnobType::Lfo2Rate: return 0x20; + case KnobType::Lfo1Rate: return 0x20; + case KnobType::ModEnvAmt: return 0; + case KnobType::ModEnvD: return 0; + case KnobType::ModEnvA: return 0; + case KnobType::AmpEnvD: return 0; + case KnobType::FilterFreq: return 0xff; + case KnobType::FilterEnvA: return 0; + case KnobType::AmpEnvA: return 0; + case KnobType::OscMix: return 0x80; + case KnobType::Osc2Fine: return 0x80; + case KnobType::Lfo1Amount: return 0; + case KnobType::OscPW: return 0x40; + case KnobType::AmpGain: return 0xff; + case KnobType::FilterEnvR: return 0x30; + case KnobType::AmpEnvR: return 0x30; + case KnobType::FilterEnvAmt: return 0; + case KnobType::FilterEnvS: return 0xff; + case KnobType::AmpEnvS: return 0xff; + case KnobType::FilterReso: return 0x10; + case KnobType::FilterEnvD: return 0; + case KnobType::ExpPedal: return 0; + case KnobType::Lfo2Amount: return 0; + case KnobType::Osc2Semi: return 0x80; +*/ default: return 0x80; } } @@ -52,7 +82,7 @@ namespace n2x else { // LOG("Read pot " << HEXN(_val, 2)); - m_selectedEncoder = static_cast<EncoderType>(_val); + m_selectedKnob = static_cast<KnobType>(_val); } break; case g_frontPanelAddressCS6 + 0xc: diff --git a/source/nord/n2x/n2xLib/n2xfrontpanel.h b/source/nord/n2x/n2xLib/n2xfrontpanel.h @@ -32,7 +32,7 @@ namespace n2x void write8(mc68k::PeriphAddress _addr, uint8_t _val) override; uint8_t read8(mc68k::PeriphAddress _addr) override; - auto getEncoderType() const { return m_selectedEncoder; } + auto getKnobType() const { return m_selectedKnob; } private: void printLCD(); @@ -42,7 +42,7 @@ namespace n2x uint8_t m_ledLatch12 = 0; std::array<uint8_t,3> m_lcds{0,0,0}; std::array<uint8_t,3> m_lcdsPrev{0,0,0}; - EncoderType m_selectedEncoder = EncoderType::PitchBend; + KnobType m_selectedKnob = KnobType::PitchBend; }; class FrontPanel diff --git a/source/nord/n2x/n2xLib/n2xtypes.h b/source/nord/n2x/n2xLib/n2xtypes.h @@ -80,7 +80,7 @@ namespace n2x ModwheelDest = 0x06'80, }; - enum class EncoderType + enum class KnobType { Osc1Fm = 0x38, Porta, Lfo2Rate, MasterVol, Lfo1Rate, ModEnvAmt, ModEnvD, ModEnvA, AmpEnvD = 0x58, FilterFreq, FilterEnvA, AmpEnvA, OscMix, Osc2Fine, Lfo1Amount, OscPW,