From 4c5f5c408f95b24643a7efe0bbb825d6b67182f9 Mon Sep 17 00:00:00 2001 From: Cooper Hall Date: Sat, 2 Sep 2023 00:21:35 +0000 Subject: [PATCH] fixed a compiler error on some compiler instances related to KeyboardLayoutManager --- KeyboardLayoutManager/KeyboardLayoutManager.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/KeyboardLayoutManager/KeyboardLayoutManager.h b/KeyboardLayoutManager/KeyboardLayoutManager.h index 69ddb77b..629bcf4d 100644 --- a/KeyboardLayoutManager/KeyboardLayoutManager.h +++ b/KeyboardLayoutManager/KeyboardLayoutManager.h @@ -11,6 +11,7 @@ #include #include #include +#include #include "RGBControllerKeyNames.h" extern const char* KLM_CLASS_NAME; @@ -67,9 +68,9 @@ enum KEYBOARD_OPCODE typedef struct { - uint8_t zone; - uint8_t row; - uint8_t col; + std::uint8_t zone; + std::uint8_t row; + std::uint8_t col; unsigned int value; const char* name; KEYBOARD_OPCODE opcode; @@ -126,23 +127,23 @@ public: void GetKeyMap(unsigned int* map_ptr); void GetKeyMap(unsigned int* map_ptr, KEYBOARD_MAP_FILL_TYPE fill_type); void GetKeyMap(unsigned int* map_ptr, KEYBOARD_MAP_FILL_TYPE fill_type, - uint8_t height, uint8_t width); + std::uint8_t height, std::uint8_t width); private: void OpCodeSwitch(key_set change_keys); void InsertKey(keyboard_led key); void InsertKeys(std::vector keys); - bool InsertRow(uint8_t row); + bool InsertRow(std::uint8_t row); void SwapKey(keyboard_led keys); void SwapKeys(std::vector keys); void RemoveKey(keyboard_led keys); - void RemoveRow(uint8_t row); + void RemoveRow(std::uint8_t row); KEYBOARD_LAYOUT layout; KEYBOARD_SIZE physical_size; std::string name = KLM_CLASS_NAME; - uint8_t rows = 0; - uint8_t cols = 0; + std::uint8_t rows = 0; + std::uint8_t cols = 0; std::vector keymap; };