diff options
author | 2020-07-30 22:03:02 +0200 | |
---|---|---|
committer | 2020-07-30 22:03:46 +0200 | |
commit | 8e14b26747a7f26e92c534a07a26aec3342904d9 (patch) | |
tree | 28efa009f86f60096438e4cb7f2757a169dd34b8 | |
parent | dc506df5f2ba10cc33eacad6710a6fafa1662e1e (diff) |
ssystem3: added the new lcd screen to internal artwork
-rw-r--r-- | src/emu/rendlay.cpp | 4 | ||||
-rw-r--r-- | src/mame/drivers/saitek_exchess.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/saitek_mark5.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/saitek_simultano.cpp | 3 | ||||
-rw-r--r-- | src/mame/drivers/saitek_ssystem3.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/saitek_stratos.cpp | 2 | ||||
-rw-r--r-- | src/mame/layout/saitek_ssystem3.lay | 175 |
7 files changed, 171 insertions, 19 deletions
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index a7d6411a1e9..4db27e47762 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -2244,7 +2244,7 @@ protected: int endpos = basey+ourheight/num_shown; - // only render the symbol / text if it's atually in view because the code is SLOW + // only render the symbol / text if it's actually in view because the code is SLOW if ((endpos >= bounds.top()) && (basey <= bounds.bottom())) { while (1) @@ -2403,7 +2403,7 @@ private: int endpos = basex+(ourwidth/num_shown); - // only render the symbol / text if it's atually in view because the code is SLOW + // only render the symbol / text if it's actually in view because the code is SLOW if ((endpos >= bounds.left()) && (basex <= bounds.right())) { while (1) diff --git a/src/mame/drivers/saitek_exchess.cpp b/src/mame/drivers/saitek_exchess.cpp index e95ec363acf..447e9bbe21a 100644 --- a/src/mame/drivers/saitek_exchess.cpp +++ b/src/mame/drivers/saitek_exchess.cpp @@ -241,7 +241,7 @@ void exchess_state::exchess(machine_config &config) screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG)); screen.set_refresh_hz(60); - screen.set_size(1020, 1080); + screen.set_size(1020/1.5, 1080/1.5); screen.set_visarea_full(); } diff --git a/src/mame/drivers/saitek_mark5.cpp b/src/mame/drivers/saitek_mark5.cpp index 1a3ca4bb6ae..827fa92d5be 100644 --- a/src/mame/drivers/saitek_mark5.cpp +++ b/src/mame/drivers/saitek_mark5.cpp @@ -436,7 +436,7 @@ void mark5_state::mark5(machine_config &config) screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG)); screen.set_refresh_hz(60); - screen.set_size(942, 1080); + screen.set_size(942/1.5, 1080/1.5); screen.set_visarea_full(); config.set_default_layout(layout_saitek_mark5); diff --git a/src/mame/drivers/saitek_simultano.cpp b/src/mame/drivers/saitek_simultano.cpp index a5cfaf3f967..a01e5f80391 100644 --- a/src/mame/drivers/saitek_simultano.cpp +++ b/src/mame/drivers/saitek_simultano.cpp @@ -19,6 +19,9 @@ Hardware notes: It also appeared in Tandy's Chess Champion 2150, not as a simple rebrand, but with hardware differences: 3MHz R65C02, 1 64KB ROM and no EGR socket. +TODO: +- where does the IRQ come from? same problem as with stratos + ***************************************************************************/ #include "emu.h" diff --git a/src/mame/drivers/saitek_ssystem3.cpp b/src/mame/drivers/saitek_ssystem3.cpp index 189c82c21f1..08ae361f714 100644 --- a/src/mame/drivers/saitek_ssystem3.cpp +++ b/src/mame/drivers/saitek_ssystem3.cpp @@ -521,7 +521,7 @@ void ssystem3_state::ssystem3(machine_config &config) screen_device &screen(SCREEN(config, "chessunit", SCREEN_TYPE_SVG)); screen.set_refresh_hz(60); - screen.set_size(1060, 1080); + screen.set_size(1060/1.5, 1080/1.5); screen.set_visarea_full(); PWM_DISPLAY(config, m_display[1]).set_size(8, 48); diff --git a/src/mame/drivers/saitek_stratos.cpp b/src/mame/drivers/saitek_stratos.cpp index 4b508f34580..c370141917e 100644 --- a/src/mame/drivers/saitek_stratos.cpp +++ b/src/mame/drivers/saitek_stratos.cpp @@ -9,7 +9,6 @@ SciSys/Saitek Stratos chesscomputer family (1987-1990) - Stratos - Turbo King - Corona --> saitek_corona.cpp -- Simultano --> saitek_simultano.cpp IMPORTANT: The user is expected to press the STOP button to turn off the computer. When not using -autosave, press that button before exiting MAME, or NVRAM can get corrupt. @@ -38,7 +37,6 @@ Hardware notes: Stratos/Turbo King are identical. Corona has magnet sensors and two HELIOS chips. -Simultano has an extra LCD screen representing the chessboard state. There is no official Saitek program versioning for these. The D/D+ versions are known since they're the same chess engine as later Saitek modules, such as the Analyst module. diff --git a/src/mame/layout/saitek_ssystem3.lay b/src/mame/layout/saitek_ssystem3.lay index 64643ef2044..72957cb7e79 100644 --- a/src/mame/layout/saitek_ssystem3.lay +++ b/src/mame/layout/saitek_ssystem3.lay @@ -12,18 +12,10 @@ license:CC0 <element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element> <element name="brown"><rect><color red="0.4" green="0.2" blue="0.1" /></rect></element> - <element name="lcd_bg" defstate="1"> - <rect state="1"><color red="0.58" green="0.61" blue="0.62" /></rect> - <rect state="0"><color red="0.40" green="0.42" blue="0.43" /></rect> - </element> - <element name="hl" defstate="0"> <text string=" "/> <rect state="1"><color red="0" green="0" blue="0" /></rect> </element> - <element name="nothing" defstate="0"> - <text string=" "/> - </element> <element name="switch" defstate="0"> <disk> @@ -48,6 +40,48 @@ license:CC0 </disk> </element> + <element name="switch2" defstate="0"> + <rect state="0"> + <bounds x="0" y="1" width="4" height="4" /> + <color red="0.2" green="0.2" blue="0.2" /> + </rect> + <rect state="0"> + <bounds x="0" y="0" width="4" height="4" /> + <color red="0.8" green="0.8" blue="0.8" /> + </rect> + <rect state="1"> + <bounds x="0" y="0" width="4" height="4" /> + <color red="0.2" green="0.2" blue="0.2" /> + </rect> + <rect state="1"> + <bounds x="0" y="1" width="4" height="4" /> + <color red="0.8" green="0.8" blue="0.8" /> + </rect> + </element> + + <element name="text_v0"><text string="8"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v1"><text string="7"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v2"><text string="6"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v3"><text string="5"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v4"><text string="4"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v5"><text string="3"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v6"><text string="2"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_v7"><text string="1"><color red="0.65" green="0.65" blue="0.653" /></text></element> + + <element name="text_a0"><text string="A"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a1"><text string="B"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a2"><text string="C"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a3"><text string="D"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a4"><text string="E"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a5"><text string="F"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a6"><text string="G"><color red="0.65" green="0.65" blue="0.653" /></text></element> + <element name="text_a7"><text string="H"><color red="0.65" green="0.65" blue="0.653" /></text></element> + + <element name="text_cu1"><text string="LOOK"><color red="0.65" green="0.65" blue="0.65" /></text></element> + <element name="text_cu2"><text string="↓NOW ↑MOVE"><color red="0.65" green="0.65" blue="0.65" /></text></element> + <element name="text_cu3"><text string="LIGHT"><color red="0.65" green="0.65" blue="0.65" /></text></element> + <element name="text_cu4"><text string="↓ON ↑OFF"><color red="0.65" green="0.65" blue="0.65" /></text></element> + <element name="text_n1"> <rect><color red="0.8" green="0.8" blue="0.8" /></rect> <text string="1" align="1"><color red="0.1" green="0.1" blue="0.1" /></text> @@ -160,16 +194,86 @@ license:CC0 <element name="text_u3"><text string="TIME"><color red="0.65" green="0.65" blue="0.65" /></text></element> -<!-- build screen --> +<!-- lcd screen 1 --> - <view name="Internal Layout"> - <bounds left="-2" right="48" top="2" bottom="32" /> + <element name="lcd_bg" defstate="1"> + <rect state="1"><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect state="0"><color red="0.40" green="0.42" blue="0.43" /></rect> + </element> - <bezel element="brown"><bounds x="-2" y="12" width="52" height="6" /></bezel> + <element name="nothing" defstate="0"><text string=" "/></element> + <group name="lcd1"> + <bounds x="-1" y="3" width="18" height="8" /> <screen index="0" blend="alpha"><bounds x="0" y="4" width="15.8" height="6" /></screen> <element ref="nothing" blend="add" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="-1" y="3" width="18" height="8" /></element> <element ref="lcd_bg" blend="multiply" inputtag="IN.4" inputmask="0x02" inputraw="1"><bounds x="-1" y="3" width="18" height="8" /></element> + </group> + + +<!-- lcd screen 2 --> + + <element name="whitew"><rect><color red="1" green="1" blue="1" /></rect></element> + <element name="lcd2m"><rect><color red="0.69" green="0.69" blue="0.69" /></rect></element> + + <element name="lcd_cb"> + <rect><bounds x="-2.5" y="-2.5" width="45" height="45" /><color red="0.05" green="0.55" blue="0.4" /></rect> + + <rect><bounds x="0" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="10" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="20" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="30" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="5" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="15" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="25" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="35" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + + <rect><bounds x="0" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="10" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="20" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="30" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="5" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="15" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="25" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="35" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + + <rect><bounds x="0" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="10" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="20" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="30" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="5" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="15" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="25" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="35" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + + <rect><bounds x="0" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="10" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="20" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="30" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="5" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="15" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="25" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + <rect><bounds x="35" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect> + </element> + + <group name="lcd2"> + <bounds x="1.5" y="2.9" width="122.6" height="122.1" /> + <element ref="whitew"><bounds x="6.2" y="7.6" width="113.3" height="112.8" /></element> + <screen index="1" blend="alpha"><bounds x="9.8" y="10" width="106" height="108" /></screen> + <element ref="lcd_cb" blend="multiply"><bounds x="1.5" y="2.9" width="122.6" height="122.1" /></element> + + <element ref="nothing" blend="add" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="6.2" y="7.6" width="113.3" height="112.8" /></element> + <element ref="lcd2m" blend="multiply" inputtag="IN.4" inputmask="0x04" inputraw="1"><bounds x="6.2" y="7.6" width="113.3" height="112.8" /></element> + </group> + + +<!-- master unit --> + + <group name="main"> + <bounds left="-2" right="48" top="2" bottom="32" /> + <group ref="lcd1"><bounds x="-1" y="3" width="18" height="8" /></group> + + <bezel element="brown"><bounds x="-2" y="12" width="52" height="6" /></bezel> <bezel element="switch" inputtag="IN.4" inputmask="0x02" inputraw="1"><bounds x="30.0" y="5.5" width="1.2" height="2.4" /></bezel> <bezel element="switch" inputtag="IN.4" inputmask="0x01" inputraw="1"><bounds x="34.4" y="5.5" width="1.2" height="2.4" /></bezel> @@ -246,6 +350,53 @@ license:CC0 <bezel element="text_b9a"><bounds x="41" y="30.2" width="6" height="0.9" /></bezel> <bezel element="text_b0b"><bounds x="-2.3" y="29.2" width="2" height="0.9" /></bezel> <bezel element="text_b9b"><bounds x="46.3" y="29.2" width="2" height="0.9" /></bezel> + </group> + + +<!-- build screen --> + + <view name="Internal Layout (Full)"> + <bounds left="26" right="100" top="0" bottom="30" /> + <group ref="main"><bounds x="50" y="0" width="50" height="30" /></group> + <group ref="lcd2"><bounds x="29.3" y="0.35" width="17.37" height="17.3" /></group> + <bezel element="brown"><bounds x="26" y="0" width="2" height="30" /></bezel> + <bezel element="brown"><bounds x="48" y="0" width="2" height="30" /></bezel> + <bezel element="brown"><bounds x="49" y="10" width="2" height="6" /></bezel> + + <repeat count="8"> + <param name="y" start="1.75" increment="1.93" /> + <param name="i" start="0" increment="1" /> + <element ref="text_v~i~"><bounds x="28.6" y="~y~" width="1.5" height="0.9" /></element> + </repeat> + <repeat count="8"> + <param name="x" start="30.45" increment="1.93" /> + <param name="i" start="0" increment="1" /> + <element ref="text_a~i~"><bounds x="~x~" y="17.2" width="1.5" height="0.9" /></element> + </repeat> + + <bezel element="switch2" inputtag="IN.6" inputmask="0x01" inputraw="1"><bounds x="36" y="24" width="4" height="5" /></bezel> + <bezel element="switch2" inputtag="IN.4" inputmask="0x04" inputraw="1"><bounds x="42" y="24" width="4" height="5" /></bezel> + + <bezel element="text_cu1"><bounds x="35" y="21.9" width="6" height="0.9" /></bezel> + <bezel element="text_cu2"><bounds x="35" y="22.9" width="6" height="0.9" /></bezel> + <bezel element="text_cu3"><bounds x="41" y="21.9" width="6" height="0.9" /></bezel> + <bezel element="text_cu4"><bounds x="41" y="22.9" width="6" height="0.9" /></bezel> </view> + + <view name="Internal Layout (Master Unit)"> + <bounds x="0" y="0" width="50" height="30" /> + <group ref="main"><bounds x="0" y="0" width="50" height="30" /></group> + </view> + + <view name="Internal Layout (Screen 1)"> + <bounds x="0" y="4" width="15.8" height="6" /> + <group ref="lcd1"><bounds x="-1" y="3" width="18" height="8" /></group> + </view> + + <view name="Internal Layout (Screen 2)"> + <bounds x="6.2" y="7.6" width="113.3" height="112.8" /> + <group ref="lcd2"><bounds x="1.5" y="2.9" width="122.6" height="122.1" /></group> + </view> + </mamelayout> |