From 7cb65adc4b21e99482b020c934b9dc39d24d6391 Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Sat, 15 Feb 2020 15:35:53 +0100 Subject: [PATCH] Midway MCR2: adjust spinner controls, add button B+C for Tron's spinner --- Arcade_MiST/Midway MCR 2/MCR2/README.txt | 2 +- Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv | 10 ++++++---- Arcade_MiST/Midway MCR 2/MCR2/rtl/spinner.vhd | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Arcade_MiST/Midway MCR 2/MCR2/README.txt b/Arcade_MiST/Midway MCR 2/MCR2/README.txt index 8de83f73..f88027f5 100644 --- a/Arcade_MiST/Midway MCR 2/MCR2/README.txt +++ b/Arcade_MiST/Midway MCR 2/MCR2/README.txt @@ -6,7 +6,7 @@ -- Coin: ESC, 5, 6 -- Start: F1, F2, 1, 2 --- Tron: Joystick 1 for movement, Joystick 2 (MAME keys: D, G) for turret +-- Tron: Joystick 1 for movement, Joystick 2 (MAME keys: D, G) or Buttons B and C for turret -- Wacko: control Captain Krooz'r with the mouse, shoot with the joystick -- Kozmik Krooz'r: use the mouse for movement and shoot, rotate the turret with the joystick diff --git a/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv b/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv index 9a1a3961..6015e8f8 100644 --- a/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv +++ b/Arcade_MiST/Midway MCR 2/MCR2/rtl/MCR2_MiST.sv @@ -56,6 +56,7 @@ localparam CONF_STR = { "O2,Rotate Controls,Off,On;", "O5,Blend,Off,On;", "O6,Swap Joysticks,Off,On;", + "O4,Spinner speed,Low,High;", "DIP;", "O7,Service,Off,On;", "T0,Reset;", @@ -66,6 +67,7 @@ wire rotate = status[2]; wire blend = status[5]; wire joyswap = status[6]; wire service = status[7]; +wire spinspd = status[4]; reg oneplayer; reg [1:0] orientation; //left/right / portrait/landscape @@ -397,7 +399,7 @@ wire [6:0] spin_angle1; spinner spinner1 ( .clock_40(clk_sys), .reset(reset), - .btn_acc(1), + .btn_acc(spinspd), .btn_left(m_left | m_up), .btn_right(m_right | m_down), .ctc_zc_to_2(vs), @@ -408,9 +410,9 @@ wire [6:0] spin_angle2; spinner spinner2 ( .clock_40(clk_sys), .reset(reset), - .btn_acc(1), - .btn_left(m_left2 | m_up2), - .btn_right(m_right2 | m_down2), + .btn_acc(spinspd), + .btn_left(m_left2 | m_up2 | (core_mod == 7'h1 && m_fireB)), // fireB for Tron + .btn_right(m_right2 | m_down2 | (core_mod == 7'h1 && m_fireC)), // fireC for Tron .ctc_zc_to_2(vs), .spin_angle(spin_angle2) ); diff --git a/Arcade_MiST/Midway MCR 2/MCR2/rtl/spinner.vhd b/Arcade_MiST/Midway MCR 2/MCR2/rtl/spinner.vhd index c20016f8..0bf503e0 100644 --- a/Arcade_MiST/Midway MCR 2/MCR2/rtl/spinner.vhd +++ b/Arcade_MiST/Midway MCR 2/MCR2/rtl/spinner.vhd @@ -36,8 +36,8 @@ begin if btn_left = '1' then spin_count <= spin_count - 20; end if; -- left if btn_right = '1' then spin_count <= spin_count + 20; end if; -- right else - if btn_left = '1' then spin_count <= spin_count - 55; end if; - if btn_right = '1' then spin_count <= spin_count + 55; end if; + if btn_left = '1' then spin_count <= spin_count - 40; end if; + if btn_right = '1' then spin_count <= spin_count + 40; end if; end if; end if; end if;