diff options
| -rw-r--r-- | common/lb_common.c | 7 | ||||
| -rw-r--r-- | common/lightbar.c | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/common/lb_common.c b/common/lb_common.c index da6ea95739..aa237c776d 100644 --- a/common/lb_common.c +++ b/common/lb_common.c @@ -152,7 +152,7 @@ static inline uint8_t controller_read(int ctrl_num, uint8_t reg) #define MAX_GREEN 0x30 #define MAX_BLUE 0x67 #endif -#if defined(BOARD_SAMUS) +#if defined(BOARD_SAMUS) || defined(BOARD_RYU) /* Samus uses completely different LEDs, so the numbers are different. The * Samus LEDs can handle much higher currents, but these constants were * calibrated to provide uniform intensity at the level used by Link. @@ -161,11 +161,6 @@ static inline uint8_t controller_read(int ctrl_num, uint8_t reg) #define MAX_GREEN 0x2c #define MAX_BLUE 0x40 #endif -#if defined(BOARD_RYU) -#define MAX_RED 0xb4 -#define MAX_GREEN 0xac -#define MAX_BLUE 0xc0 -#endif #ifdef BOARD_HOST /* For testing only */ #define MAX_RED 0xff diff --git a/common/lightbar.c b/common/lightbar.c index b7f7bcf680..e0f5afccac 100644 --- a/common/lightbar.c +++ b/common/lightbar.c @@ -134,10 +134,10 @@ static const struct lightbar_params_v1 default_params = { .s5_idx = 5, /* flash red */ .color = { #if defined(BOARD_RYU) - {0x22, 0x17, 0x3b}, /* Segment0: Google blue */ - {0x3e, 0x10, 0x0c}, /* Segment1: Google red */ - {0x48, 0x3a, 0x0c}, /* Segment2: Google yellow */ - {0x1e, 0x2c, 0x1c}, /* Segment3: Google green */ + {0x74, 0x58, 0xb4}, /* Segment0: Google blue */ + {0xd6, 0x40, 0x20}, /* Segment1: Google red */ + {0xfa, 0xe6, 0x20}, /* Segment2: Google yellow */ + {0x66, 0xb0, 0x50}, /* Segment3: Google green */ #else /* * These values have been optically calibrated for the |