Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 09:57:47 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

-tank: Commented out CPU-choking motor sound for now. Fixed a transcription error. At least partially fixed screen parameters.

Browse Source
This commit is contained in:
Ryan Holtz 2020-08-17 13:49:13 +02:00
parent 48c847f89a
commit dd47a15e3a
3 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
View File

@ -2863,7 +2863,7 @@ static NETLIST_START(TTL_9321_DIP)
A.E, /* /E |1 ++ 16| VCC */ A.VCC,
A.A0, /* A0 |2 15| /E */ B.E,
A.A1, /* A1 |3 14| A0 */ B.A0,
A.D0, /* /D0 |4 9322 13| A1 */ B.A1,
A.D0, /* /D0 |4 9321 13| A1 */ B.A1,
A.D1, /* /D1 |5 12| /D0 */ B.D0,
A.D2, /* /D2 |6 11| /D1 */ B.D1,
A.D3, /* /D3 |7 10| /D2 */ B.D2,

23
src/mame/drivers/atarittl.cpp
View File

@ -101,12 +101,12 @@
#define SC_VBSTART (SC_VTOTAL)
#define SC_VBEND (8)
#define TANK_VIDCLOCK (14318000)
#define TANK_HTOTAL (904)
#define TANK_VTOTAL (520)
#define TANK_HBSTART (SC_HTOTAL)
#define TANK_VIDCLOCK (14318181)
#define TANK_HTOTAL (451)
#define TANK_VTOTAL (521)
#define TANK_HBSTART (TANK_HTOTAL)
#define TANK_HBEND (32)
#define TANK_VBSTART (SC_VTOTAL)
#define TANK_VBSTART (TANK_VTOTAL)
#define TANK_VBEND (8)
#define GTRAK10_VIDCLOCK 14318181
@ -252,12 +252,13 @@ void tank_state::tank(machine_config &config)
SCREEN(config, "screen", SCREEN_TYPE_RASTER);
FIXFREQ(config, m_video).set_screen("screen");
m_video->set_monitor_clock(TANK_VIDCLOCK);
m_video->set_horz_params(TANK_HTOTAL-84,TANK_HTOTAL-64,TANK_HTOTAL-16, TANK_HTOTAL);
m_video->set_vert_params(TANK_VTOTAL-21,TANK_VTOTAL-17,TANK_VTOTAL-12, TANK_VTOTAL);
m_video->set_fieldcount(1);
m_video->set_threshold(0.89);
m_video->set_gain(0.2);
m_video->set_horz_scale(1);
// Length of active video, end of front-porch, end of sync signal, end of line/frame
m_video->set_horz_params(TANK_HTOTAL - 32, TANK_HTOTAL - 32, TANK_HTOTAL - 31, TANK_HTOTAL);
m_video->set_vert_params(TANK_VTOTAL - 8, TANK_VTOTAL - 8, TANK_VTOTAL, TANK_VTOTAL);
m_video->set_fieldcount(2);
m_video->set_threshold(1.0);
//m_video->set_gain(0.2);
//m_video->set_horz_scale(1);
}
void gtrak10_state::gtrak10(machine_config &config)

107
src/mame/machine/nl_tank.cpp
View File

@ -72,8 +72,8 @@ NETLIST_START(tank)
RES(R29, RES_M(1.8))
RES(R32, 470)
RES(R34V, 560)
RES(R35M2, RES_K(100))
RES(R36M1, RES_K(100))
//RES(R35M2, RES_K(100))
//RES(R36M1, RES_K(100))
RES(R37A, RES_K(100))
RES(R38, RES_K(100))
RES(R40, RES_K(4.7))
@ -105,33 +105,33 @@ NETLIST_START(tank)
RES(R63A, RES_K(2.2))
RES(R63B, 100)
RES(R64A, RES_K(180))
RES(R64M2, RES_K(4.7))
RES(R65M2, RES_K(3.9))
RES(R66M2, RES_K(1))
RES(R67M2, RES_K(10))
RES(R68M2, RES_K(33))
//RES(R64M2, RES_K(4.7))
//RES(R65M2, RES_K(3.9))
//RES(R66M2, RES_K(1))
//RES(R67M2, RES_K(10))
//RES(R68M2, RES_K(33))
RES(R69, RES_K(470))
RES(R69M2, RES_K(180))
//RES(R69M2, RES_K(180))
RES(R70A, RES_M(1))
RES(R70M2, RES_K(330))
//RES(R70M2, RES_K(330))
RES(R71A, RES_K(680))
RES(R71M2, RES_K(680))
//RES(R71M2, RES_K(680))
RES(R72A, RES_K(180))
RES(R72M2, RES_K(22))
//RES(R72M2, RES_K(22))
RES(R73A, RES_M(1))
RES(R73M1, RES_K(22))
RES(R74M1, RES_K(180))
RES(R75M1, RES_K(330))
RES(R76M1, RES_K(680))
RES(R77M1, RES_K(10))
RES(R78M1, RES_K(33))
RES(R79M1, RES_K(3.9))
RES(R80M1, RES_K(1))
RES(R81M1, RES_K(4.7))
RES(R100M1, RES_K(1))
RES(R101M1, 680)
RES(R102M2, RES_K(1))
RES(R103M2, 680)
//RES(R73M1, RES_K(22))
//RES(R74M1, RES_K(180))
//RES(R75M1, RES_K(330))
//RES(R76M1, RES_K(680))
//RES(R77M1, RES_K(10))
//RES(R78M1, RES_K(33))
//RES(R79M1, RES_K(3.9))
//RES(R80M1, RES_K(1))
//RES(R81M1, RES_K(4.7))
//RES(R100M1, RES_K(1))
//RES(R101M1, 680)
//RES(R102M2, RES_K(1))
//RES(R103M2, 680)
RES(R102MX, RES_K(33))
RES(R103MX, RES_K(33))
RES(R104MX, RES_K(33))
@ -162,7 +162,7 @@ NETLIST_START(tank)
CAP(C27, CAP_U(0.1))
CAP(C27A, CAP_U(0.001))
CAP(C28A, CAP_U(1))
CAP(C29, CAP_U(10))
//CAP(C29, CAP_U(10))
CAP(C30, CAP_U(0.1))
CAP(C30A, CAP_U(0.001))
CAP(C31, CAP_U(0.1))
@ -184,18 +184,18 @@ NETLIST_START(tank)
CAP(C41A, CAP_U(5))
CAP(C42, CAP_U(0.1))
CAP(C43A, CAP_P(220))
CAP(C43M2, CAP_U(0.001))
CAP(C44M2, CAP_U(5))
CAP(C47M2, CAP_U(0.001))
CAP(C48M2, CAP_U(0.1))
CAP(C49M2, CAP_U(10))
CAP(C50M2, CAP_U(22))
CAP(C51M1, CAP_U(0.22))
CAP(C52M1, CAP_U(0.001))
CAP(C53M1, CAP_U(0.1))
CAP(C54M1, CAP_U(10))
CAP(C55M1, CAP_U(0.001))
CAP(C56M1, CAP_U(5))
//CAP(C43M2, CAP_U(0.001))
//CAP(C44M2, CAP_U(5))
//CAP(C47M2, CAP_U(0.001))
//CAP(C48M2, CAP_U(0.1))
//CAP(C49M2, CAP_U(10))
//CAP(C50M2, CAP_U(22))
//CAP(C51M1, CAP_U(22))
//CAP(C52M1, CAP_U(0.001))
//CAP(C53M1, CAP_U(0.1))
//CAP(C54M1, CAP_U(10))
//CAP(C55M1, CAP_U(0.001))
//CAP(C56M1, CAP_U(5))
CAP(C100, CAP_U(0.001))
CAP(C101, CAP_U(1))
CAP(C106, CAP_U(1))
@ -204,10 +204,10 @@ NETLIST_START(tank)
POT(SHOT_NOISE_VOL, RES_K(50))
POT(BOOM_NOISE_VOL, RES_K(50))
POT(MOTOR1_VOL, RES_K(10))
POT(MOTOR1_VOL2, RES_K(100))
POT(MOTOR2_VOL, RES_K(10))
POT(MOTOR2_VOL2, RES_K(100))
//POT(MOTOR1_VOL, RES_K(10))
//POT(MOTOR1_VOL2, RES_K(100))
//POT(MOTOR2_VOL, RES_K(10))
//POT(MOTOR2_VOL2, RES_K(100))
POT(PLAYTIME, RES_M(1))
POT(FIRE1_ADJUST, RES_K(50))
@ -238,8 +238,8 @@ NETLIST_START(tank)
DIODE(CR10, "1N914")
DIODE(CR11, "1N914")
DIODE(CR12, "1N914")
DIODE(CR13M2, "1N914")
DIODE(CR14M1, "1N914")
//DIODE(CR13M2, "1N914")
//DIODE(CR14M1, "1N914")
DIODE(CR19, "1N914")
DIODE(CR22, "1N914")
@ -980,7 +980,7 @@ NETLIST_START(tank)
NET_C(V128, IC_E9.6)
NET_C(SCRE, IC_E9.5)
NET_C(D3, IC_E9.4)
NET_C(D2, IC_E9.4)
NET_C(V128, IC_E9.3)
NET_C(V64, IC_E9.10)
NET_C(SCRD, IC_E9.11)
@ -1106,10 +1106,11 @@ NETLIST_START(tank)
NET_C(VCC, R7V.1)
NET_C(R7V.2, R3V.1, C2.1)
NET_C(GND, C2.2)
NET_C(R5V.2, R34V.2, R6V.2, R3V.2, R4V.2, CR1.A, C29.1)
NET_C(R5V.2, R34V.2, R6V.2, R3V.2, R4V.2, CR1.A, RVID.1)
NET_C(CR1.K, COMP_SYNC)
ALIAS(VIDEO_OUT, C29.2)
NET_C(C29.2, GND)
RES(RVID, RES_K(10))
NET_C(RVID.2, GND)
ALIAS(VIDEO_OUT, RVID.1)
// Playfield & Score Load
NET_C(V_INFO, IC_H13.1)
@ -1804,7 +1805,7 @@ NETLIST_START(tank)
ALIAS(BOOM, IC_L6.7)
// Motor 1 Sound
TTL_7406_DIP(IC_K15)
/*TTL_7406_DIP(IC_K15)
NE555_DIP(IC_L15)
NE566_DIP(IC_M15)
MC3340_DIP(IC_N15)
@ -1840,10 +1841,11 @@ NETLIST_START(tank)
RES(R555OUT1, RES_K(1))
NET_C(R555OUT1.1, IC_L15.3)
NET_C(GND, R555OUT1.2)
ALIAS(MOTOR1, IC_N15.7)
ALIAS(MOTOR1, IC_N15.7)*/
ALIAS(MOTOR1, GND)
// Motor 2 Sound
NE555_DIP(IC_J15)
/*NE555_DIP(IC_J15)
NE566_DIP(IC_H15)
MC3340_DIP(IC_F15)
NET_C(VCC, IC_J15.8, IC_J15.4, Q33.C)
@ -1878,7 +1880,8 @@ NETLIST_START(tank)
RES(R555OUT2, RES_K(1))
NET_C(R555OUT2.1, IC_J15.3)
NET_C(GND, R555OUT2.2)
ALIAS(MOTOR2, IC_F15.7)
ALIAS(MOTOR2, IC_F15.7)*/
ALIAS(MOTOR2, GND)
// Mixer
NET_C(MOTOR1, R102MX.1)
@ -1917,5 +1920,5 @@ NETLIST_START(tank)
NET_C(VCC, IC_J11.9, IC_J11.11, IC_J11.13)
NET_C(VCC, IC_B6.9, IC_B6.3)
NET_C(VCC, IC_J3.9)
NET_C(VCC, IC_N13.1, IC_N13.13)
NETLIST_END()