summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2019-06-15 23:38:38 +0200
committer hap <happppp@users.noreply.github.com>2019-06-15 23:38:54 +0200
commitc1e13d34cd21c215e089036618dcd9250388feba (patch)
tree8053e92f0608fdb6b3f399e789c8f85f4a44a12e
parent5848497b93793f693615314a5772732618d2f36b (diff)
hh_pic16: change screenless to pwm_display_device (nw)
-rw-r--r--src/devices/video/pwm.cpp39
-rw-r--r--src/devices/video/pwm.h4
-rw-r--r--src/mame/drivers/hh_amis2k.cpp2
-rw-r--r--src/mame/drivers/hh_cop400.cpp7
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp2
-rw-r--r--src/mame/drivers/hh_pic16.cpp113
-rw-r--r--src/mame/drivers/hh_ucom4.cpp2
-rw-r--r--src/mame/layout/cqback.lay40
-rw-r--r--src/mame/layout/funrlgl.lay6
-rw-r--r--src/mame/layout/h2hfootb.lay4
-rw-r--r--src/mame/layout/hccbaskb.lay5
-rw-r--r--src/mame/layout/tbaskb.lay5
12 files changed, 133 insertions, 96 deletions
diff --git a/src/devices/video/pwm.cpp b/src/devices/video/pwm.cpp
index 32843125ef7..2f22b9843af 100644
--- a/src/devices/video/pwm.cpp
+++ b/src/devices/video/pwm.cpp
@@ -21,6 +21,11 @@ to "digity", for use with multi-state elements, eg. 7seg leds.
If you use this device in a slot, or use multiple of them (or just don't want to use
the default output tags), set a callback.
+Brightness tresholds (0.0 to 1.0) indicate how long an element was powered on in the last
+frame, eg. 0.01 means a minimum on-time for 1%. Some games use two levels of brightness
+by strobing elements longer.
+
+
TODO:
- multiple brightness levels doesn't work for SVGs
@@ -47,11 +52,12 @@ pwm_display_device::pwm_display_device(const machine_config &mconfig, const char
m_output_a_cb(*this),
m_output_digit_cb(*this)
{
- // set defaults (60hz frames, 0.5 interpolation, 1 brightness level)
+ // set defaults
set_refresh(attotime::from_hz(60));
set_interpolation(0.5);
- set_bri_levels(0.02);
+ set_bri_levels(0.01);
set_bri_minimum(0);
+ set_bri_maximum(0.0);
set_size(0, 0);
reset_segmask();
}
@@ -95,6 +101,7 @@ void pwm_display_device::device_start()
save_item(NAME(m_interpolation));
save_item(NAME(m_levels));
save_item(NAME(m_level_min));
+ save_item(NAME(m_level_max));
save_item(NAME(m_segmask));
save_item(NAME(m_rowsel));
@@ -126,10 +133,10 @@ pwm_display_device &pwm_display_device::set_bri_levels(double l0, double l1, dou
{
// init brightness level(s) (if you need to set more than 4, use set_bri_one)
reset_bri_levels();
- m_levels[0] = l0;
- m_levels[1] = l1;
- m_levels[2] = l2;
- m_levels[3] = l3;
+ set_bri_one(0, l0);
+ set_bri_one(1, l1);
+ set_bri_one(2, l2);
+ set_bri_one(3, l3);
return *this;
}
@@ -213,12 +220,23 @@ void pwm_display_device::schedule_frame()
TIMER_CALLBACK_MEMBER(pwm_display_device::frame_tick)
{
- update(); // final timeslice
-
const double frame_time = m_framerate.as_double();
const double factor0 = m_interpolation;
const double factor1 = 1.0 - factor0;
+ // determine brightness cutoff
+ double cutoff = m_level_max;
+ if (cutoff == 0.0)
+ {
+ u8 level;
+ for (level = 1; m_levels[level] < 1.0; level++) { ; }
+ cutoff = 4 * m_levels[level - 1];
+ }
+ if (cutoff > 1.0)
+ cutoff = 1.0;
+
+ update(); // final timeslice
+
for (int y = 0; y < m_height; y++)
{
u64 row = 0;
@@ -227,7 +245,8 @@ TIMER_CALLBACK_MEMBER(pwm_display_device::frame_tick)
{
// determine brightness level
double bri = m_bri[y][x] * factor1 + (m_acc[y][x].as_double() / frame_time) * factor0;
- if (bri > 1.0) bri = 1.0; // shouldn't happen
+ if (bri > cutoff)
+ bri = cutoff;
m_bri[y][x] = bri;
u8 level;
@@ -253,7 +272,7 @@ TIMER_CALLBACK_MEMBER(pwm_display_device::frame_tick)
}
}
- // output to digity (does not support brightness levels)
+ // output to digity (does not support multiple brightness levels)
if (m_segmask[y] != 0)
{
row &= m_segmask[y];
diff --git a/src/devices/video/pwm.h b/src/devices/video/pwm.h
index 07e04bfb388..62ea71b5c8b 100644
--- a/src/devices/video/pwm.h
+++ b/src/devices/video/pwm.h
@@ -24,6 +24,7 @@ public:
pwm_display_device &reset_segmask() { std::fill_n(m_segmask, ARRAY_LENGTH(m_segmask), 0); return *this; }
pwm_display_device &set_bri_levels(double l0, double l1 = 1.0, double l2 = 1.0, double l3 = 1.0); // brightness threshold per level (0.0 - 1.0)
pwm_display_device &set_bri_minimum(u8 i) { m_level_min = i; return *this; } // minimum level index for element to be considered "on"
+ pwm_display_device &set_bri_maximum(double b) { m_level_max = b; return *this; } // maximum brightness level, 0.0 for auto
// output callbacks when not using the default output tags
auto output_x() { return m_output_x_cb.bind(); } // x = offset >> 6, y = offset & 0x3f
@@ -72,8 +73,9 @@ private:
attotime m_framerate_set;
attotime m_framerate;
double m_interpolation;
- double m_levels[0x100];
+ double m_levels[0x41];
u8 m_level_min;
+ double m_level_max;
u64 m_segmask[0x40];
u64 m_rowsel;
diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp
index 3481b944243..2218f92a791 100644
--- a/src/mame/drivers/hh_amis2k.cpp
+++ b/src/mame/drivers/hh_amis2k.cpp
@@ -247,7 +247,7 @@ void wildfire_state::wildfire(machine_config &config)
/* video hardware */
PWM_DISPLAY(config, m_display).set_size(12, 8);
m_display->set_segmask(7, 0x7f);
- m_display->set_bri_levels(0.02, 0.1); // bumpers are dimmed
+ m_display->set_bri_levels(0.01, 0.1); // bumpers are dimmed
config.set_default_layout(layout_wildfire);
/* sound hardware */
diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp
index 5304e79fb1a..7ad308e8e02 100644
--- a/src/mame/drivers/hh_cop400.cpp
+++ b/src/mame/drivers/hh_cop400.cpp
@@ -907,7 +907,7 @@ INPUT_PORTS_END
void funjacks_state::funjacks(machine_config &config)
{
/* basic machine hardware */
- COP410(config, m_maincpu, 1000000); // approximation - RC osc. R=47K, C=56pF
+ COP410(config, m_maincpu, 750000); // approximation - RC osc. R=47K, C=56pF
m_maincpu->set_config(COP400_CKI_DIVISOR_8, COP400_CKO_OSCILLATOR_OUTPUT, false); // guessed
m_maincpu->write_d().set(FUNC(funjacks_state::write_d));
m_maincpu->write_l().set(FUNC(funjacks_state::write_l));
@@ -917,7 +917,6 @@ void funjacks_state::funjacks(machine_config &config)
/* video hardware */
PWM_DISPLAY(config, m_display).set_size(4, 2);
- m_display->set_bri_levels(0.15);
config.set_default_layout(layout_funjacks);
/* sound hardware */
@@ -1002,7 +1001,7 @@ INPUT_PORTS_END
void funrlgl_state::funrlgl(machine_config &config)
{
/* basic machine hardware */
- COP410(config, m_maincpu, 1000000); // approximation - RC osc. R=51K, C=91pF
+ COP410(config, m_maincpu, 750000); // approximation - RC osc. R=51K, C=91pF
m_maincpu->set_config(COP400_CKI_DIVISOR_8, COP400_CKO_OSCILLATOR_OUTPUT, false); // guessed
m_maincpu->write_d().set(FUNC(funrlgl_state::write_d));
m_maincpu->write_l().set(FUNC(funrlgl_state::write_l));
@@ -1012,7 +1011,7 @@ void funrlgl_state::funrlgl(machine_config &config)
/* video hardware */
PWM_DISPLAY(config, m_display).set_size(4, 4);
- m_display->set_bri_levels(0.02, 0.1); // top led is brighter
+ m_display->set_bri_levels(0.01, 0.1); // top led is brighter
config.set_default_layout(layout_funrlgl);
/* sound hardware */
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index ddc11949a53..2a1d36b3c20 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -3662,7 +3662,7 @@ void mwcbaseb_state::mwcbaseb(machine_config &config)
screen.set_visarea_full();
PWM_DISPLAY(config, m_display).set_size(8, 16);
- m_display->set_bri_levels(0.002); // cyan elements strobed very briefly?
+ m_display->set_bri_levels(0.001); // cyan elements strobed very briefly?
config.set_default_layout(layout_mwcbaseb);
/* sound hardware */
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index 8058a61dd82..5a2197efb90 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -39,8 +39,7 @@
TODO:
- tweak MCU frequency for games when video/audio recording surfaces(YouTube etc.)
- - some of the games rely on the fact that faster/longer strobed leds appear brighter,
- eg. hccbaskb(player led), ..
+ - us2pfball player led is brighter, but I can't get a stable picture
- ttfball: discrete sound part, for volume gating?
- what's the relation between hccbaskb and tbaskb? Is one the bootleg of the
other? Or are they both made by the same subcontractor? I presume Toytronic.
@@ -49,9 +48,8 @@
***************************************************************************/
#include "emu.h"
-#include "includes/screenless.h"
-
#include "cpu/pic16c5x/pic16c5x.h"
+#include "video/pwm.h"
#include "machine/clock.h"
#include "machine/timer.h"
#include "sound/spkrdev.h"
@@ -71,18 +69,20 @@
#include "hh_pic16_test.lh" // common test-layout - use external artwork
-class hh_pic16_state : public screenless_state
+class hh_pic16_state : public driver_device
{
public:
hh_pic16_state(const machine_config &mconfig, device_type type, const char *tag) :
- screenless_state(mconfig, type, tag),
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
+ m_display(*this, "display"),
m_speaker(*this, "speaker"),
m_inputs(*this, "IN.%u", 0)
{ }
// devices
required_device<pic16c5x_device> m_maincpu;
+ optional_device<pwm_display_device> m_display;
optional_device<speaker_sound_device> m_speaker;
optional_ioport_array<6> m_inputs; // max 6
@@ -107,8 +107,6 @@ protected:
void hh_pic16_state::machine_start()
{
- screenless_state::machine_start();
-
// zerofill
m_a = 0;
m_b = 0;
@@ -214,8 +212,7 @@ public:
void touchme_state::prepare_display()
{
- set_display_segmask(3, 0x7f);
- display_matrix(7, 7, m_c, ~m_b & 0x7b);
+ m_display->matrix(~m_b & 0x7b, m_c);
}
void touchme_state::update_speaker()
@@ -290,6 +287,9 @@ void touchme_state::touchme(machine_config &config)
// PIC CLKOUT, tied to RTCC
CLOCK(config, "clock", 300000/4).signal_handler().set_inputline("maincpu", PIC16C5x_RTCC);
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(7, 7);
+ m_display->set_segmask(3, 0x7f);
config.set_default_layout(layout_touchme);
/* sound hardware */
@@ -336,13 +336,12 @@ public:
void pabball_state::prepare_display()
{
// CD4028 BCD to decimal decoder
+ // CD4028 0-8: led select, 9: 7seg
u16 sel = m_c & 0xf;
if (sel & 8) sel &= 9;
sel = 1 << sel;
- // CD4028 9 is 7seg
- set_display_segmask(0x200, 0xff);
- display_matrix(8, 10, m_b, sel);
+ m_display->matrix(sel, m_b);
}
WRITE8_MEMBER(pabball_state::write_b)
@@ -394,6 +393,9 @@ void pabball_state::pabball(machine_config &config)
m_maincpu->read_c().set_ioport("IN.1");
m_maincpu->write_c().set(FUNC(pabball_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(10, 8);
+ m_display->set_segmask(0x200, 0xff);
config.set_default_layout(layout_hh_pic16_test);
/* sound hardware */
@@ -428,9 +430,7 @@ class melodym_state : public hh_pic16_state
public:
melodym_state(const machine_config &mconfig, device_type type, const char *tag) :
hh_pic16_state(mconfig, type, tag)
- {
- set_display_levels(0.9);
- }
+ { }
DECLARE_WRITE8_MEMBER(write_b);
DECLARE_READ8_MEMBER(read_c);
@@ -455,7 +455,7 @@ READ8_MEMBER(melodym_state::read_c)
WRITE8_MEMBER(melodym_state::write_c)
{
// C6: both lamps
- display_matrix(1, 1, ~data >> 6 & 1, 1);
+ m_display->matrix(1, ~data >> 6 & 1);
// C7: speaker out
m_speaker->level_w(~data >> 7 & 1);
@@ -515,6 +515,9 @@ void melodym_state::melodym(machine_config &config)
m_maincpu->read_c().set(FUNC(melodym_state::read_c));
m_maincpu->write_c().set(FUNC(melodym_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(1, 1);
+ m_display->set_bri_levels(0.9);
config.set_default_layout(layout_melodym);
/* sound hardware */
@@ -566,12 +569,9 @@ public:
void maniac_state::prepare_display()
{
- m_display_state[0] = ~m_b & 0x7f;
- m_display_state[1] = ~m_c & 0x7f;
-
- set_display_segmask(3, 0x7f);
- set_display_size(7, 2);
- display_update();
+ m_display->write_row(0, ~m_b & 0x7f);
+ m_display->write_row(1, ~m_c & 0x7f);
+ m_display->update();
}
void maniac_state::update_speaker()
@@ -619,6 +619,9 @@ void maniac_state::maniac(machine_config &config)
m_maincpu->write_b().set(FUNC(maniac_state::write_b));
m_maincpu->write_c().set(FUNC(maniac_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(2, 7);
+ m_display->set_segmask(3, 0x7f);
config.set_default_layout(layout_maniac);
/* sound hardware */
@@ -695,7 +698,7 @@ void matchme_state::set_clock()
WRITE8_MEMBER(matchme_state::write_b)
{
// B0-B7: lamps
- display_matrix(8, 1, data, 1);
+ m_display->matrix(1, data);
}
READ8_MEMBER(matchme_state::read_c)
@@ -773,6 +776,8 @@ void matchme_state::matchme(machine_config &config)
m_maincpu->read_c().set(FUNC(matchme_state::read_c));
m_maincpu->write_c().set(FUNC(matchme_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(1, 8);
config.set_default_layout(layout_matchme);
/* sound hardware */
@@ -875,7 +880,7 @@ WRITE8_MEMBER(leboom_state::write_b)
WRITE8_MEMBER(leboom_state::write_c)
{
// C4: single led
- display_matrix(1, 1, data >> 4 & 1, 1);
+ m_display->matrix(1, data >> 4 & 1);
// C7: speaker on
m_c = data;
@@ -934,6 +939,8 @@ void leboom_state::leboom(machine_config &config)
m_maincpu->read_c().set_constant(0xff);
m_maincpu->write_c().set(FUNC(leboom_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(1, 1);
config.set_default_layout(layout_leboom);
/* sound hardware */
@@ -982,9 +989,7 @@ public:
void tbaskb_state::prepare_display()
{
- // B4,B5 are 7segs
- set_display_segmask(0x30, 0x7f);
- display_matrix(7, 6, m_c, m_b);
+ m_display->matrix(m_b, m_c);
}
READ8_MEMBER(tbaskb_state::read_a)
@@ -1001,7 +1006,8 @@ WRITE8_MEMBER(tbaskb_state::write_b)
// B0-B4: input mux
m_inp_mux = ~data & 0x1f;
- // B0-B5: led select
+ // B0-B3: led select
+ // B4,B5: digit select
m_b = data;
prepare_display();
}
@@ -1049,6 +1055,10 @@ void tbaskb_state::tbaskb(machine_config &config)
m_maincpu->read_c().set_constant(0xff);
m_maincpu->write_c().set(FUNC(tbaskb_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(6, 7);
+ m_display->set_segmask(0x30, 0x7f);
+ m_display->set_bri_levels(0.01, 0.2); // player led is brighter
config.set_default_layout(layout_tbaskb);
/* sound hardware */
@@ -1101,15 +1111,10 @@ public:
void rockpin_state::prepare_display()
{
// 3 7seg leds from ports A and B
- set_display_segmask(7, 0x7f);
- display_matrix(7, 3, m_b, m_a, false);
+ m_display->matrix_partial(0, 3, m_a, m_b, false);
// 44 leds from ports C and D
- for (int y = 0; y < 6; y++)
- m_display_state[y+3] = (m_d >> y & 1) ? m_c : 0;
-
- set_display_size(8, 3+6);
- display_update();
+ m_display->matrix_partial(3, 6, m_d, m_c);
}
WRITE8_MEMBER(rockpin_state::write_a)
@@ -1171,6 +1176,9 @@ void rockpin_state::rockpin(machine_config &config)
// PIC CLKOUT, tied to RTCC
CLOCK(config, "clock", 450000/4).signal_handler().set_inputline(m_maincpu, PIC16C5x_RTCC);
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(3+6, 8);
+ m_display->set_segmask(7, 0x7f);
config.set_default_layout(layout_rockpin);
/* sound hardware */
@@ -1221,9 +1229,7 @@ public:
void hccbaskb_state::prepare_display()
{
- // B5,B6 are 7segs
- set_display_segmask(0x60, 0x7f);
- display_matrix(7, 7, m_c, m_b);
+ m_display->matrix(m_b, m_c);
}
READ8_MEMBER(hccbaskb_state::read_a)
@@ -1243,7 +1249,8 @@ WRITE8_MEMBER(hccbaskb_state::write_b)
// B7: speaker out
m_speaker->level_w(data >> 7 & 1);
- // B0-B6: led select
+ // B0-B4: led select
+ // B5,B6: digit select
m_b = data;
prepare_display();
}
@@ -1288,6 +1295,10 @@ void hccbaskb_state::hccbaskb(machine_config &config)
m_maincpu->read_c().set_constant(0xff);
m_maincpu->write_c().set(FUNC(hccbaskb_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(7, 7);
+ m_display->set_segmask(0x60, 0x7f);
+ m_display->set_bri_levels(0.01, 0.2); // player led is brighter
config.set_default_layout(layout_hccbaskb);
/* sound hardware */
@@ -1346,8 +1357,7 @@ void ttfball_state::prepare_display()
const u8 _4511_map[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0,0,0,0,0,0 };
u16 led_data = (m_c & 0x20) ? (_4511_map[m_c & 0xf] | (~m_c << 3 & 0x80)) : (~m_c << 8 & 0x700);
- set_display_segmask(0x7f, 0xff);
- display_matrix(11, 9, led_data, m_b | (m_c << 1 & 0x100));
+ m_display->matrix(m_b | (m_c << 1 & 0x100), led_data);
}
READ8_MEMBER(ttfball_state::read_a)
@@ -1445,6 +1455,9 @@ void ttfball_state::ttfball(machine_config &config)
m_maincpu->read_c().set_constant(0xff);
m_maincpu->write_c().set(FUNC(ttfball_state::write_c));
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(9, 11);
+ m_display->set_segmask(0x7f, 0xff);
config.set_default_layout(layout_ttfball);
/* sound hardware */
@@ -1499,9 +1512,7 @@ public:
void uspbball_state::prepare_display()
{
- // D0-D2 are 7segs
- set_display_segmask(7, 0x7f);
- display_matrix(16, 6, m_c << 8 | m_b, m_d);
+ m_display->matrix(m_d, m_c << 8 | m_b);
}
WRITE8_MEMBER(uspbball_state::write_a)
@@ -1526,7 +1537,8 @@ WRITE8_MEMBER(uspbball_state::write_c)
WRITE8_MEMBER(uspbball_state::write_d)
{
- // D0-D5: led/digit select
+ // D0-D2: digit select
+ // D3-D5: led select
m_d = ~data;
prepare_display();
}
@@ -1566,6 +1578,9 @@ void uspbball_state::uspbball(machine_config &config)
// PIC CLKOUT, tied to RTCC
CLOCK(config, "clock", 900000/4).signal_handler().set_inputline("maincpu", PIC16C5x_RTCC);
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(6, 16);
+ m_display->set_segmask(7, 0x7f);
config.set_default_layout(layout_hh_pic16_test);
/* sound hardware */
@@ -1616,8 +1631,7 @@ public:
void us2pfball_state::prepare_display()
{
- set_display_segmask(0xff, 0x7f);
- display_matrix(7, 10, m_c, m_d | (m_a << 6 & 0x300));
+ m_display->matrix(m_d | (m_a << 6 & 0x300), m_c);
}
READ8_MEMBER(us2pfball_state::read_a)
@@ -1706,6 +1720,9 @@ void us2pfball_state::us2pfball(machine_config &config)
// PIC CLKOUT, tied to RTCC
CLOCK(config, "clock", 800000/4).signal_handler().set_inputline("maincpu", PIC16C5x_RTCC);
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(10, 7);
+ m_display->set_segmask(0xff, 0x7f);
config.set_default_layout(layout_us2pfball);
/* sound hardware */
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index 9565df83710..9e50dd6160c 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -2144,7 +2144,6 @@ void grobot9_state::grobot9(machine_config &config)
/* video hardware */
PWM_DISPLAY(config, m_display).set_size(1, 9);
- m_display->set_bri_levels(0.25);
config.set_default_layout(layout_grobot9);
/* sound hardware */
@@ -2414,7 +2413,6 @@ void tmtennis_state::tmtennis(machine_config &config)
screen.set_visarea_full();
PWM_DISPLAY(config, m_display).set_size(12, 12);
- m_display->set_bri_levels(0.005);
config.set_default_layout(layout_tmtennis);
/* sound hardware */
diff --git a/src/mame/layout/cqback.lay b/src/mame/layout/cqback.lay
index 9c66c1eb82e..7b456217996 100644
--- a/src/mame/layout/cqback.lay
+++ b/src/mame/layout/cqback.lay
@@ -58,7 +58,7 @@
</element>
<element name="seg" defstate="0">
<rect state="0"><color red="0.13" green="0.0325" blue="0.0338" /></rect>
- <rect state="1"><color red="0.6" green="0.15" blue="0.16" /></rect>
+ <rect state="1"><color red="0.5" green="0.125" blue="0.13" /></rect>
<rect state="2"><color red="1.0" green="0.25" blue="0.26" /></rect>
</element>
<element name="mask" defstate="0">
@@ -178,25 +178,25 @@
<!-- digit masks -->
- <bezel name="0.0" element="mask"><bounds x="8" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="1.0" element="mask"><bounds x="52" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="2.0" element="mask"><bounds x="96" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="3.0" element="mask"><bounds x="140" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="4.0" element="mask"><bounds x="184" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="5.0" element="mask"><bounds x="228" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="6.0" element="mask"><bounds x="272" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="7.0" element="mask"><bounds x="316" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="8.0" element="mask"><bounds x="360" y="-17" width="17" height="6" /><color alpha="0.4" /></bezel>
-
- <bezel name="0.3" element="mask"><bounds x="5" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="1.3" element="mask"><bounds x="49" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="2.3" element="mask"><bounds x="93" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="3.3" element="mask"><bounds x="137" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="4.3" element="mask"><bounds x="181" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="5.3" element="mask"><bounds x="225" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="6.3" element="mask"><bounds x="269" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="7.3" element="mask"><bounds x="313" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
- <bezel name="8.3" element="mask"><bounds x="357" y="12" width="17" height="6" /><color alpha="0.4" /></bezel>
+ <bezel name="0.0" element="mask"><bounds x="8" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="1.0" element="mask"><bounds x="52" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="2.0" element="mask"><bounds x="96" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="3.0" element="mask"><bounds x="140" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="4.0" element="mask"><bounds x="184" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="5.0" element="mask"><bounds x="228" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="6.0" element="mask"><bounds x="272" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="7.0" element="mask"><bounds x="316" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="8.0" element="mask"><bounds x="360" y="-17" width="17" height="6" /><color alpha="0.5" /></bezel>
+
+ <bezel name="0.3" element="mask"><bounds x="5" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="1.3" element="mask"><bounds x="49" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="2.3" element="mask"><bounds x="93" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="3.3" element="mask"><bounds x="137" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="4.3" element="mask"><bounds x="181" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="5.3" element="mask"><bounds x="225" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="6.3" element="mask"><bounds x="269" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="7.3" element="mask"><bounds x="313" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
+ <bezel name="8.3" element="mask"><bounds x="357" y="12" width="17" height="6" /><color alpha="0.5" /></bezel>
</view>
</mamelayout>
diff --git a/src/mame/layout/funrlgl.lay b/src/mame/layout/funrlgl.lay
index ea7311b8429..a9ffd16e77c 100644
--- a/src/mame/layout/funrlgl.lay
+++ b/src/mame/layout/funrlgl.lay
@@ -11,9 +11,9 @@
<disk state="2"><color red="1.0" green="0.20" blue="0.22" /></disk>
</element>
<element name="ledg" defstate="0">
- <disk state="0"><color red="0.02" green="0.14" blue="0.03" /></disk>
- <disk state="1"><color red="0.1" green="0.5" blue="0.11" /></disk>
- <disk state="2"><color red="0.2" green="1.0" blue="0.22" /></disk>
+ <disk state="0"><color red="0.02" green="0.14" blue="0.04" /></disk>
+ <disk state="1"><color red="0.1" green="0.5" blue="0.16" /></disk>
+ <disk state="2"><color red="0.2" green="1.0" blue="0.32" /></disk>
</element>
diff --git a/src/mame/layout/h2hfootb.lay b/src/mame/layout/h2hfootb.lay
index 438c427f65a..1c0c7494de8 100644
--- a/src/mame/layout/h2hfootb.lay
+++ b/src/mame/layout/h2hfootb.lay
@@ -56,12 +56,12 @@
<element name="seg" defstate="0">
<rect state="0"><color red="0.13" green="0.0325" blue="0.0338" /></rect>
- <rect state="1"><color red="0.6" green="0.15" blue="0.16" /></rect>
+ <rect state="1"><color red="0.5" green="0.125" blue="0.13" /></rect>
<rect state="2"><color red="1.0" green="0.25" blue="0.26" /></rect>
</element>
<element name="led" defstate="0">
<disk state="0"><color red="0.13" green="0.0325" blue="0.0338" /></disk>
- <disk state="1"><color red="0.6" green="0.15" blue="0.16" /></disk>
+ <disk state="1"><color red="0.5" green="0.125" blue="0.13" /></disk>
<disk state="2"><color red="1.0" green="0.25" blue="0.26" /></disk>
</element>
diff --git a/src/mame/layout/hccbaskb.lay b/src/mame/layout/hccbaskb.lay
index a841031f8ba..686fc89172b 100644
--- a/src/mame/layout/hccbaskb.lay
+++ b/src/mame/layout/hccbaskb.lay
@@ -13,8 +13,9 @@
<element name="text_l3"><text string="HOME" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
<element name="led" defstate="0">
- <disk state="0"><color red="0.2" green="0.04" blue="0.05" /></disk>
- <disk state="1"><color red="1.0" green="0.2" blue="0.23" /></disk>
+ <disk state="0"><color red="0.14" green="0.02" blue="0.03" /></disk>
+ <disk state="1"><color red="0.5" green="0.1" blue="0.11" /></disk>
+ <disk state="2"><color red="1.0" green="0.20" blue="0.23" /></disk>
</element>
<element name="digit" defstate="0">
diff --git a/src/mame/layout/tbaskb.lay b/src/mame/layout/tbaskb.lay
index 185ce823abd..a34097d2a4f 100644
--- a/src/mame/layout/tbaskb.lay
+++ b/src/mame/layout/tbaskb.lay
@@ -12,8 +12,9 @@
<element name="text_l2"><text string="VISITOR" align="2"><color red="0.9" green="0.9" blue="0.9" /></text></element>
<element name="led" defstate="0">
- <disk state="0"><color red="0.2" green="0.04" blue="0.05" /></disk>
- <disk state="1"><color red="1.0" green="0.2" blue="0.23" /></disk>
+ <disk state="0"><color red="0.14" green="0.02" blue="0.03" /></disk>
+ <disk state="1"><color red="0.5" green="0.1" blue="0.11" /></disk>
+ <disk state="2"><color red="1.0" green="0.20" blue="0.23" /></disk>
</element>
<element name="digit" defstate="0">