diff options
author | hap <happppp@users.noreply.github.com> | 2014-12-21 16:50:22 +0100 |
---|---|---|
committer | hap <happppp@users.noreply.github.com> | 2014-12-21 16:50:22 +0100 |
commit | 31816d3e84d6813bd5393c941d7b8af601ce7a64 (patch) | |
tree | 8b6920a17bdd75ab466ca058bfd611b348697871 | |
parent | dc9654dd94a8a8ff7f86ccce9c177fb5856bb068 (diff) |
fix OFF button
-rw-r--r-- | src/mess/drivers/tispeak.c | 11 | ||||
-rw-r--r-- | src/mess/layout/tispeak.lay | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/mess/drivers/tispeak.c b/src/mess/drivers/tispeak.c index 20ddb7bfeeb..f7e38da925d 100644 --- a/src/mess/drivers/tispeak.c +++ b/src/mess/drivers/tispeak.c @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:hap +// copyright-holders:hap, Lord Nightmare /*************************************************************************** Texas Instruments Speak & Spell hardware @@ -159,7 +159,7 @@ void tispeak_state::power_off() WRITE_LINE_MEMBER(tispeak_state::auto_power_off) { - // power-off request from the MCU, usually after a couple of minutes of idling + // power-off request from the MCU, when [OFF] is pressed, also typically after a couple of minutes of idling if (state) power_off(); } @@ -186,7 +186,6 @@ WRITE16_MEMBER(tispeak_state::snmath_write_o) INPUT_CHANGED_MEMBER(tispeak_state::power_button) { - // note: even though power buttons are on the matrix, they are not MCU-controlled int on = (int)(FPTR)param; if (on) @@ -245,7 +244,7 @@ static INPUT_PORTS_START( snspell ) PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.7") // R7 - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") PORT_CHANGED_MEMBER(DEVICE_SELF, tispeak_state, power_button, (void *)0) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") // -> auto_power_off PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_NAME("Go") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_NAME("Replay") PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_NAME("Repeat") @@ -286,7 +285,7 @@ static INPUT_PORTS_START( snmath ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("Enter") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_NAME("Go") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") PORT_CHANGED_MEMBER(DEVICE_SELF, tispeak_state, power_button, (void *)0) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") // -> auto_power_off PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_START("IN.4") // R4 @@ -300,7 +299,7 @@ static INPUT_PORTS_START( snmath ) PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("-") PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(UTF8_MULTIPLY) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE) // / PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_NAME("Mix It") PORT_START("IN.6") // R6 diff --git a/src/mess/layout/tispeak.lay b/src/mess/layout/tispeak.lay index 2fb07738076..cb65a0519f1 100644 --- a/src/mess/layout/tispeak.lay +++ b/src/mess/layout/tispeak.lay @@ -6,18 +6,18 @@ <!-- note: the TI Speak & Spell 14seg digits look different from MAME's default, most notably the right half is wider --> <element name="digit" defstate="0"> - <led14seg><color red="0.3" green="1.0" blue="0.7" /></led14seg> + <led14seg><color red="0.2" green="1.0" blue="0.85" /></led14seg> </element> <!-- add our own for DP(display point) and the custom AP(apostrophe) segments --> <element name="lamp_dp" defstate="0"> - <disk state="0"><color red="0.0353" green="0.1255" blue="0.0863" /></disk> - <disk state="1"><color red="0.3" green="1.0" blue="0.7" /></disk> + <disk state="0"><color red="0.0235" green="0.1255" blue="0.1059" /></disk> + <disk state="1"><color red="0.2" green="1.0" blue="0.85" /></disk> </element> <element name="lamp_ap" defstate="0"> - <rect state="0"><color red="0.0353" green="0.1255" blue="0.0863" /></rect> - <rect state="1"><color red="0.3" green="1.0" blue="0.7" /></rect> + <rect state="0"><color red="0.0235" green="0.1255" blue="0.1059" /></rect> + <rect state="1"><color red="0.2" green="1.0" blue="0.85" /></rect> </element> |