From da8eb644ebfd877164d89bbe1b3e21c3083a5f26 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Sat, 11 Feb 2017 22:28:53 +0100 Subject: [PATCH] Restore g910 native effect --- src/classes/Keyboard.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/classes/Keyboard.cpp b/src/classes/Keyboard.cpp index d5ae030..d3c09a7 100644 --- a/src/classes/Keyboard.cpp +++ b/src/classes/Keyboard.cpp @@ -427,22 +427,38 @@ bool LedKeyboard::setStartupMode(StartupMode startupMode) { bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part, uint8_t speed, Color color) { + uint8_t protocolByte = 0; + + switch (m_keyboardModel) { + case KeyboardModel::g410: + case KeyboardModel::g610: + case KeyboardModel::g810: + protocolByte = 0x0d; + break; + case KeyboardModel::g910: + protocolByte = 0x10; + break; + default: + return false; + } + byte_buffer_t data; + switch (effect) { case NativeEffect::color: - data = { 0x11, 0xff, 0x0d, 0x3c, (uint8_t)part, 0x01, color.red, color.green, color.blue, 0x02 }; + data = { 0x11, 0xff, protocolByte, 0x3c, (uint8_t)part, 0x01, color.red, color.green, color.blue, 0x02 }; break; case NativeEffect::breathing: data = { - 0x11, 0xff, 0x0d, 0x3c, (uint8_t)part, 0x02, + 0x11, 0xff, protocolByte, 0x3c, (uint8_t)part, 0x02, color.red, color.green, color.blue, speed, 0x10, 0x00, 0x64 }; break; case NativeEffect::cycle: data = { - 0x11, 0xff, 0x0d, 0x3c, (uint8_t)part, 0x03, + 0x11, 0xff, protocolByte, 0x3c, (uint8_t)part, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, speed, 0x00, 0x00, 0x64 }; break; @@ -453,7 +469,7 @@ bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part, ui break; default: data = { - 0x11, 0xff, 0x0d, 0x3c, (uint8_t)part, 0x04, + 0x11, 0xff, protocolByte, 0x3c, (uint8_t)part, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x01, 0x64, speed }; break; @@ -466,7 +482,7 @@ bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part, ui break; default: data = { - 0x11, 0xff, 0x0d, 0x3c, (uint8_t)part, 0x04, + 0x11, 0xff, protocolByte, 0x3c, (uint8_t)part, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x02, 0x64, speed }; break; @@ -479,7 +495,7 @@ bool LedKeyboard::setNativeEffect(NativeEffect effect, NativeEffectPart part, ui break; default: data = { - 0x11, 0xff, 0x0d, 0x3c, (uint8_t)part, 0x04, + 0x11, 0xff, protocolByte, 0x3c, (uint8_t)part, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x03, 0x64, speed }; break;