Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 21 additions & 20 deletions src/mame/access/acvirus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@

#include "virusa.lh"
#include "virusb.lh"
#include "virusc.lh"


namespace {
Expand Down Expand Up @@ -355,7 +356,7 @@ void acvirus_state::virusc(machine_config &config)
m_dsp->set_hard_omr(0xe);

PALETTE(config, "palette", FUNC(acvirus_state::red_palette_init), 2);
// TODO: config.set_default_layout(layout_virusc);
config.set_default_layout(layout_virusc);
}


Expand Down Expand Up @@ -499,7 +500,7 @@ INPUT_PORTS_START( virusc_knobs )
PORT_ADJUSTER(64, "Osc: Wave Sel / PW") PORT_MINMAX(0, 127)

PORT_START("knob_13")
PORT_ADJUSTER(64, "Osc: Detune") PORT_MINMAX(0, 127)
PORT_ADJUSTER(64, "Osc: Detune 2/3") PORT_MINMAX(0, 127)

PORT_START("knob_14")
PORT_ADJUSTER(64, "Osc: FM Amount") PORT_MINMAX(0, 127)
Expand Down Expand Up @@ -674,23 +675,23 @@ static INPUT_PORTS_START( virusc )
PORT_INCLUDE( virusc_knobs )

PORT_START("ROW0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_1) PORT_NAME("ArpEdit")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_2) PORT_NAME("ModFxEdit")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_3) PORT_NAME("DelayEdit") // hold at boot: RAM test & key test
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_4) PORT_NAME("ArpSwitch")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_5) PORT_NAME("ModFxSelect")
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_6) PORT_NAME("LFO: Edit")
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_7) PORT_NAME("LFO: Amount")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_1) PORT_NAME("Arp: Edit")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_2) PORT_NAME("Effects: Edit")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_3) PORT_NAME("Delay: Edit") // hold at boot: RAM test & key test
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_4) PORT_NAME("Arp: On")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_5) PORT_NAME("Effects: Select")
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_6) PORT_NAME("LFOs/Mod: Edit")
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_7) PORT_NAME("LFOs/Mod: Amount")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)

PORT_START("ROW1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_8) PORT_NAME("LFO: Select")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_9) PORT_NAME("LFO: Shape")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_0) PORT_NAME("Edit")
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Q) PORT_NAME("Global")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_W) PORT_NAME("OSC: Edit")
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_E) PORT_NAME("Sync")
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_R) PORT_NAME("OSC 1: Select")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_8) PORT_NAME("LFOs/Mod: Select")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_9) PORT_NAME("LFOs/Mod: Shape")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_0) PORT_NAME("Edit")//?
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Q) PORT_NAME("Global")//?
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_W) PORT_NAME("Osc: Edit")
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_E) PORT_NAME("Osc: Sync")
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_R) PORT_NAME("Osc 1: Select")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)

PORT_START("ROW2")
Expand All @@ -704,7 +705,7 @@ static INPUT_PORTS_START( virusc )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)

PORT_START("ROW3")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_A) PORT_NAME("OSC 2: Select")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_A) PORT_NAME("Osc 2: Select")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_S) PORT_NAME("Part -")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_D) PORT_NAME("Parameter <")
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_F) PORT_NAME("Value -")
Expand All @@ -714,9 +715,9 @@ static INPUT_PORTS_START( virusc )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)

PORT_START("ROW4")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_K) PORT_NAME("OSC 3: Select")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_L) PORT_NAME("OSC 3: Switch")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Z) PORT_NAME("Filter Edit")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_K) PORT_NAME("Osc 3: Select")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_L) PORT_NAME("Osc 3 On")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_Z) PORT_NAME("Filters: Edit")
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_X) PORT_NAME("Filter 1 Mode") // hold at boot: "GlobalBuff checks"
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_C) PORT_NAME("Filter 2 Mode")
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_CODE(KEYCODE_V) PORT_NAME("Filter 1 Select")
Expand Down
11 changes: 11 additions & 0 deletions src/mame/layout/virusb.lay
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,24 @@ license:CC0-1.0
<element ref="6_text"><bounds x="60" y="62" width="13" height="12"/></element>
</group>

<element name="saturation_placeholder">
<image><data><![CDATA[
<svg width="28" height="50">
<path fill="#a9abab" stroke="none" d="
m 2.675,0 -2.7,6.1 c 17.4,6.4 24.5,25.6 18.6,41.1
l 6,2.9 c 7.6,-18.8 -0.9,-42.1 -21.9,-50.1 z
</svg>
]]></data></image>
</element>

<group name="knob_saturation">
<!-- FIXME: This one should have dots only in the left half
and the word "SATURATION" along a circular path to the right.
but I don't know how to draw that in the .lay schema
-->
<element ref="gray_line"><bounds x="36.5" y="15" width="4" height="8"/></element>
<group ref="knob_base"><bounds x="0" y="7" width="77" height="59"/></group>
<element ref="saturation_placeholder"><bounds x="47" y="6" width="32" height="52"/></element>

<element ref="minus6_text"><bounds x="0" y="62" width="19" height="12"/></element>
<element ref="0_text"><bounds x="36" y="0" width="6" height="12"/></element>
Expand Down
Loading
Loading