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.

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

Fix M30 with firmware 1.1-b5 #14

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
32 changes: 16 additions & 16 deletions src/fpga/core/core_top.sv
Original file line number Diff line number Diff line change
Expand Up @@ -1016,13 +1016,13 @@ synch_3 #(

assign joystick_0 = {
cs_m30_map_enable ? cont1_key_s[10] : cont1_key_s[9], // Z
cs_m30_map_enable ? cont1_key_s[7] : cont1_key_s[6], // Y
cs_m30_map_enable ? cont1_key_s[6] : cont1_key_s[8], // X
cs_m30_map_enable ? cont1_key_s[6] : cont1_key_s[6], // Y
cs_m30_map_enable ? cont1_key_s[7] : cont1_key_s[8], // X
cont1_key_s[14], // mode
lightgun_enabled ? 1'b0 : cont1_key_s[15], // start
cs_m30_map_enable ? cont1_key_s[11] : cont1_key_s[4], // B
cs_m30_map_enable ? cont1_key_s[5] : cont1_key_s[5], // C
cs_m30_map_enable ? cont1_key_s[4] : cont1_key_s[7], // A
cs_m30_map_enable ? cont1_key_s[4] : cont1_key_s[5], // C
cs_m30_map_enable ? cont1_key_s[5] : cont1_key_s[7], // A
cont1_key_s[0], // up
cont1_key_s[1], // down
cont1_key_s[2], // left
Expand All @@ -1031,13 +1031,13 @@ assign joystick_0 = {

assign joystick_1 = {
cs_m30_map_enable ? cont2_key_s[10] : cont2_key_s[9], // Z
cs_m30_map_enable ? cont2_key_s[7] : cont2_key_s[6], // Y
cs_m30_map_enable ? cont2_key_s[6] : cont2_key_s[8], // X
cs_m30_map_enable ? cont2_key_s[6] : cont2_key_s[6], // Y
cs_m30_map_enable ? cont2_key_s[7] : cont2_key_s[8], // X
cont2_key_s[14], // mode
cont2_key_s[15], // start
cs_m30_map_enable ? cont2_key_s[11] : cont2_key_s[4], // B
cs_m30_map_enable ? cont2_key_s[5] : cont2_key_s[5], // C
cs_m30_map_enable ? cont2_key_s[4] : cont2_key_s[7], // A
cs_m30_map_enable ? cont2_key_s[4] : cont2_key_s[5], // C
cs_m30_map_enable ? cont2_key_s[5] : cont2_key_s[7], // A
cont2_key_s[0], // up
cont2_key_s[1], // down
cont2_key_s[2], // left
Expand All @@ -1046,13 +1046,13 @@ assign joystick_1 = {

assign joystick_2 = {
cs_m30_map_enable ? cont3_key_s[10] : cont3_key_s[9], // Z
cs_m30_map_enable ? cont3_key_s[7] : cont3_key_s[6], // Y
cs_m30_map_enable ? cont3_key_s[6] : cont3_key_s[8], // X
cs_m30_map_enable ? cont3_key_s[6] : cont3_key_s[6], // Y
cs_m30_map_enable ? cont3_key_s[7] : cont3_key_s[8], // X
cont3_key_s[14], // mode
cont3_key_s[15], // start
cs_m30_map_enable ? cont3_key_s[11] : cont3_key_s[4], // B
cs_m30_map_enable ? cont3_key_s[5] : cont3_key_s[5], // C
cs_m30_map_enable ? cont3_key_s[4] : cont3_key_s[7], // A
cs_m30_map_enable ? cont3_key_s[4] : cont3_key_s[5], // C
cs_m30_map_enable ? cont3_key_s[5] : cont3_key_s[7], // A
cont3_key_s[0], // up
cont3_key_s[1], // down
cont3_key_s[2], // left
Expand All @@ -1061,13 +1061,13 @@ assign joystick_2 = {

assign joystick_3 = {
cs_m30_map_enable ? cont4_key_s[10] : cont4_key_s[9], // Z
cs_m30_map_enable ? cont4_key_s[7] : cont4_key_s[6], // Y
cs_m30_map_enable ? cont4_key_s[6] : cont4_key_s[8], // X
cs_m30_map_enable ? cont4_key_s[6] : cont4_key_s[6], // Y
cs_m30_map_enable ? cont4_key_s[7] : cont4_key_s[8], // X
cont4_key_s[14], // mode
cont4_key_s[15], // start
cs_m30_map_enable ? cont4_key_s[11] : cont4_key_s[4], // B
cs_m30_map_enable ? cont4_key_s[5] : cont4_key_s[5], // C
cs_m30_map_enable ? cont4_key_s[4] : cont4_key_s[7], // A
cs_m30_map_enable ? cont4_key_s[4] : cont4_key_s[5], // C
cs_m30_map_enable ? cont4_key_s[5] : cont4_key_s[7], // A
cont4_key_s[0], // up
cont4_key_s[1], // down
cont4_key_s[2], // left
Expand Down