1
0
mirror of https://github.com/Gehstock/Mist_FPGA.git synced 2026-02-25 16:19:52 +00:00

Controls Update (still crap)

This commit is contained in:
Marcel
2022-07-02 10:37:17 +02:00
parent 5335ad87a9
commit bd27e79626
5 changed files with 26 additions and 41 deletions

View File

@@ -1,4 +1,4 @@
# Emerson Arcadia 2001 game console
# Emerson Arcadia 2001 game console by Grabulosaure
## General description
This core implements a game console with Signetics 2650 CPU and 2637 Video controller.

View File

@@ -37,7 +37,7 @@ pll pll(
.locked(pll_locked)
);
wire [31:0] status;
wire [63:0] status;
wire [1:0] buttons;
wire [1:0] switches;
wire [31:0] joystick_0,joystick_1;
@@ -52,12 +52,6 @@ wire [7:0] r, g, b;
wire key_strobe;
wire key_pressed;
wire [7:0] key_code;
wire [15:0] rom_addr;
wire [15:0] rom_do;
wire [12:0] bg_addr;
wire [31:0] bg_do;
//wire rom_rd;
wire ioctl_downl;
wire [7:0] ioctl_index;
wire ioctl_wr;
@@ -78,7 +72,7 @@ data_io data_io(
arcadia_core arcadia_core(
.clk(clksys),
.reset(status[0] | buttons[1] | ~ioctl_downl),
.reset(status[0] | buttons[1]),
.ntsc_pal(1'b1),
.swap(status[5]),
.swapxy(status[6]),
@@ -89,10 +83,10 @@ arcadia_core arcadia_core(
.vga_vs(vs),
.vga_de(blankn),
.sound(audio),
// .joystick_0({joystick_0[31:6], m_fireB, m_fireA, m_left, m_right, m_up, m_down}),
// .joystick_1({joystick_1[31:6], m_fire2B, m_fire2A, m_left2, m_right2, m_up2, m_down2}),
.joystick_0(joystick_0),
.joystick_1(joystick_1),
.joystick_0({joystick_0[31:12], m_fireH, m_fireG, m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_left, m_right, m_up, m_down}),
.joystick_1({joystick_1[31:12], m_fire2H, m_fire2G, m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_left2, m_right2, m_up2, m_down2}),
// .joystick_0(joystick_0),
// .joystick_1(joystick_1),
.joystick_analog_0(joystick_analog_0),
.joystick_analog_1(joystick_analog_1),
.ioctl_download(ioctl_downl),
@@ -100,10 +94,9 @@ arcadia_core arcadia_core(
.ioctl_wr(ioctl_wr),
.ioctl_addr(ioctl_addr),
.ioctl_dout(ioctl_dout)
);
mist_video #(.COLOR_DEPTH(6), .SD_HCNT_WIDTH(10)) mist_video(
mist_video #(.COLOR_DEPTH(6), .SD_HCNT_WIDTH(9)) mist_video(
.clk_sys ( clksys ),
.SPI_SCK ( SPI_SCK ),
.SPI_SS3 ( SPI_SS3 ),
@@ -153,8 +146,8 @@ dac #(.C_bits(8))dac(
.dac_o(AUDIO_L)
);
wire m_up, m_down, m_left, m_right, m_fireA, m_fireB, m_fireC, m_fireD, m_fireE, m_fireF;
wire m_up2, m_down2, m_left2, m_right2, m_fire2A, m_fire2B, m_fire2C, m_fire2D, m_fire2E, m_fire2F;
wire m_up, m_down, m_left, m_right, m_fireA, m_fireB, m_fireC, m_fireD, m_fireE, m_fireF, m_fireG, m_fireH;
wire m_up2, m_down2, m_left2, m_right2, m_fire2A, m_fire2B, m_fire2C, m_fire2D, m_fire2E, m_fire2F, m_fire2G, m_fire2H;
wire m_tilt, m_coin1, m_coin2, m_coin3, m_coin4, m_one_player, m_two_players, m_three_players, m_four_players;
arcade_inputs inputs (
@@ -167,8 +160,8 @@ arcade_inputs inputs (
.joyswap ( 1'b0 ),
.oneplayer ( 1'b0 ),
.controls ( {m_tilt, m_coin4, m_coin3, m_coin2, m_coin1, m_four_players, m_three_players, m_two_players, m_one_player} ),
.player1 ( {m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_up, m_down, m_left, m_right} ),
.player2 ( {m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_up2, m_down2, m_left2, m_right2} )
.player1 ( {m_fireH, m_fireG, m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_up, m_down, m_left, m_right} ),
.player2 ( {m_fire2H, m_fire2G, m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_up2, m_down2, m_left2, m_right2} )
);
endmodule

View File

@@ -1,4 +1,4 @@
# Interton VC4000 game console
# Interton VC4000 game console by Grabulosaure
## General description
This core implements a game console with Signetics 2650 CPU and 2636 Video controller.

View File

@@ -18,7 +18,7 @@
#
# Quartus II 64-Bit
# Version 13.1.4 Build 182 03/12/2014 SJ Full Version
# Date created = 08:53:10 July 02, 2022
# Date created = 10:32:11 July 02, 2022
#
# -------------------------------------------------------------------------- #
#

View File

@@ -39,7 +39,7 @@ pll pll(
.locked(pll_locked)
);
wire [31:0] status;
wire [63:0] status;
wire [1:0] buttons;
wire [1:0] switches;
wire [31:0] joystick_0,joystick_1;
@@ -54,12 +54,6 @@ wire [7:0] r, g, b;
wire key_strobe;
wire key_pressed;
wire [7:0] key_code;
wire [15:0] rom_addr;
wire [15:0] rom_do;
wire [12:0] bg_addr;
wire [31:0] bg_do;
//wire rom_rd;
wire ioctl_downl;
wire [7:0] ioctl_index;
wire ioctl_wr;
@@ -80,7 +74,7 @@ data_io data_io(
vc4000_core vc4000_core(
.clk(clksys),
.reset(status[0] | buttons[1] | ~ioctl_downl),
.reset(status[0] | buttons[1]),
.ntsc_pal(1'b1),
.swap(status[5]),
.swapxy(status[6]),
@@ -93,22 +87,20 @@ vc4000_core vc4000_core(
.vga_vs(vs),
.vga_de(blankn),
.sound(audio),
// .joystick_0({joystick_0[31:6], m_fireB, m_fireA, m_left, m_right, m_up, m_down}),
// .joystick_1({joystick_1[31:6], m_fire2B, m_fire2A, m_left2, m_right2, m_up2, m_down2}),
.joystick_0(joystick_0),
.joystick_1(joystick_1),
.joystick_0({joystick_0[31:12], m_fireH, m_fireG, m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_left, m_right, m_up, m_down}),
.joystick_1({joystick_1[31:12], m_fire2H, m_fire2G, m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_left2, m_right2, m_up2, m_down2}),
// .joystick_0(joystick_0),
// .joystick_1(joystick_1),
.joystick_analog_0(joystick_analog_0),
.joystick_analog_1(joystick_analog_1),
.ioctl_download(ioctl_downl),
.ioctl_index(ioctl_index),
.ioctl_wr(ioctl_wr),
.ioctl_addr(ioctl_addr),
.ioctl_dout(ioctl_dout)//,
// .ioctl_wait(ioctl_wait)
.ioctl_dout(ioctl_dout)
);
mist_video #(.COLOR_DEPTH(6), .SD_HCNT_WIDTH(10)) mist_video(
mist_video #(.COLOR_DEPTH(6), .SD_HCNT_WIDTH(9)) mist_video(
.clk_sys ( clksys ),
.SPI_SCK ( SPI_SCK ),
.SPI_SS3 ( SPI_SS3 ),
@@ -158,8 +150,8 @@ dac #(.C_bits(8))dac(
.dac_o(AUDIO_L)
);
wire m_up, m_down, m_left, m_right, m_fireA, m_fireB, m_fireC, m_fireD, m_fireE, m_fireF;
wire m_up2, m_down2, m_left2, m_right2, m_fire2A, m_fire2B, m_fire2C, m_fire2D, m_fire2E, m_fire2F;
wire m_up, m_down, m_left, m_right, m_fireA, m_fireB, m_fireC, m_fireD, m_fireE, m_fireF, m_fireG, m_fireH;
wire m_up2, m_down2, m_left2, m_right2, m_fire2A, m_fire2B, m_fire2C, m_fire2D, m_fire2E, m_fire2F, m_fire2G, m_fire2H;
wire m_tilt, m_coin1, m_coin2, m_coin3, m_coin4, m_one_player, m_two_players, m_three_players, m_four_players;
arcade_inputs inputs (
@@ -172,8 +164,8 @@ arcade_inputs inputs (
.joyswap ( 1'b0 ),
.oneplayer ( 1'b0 ),
.controls ( {m_tilt, m_coin4, m_coin3, m_coin2, m_coin1, m_four_players, m_three_players, m_two_players, m_one_player} ),
.player1 ( {m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_up, m_down, m_left, m_right} ),
.player2 ( {m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_up2, m_down2, m_left2, m_right2} )
.player1 ( {m_fireH, m_fireG, m_fireF, m_fireE, m_fireD, m_fireC, m_fireB, m_fireA, m_up, m_down, m_left, m_right} ),
.player2 ( {m_fire2H, m_fire2G, m_fire2F, m_fire2E, m_fire2D, m_fire2C, m_fire2B, m_fire2A, m_up2, m_down2, m_left2, m_right2} )
);
endmodule