From 31b7aa775454c1f46d9c10496ad7df3f54d18672 Mon Sep 17 00:00:00 2001 From: Alex Childs Date: Tue, 18 Jun 2019 08:18:46 -0500 Subject: [PATCH] Use correct stdint types --- src/classes/Keyboard.h | 22 +++++++++++----------- src/main.cpp | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/classes/Keyboard.h b/src/classes/Keyboard.h index 6fcc31c..5119b9d 100644 --- a/src/classes/Keyboard.h +++ b/src/classes/Keyboard.h @@ -45,17 +45,17 @@ class LedKeyboard { public: std::vector> SupportedKeyboards = { - { 0x46d, 0xc336, (u_int16_t)KeyboardModel::g213 }, - { 0x46d, 0xc330, (u_int16_t)KeyboardModel::g410 }, - { 0x46d, 0xc33a, (u_int16_t)KeyboardModel::g413 }, - { 0x46d, 0xc33c, (u_int16_t)KeyboardModel::g513 }, - { 0x46d, 0xc333, (u_int16_t)KeyboardModel::g610 }, - { 0x46d, 0xc338, (u_int16_t)KeyboardModel::g610 }, - { 0x46d, 0xc331, (u_int16_t)KeyboardModel::g810 }, - { 0x46d, 0xc337, (u_int16_t)KeyboardModel::g810 }, - { 0x46d, 0xc32b, (u_int16_t)KeyboardModel::g910 }, - { 0x46d, 0xc335, (u_int16_t)KeyboardModel::g910 }, - { 0x46d, 0xc339, (u_int16_t)KeyboardModel::gpro } + { 0x46d, 0xc336, (uint16_t)KeyboardModel::g213 }, + { 0x46d, 0xc330, (uint16_t)KeyboardModel::g410 }, + { 0x46d, 0xc33a, (uint16_t)KeyboardModel::g413 }, + { 0x46d, 0xc33c, (uint16_t)KeyboardModel::g513 }, + { 0x46d, 0xc333, (uint16_t)KeyboardModel::g610 }, + { 0x46d, 0xc338, (uint16_t)KeyboardModel::g610 }, + { 0x46d, 0xc331, (uint16_t)KeyboardModel::g810 }, + { 0x46d, 0xc337, (uint16_t)KeyboardModel::g810 }, + { 0x46d, 0xc32b, (uint16_t)KeyboardModel::g910 }, + { 0x46d, 0xc335, (uint16_t)KeyboardModel::g910 }, + { 0x46d, 0xc339, (uint16_t)KeyboardModel::gpro } }; enum class KeyboardModel : uint8_t { diff --git a/src/main.cpp b/src/main.cpp index 429f50c..1771811 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -280,13 +280,13 @@ int main(int argc, char **argv) { if (! utils::parseUInt8(argv[argIndex + 1], kbdProtocol)) return 1; switch(kbdProtocol) { case 1: - kbd.SupportedKeyboards = { { vendorID, productID, (u_int16_t)LedKeyboard::KeyboardModel::g810 } }; + kbd.SupportedKeyboards = { { vendorID, productID, (uint16_t)LedKeyboard::KeyboardModel::g810 } }; break; case 2: - kbd.SupportedKeyboards = { { vendorID, productID, (u_int16_t)LedKeyboard::KeyboardModel::g910 } }; + kbd.SupportedKeyboards = { { vendorID, productID, (uint16_t)LedKeyboard::KeyboardModel::g910 } }; break; case 3: - kbd.SupportedKeyboards = { { vendorID, productID, (u_int16_t)LedKeyboard::KeyboardModel::g213 } }; + kbd.SupportedKeyboards = { { vendorID, productID, (uint16_t)LedKeyboard::KeyboardModel::g213 } }; break; default: break;