diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp index 1477e422..2a542de5 100644 --- a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp +++ b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp @@ -45,9 +45,9 @@ typedef struct const char * name; const unsigned char zone; const unsigned char idx; -} led_type; +} aw510k_led_type; -static const led_type led_names[] = +static const aw510k_led_type led_names[] = { /* Key Label Zone, Index */ { KEY_EN_ESCAPE, ALIENWARE_AW510K_ZONE_DIRECT_KEYBOARD, 0xB0 }, diff --git a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp index 790fd827..3d25f579 100644 --- a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp +++ b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp @@ -40,9 +40,9 @@ typedef struct { const char * name; const unsigned char idx; -} led_type; +} annepro2_led_type; -static const led_type led_names[] = +static const annepro2_led_type led_names[] = { /* Key Label Index */ { KEY_EN_ESCAPE, 0 }, diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp index a277caae..d0f0d502 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp @@ -44,7 +44,7 @@ static unsigned int falchion_matrix_map[5][16] = { 3, NA, 12, 17, 21, 25, 29, 34, 38, 42, 47, 52, 56, NA, 61, 66 }, { 4, 8, 13, NA, NA, NA, 30, NA, NA, NA, 43, 48, 53, 57, 62, 67 } }; -static const std::vector default_led_names = +static const std::vector default_led_names = { /* Key Label Index */ { KEY_EN_ESCAPE, 0x00 }, @@ -153,7 +153,7 @@ static const std::vector default_led_names = { KEY_EN_NUMPAD_ENTER, 0xB4 }, }; -static const std::vector default_tkl_led_names = +static const std::vector default_tkl_led_names = { /* Key Label Index */ { KEY_EN_ESCAPE, 0x00 }, @@ -270,7 +270,7 @@ static const std::vector default_tkl_led_names = { "Underglow 26", 0xCE }, }; -static const std::vector default_65pct_led_names = +static const std::vector default_65pct_led_names = { /* Key Label Index */ { KEY_EN_ESCAPE, 0x00 }, @@ -395,7 +395,7 @@ void RGBController_AuraKeyboard::SetupZones() | Set up zones | \*---------------------------------------------------------*/ std::vector led_zones; - std::vector led_names; + std::vector led_names; switch(layout) { diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h index ded09cf6..be1a90a5 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h @@ -24,7 +24,7 @@ typedef struct { const char* name; unsigned char idx; -} led_type; +} aura_keyboard_led; typedef struct { diff --git a/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp index 46d5c114..3e84b885 100644 --- a/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp +++ b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.cpp @@ -130,7 +130,7 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) } } break; - + case EVGA_GPU_V3_MODE_BREATHING: { uint8_t result = bus->i2c_smbus_read_i2c_block_data(dev, EVGA_GPU_V3_REG_BREATHING + zone, 10, data_pkt); @@ -147,8 +147,8 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) uint8_t blue2 = data_pkt[7]; zone_config.colors[1] = ToRGBColor(red2, green2, blue2); zone_config.numberOfColors= (zone_config.colors[1] != 0 ) ? 2 : 1 ; - speed16.LSB = data_pkt[8]; - speed16.MSB = data_pkt[9]; + speed16.lsb = data_pkt[8]; + speed16.msb = data_pkt[9]; zone_config.speed = speed16.u16; zone_config.direction = 0; } @@ -169,8 +169,8 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) //Load data zone_config.brightness = data_pkt[1]; zone_config.numberOfColors = 0; - speed16.LSB = data_pkt[2]; - speed16.MSB = data_pkt[3]; + speed16.lsb = data_pkt[2]; + speed16.msb = data_pkt[3]; zone_config.speed = speed16.u16; } else @@ -192,8 +192,8 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) uint8_t blue = data_pkt[4]; zone_config.colors[0] = ToRGBColor(red, green, blue); zone_config.numberOfColors = 1; - speed16.LSB = data_pkt[5]; - speed16.MSB = data_pkt[6]; + speed16.lsb = data_pkt[5]; + speed16.msb = data_pkt[6]; zone_config.speed = speed16.u16; } else @@ -230,7 +230,7 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) { readFail = true; } - + } else { @@ -257,11 +257,11 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) uint8_t blue = data_pkt[(color_index * 4) + 4]; zone_config.colors[color_index] = ToRGBColor(red, green, blue); } - speed16.LSB = data_pkt[29]; - speed16.MSB = data_pkt[30]; + speed16.lsb = data_pkt[29]; + speed16.msb = data_pkt[30]; zone_config.speed = speed16.u16; } - else + else { readFail = true; } @@ -288,7 +288,7 @@ EVGAv3_config EVGAGPUv3Controller::GetZoneConfig(uint8_t zone, uint8_t mode) for(uint8_t i = 0; i < 7; i++) { zone_config.colors[i] = 0; - } + } LOG_DEBUG("[%s] Failed while loading Zone %1d configuration from HW", evgaGPUName, zone); } return zone_config; @@ -423,8 +423,8 @@ void EVGAGPUv3Controller::SetZone(uint8_t zone, uint8_t mode, EVGAv3_config zone zone_pkt[5] = RGBGetRValue(zone_config.colors[1]); zone_pkt[6] = RGBGetGValue(zone_config.colors[1]); zone_pkt[7] = RGBGetBValue(zone_config.colors[1]); - zone_pkt[8] = speed16.LSB; - zone_pkt[9] = speed16.MSB; + zone_pkt[8] = speed16.lsb; + zone_pkt[9] = speed16.msb; bus->i2c_smbus_write_i2c_block_data(dev, EVGA_GPU_V3_REG_STATIC + ((mode -1) * 4) + zone, sizeof(zone_pkt), zone_pkt); } @@ -439,8 +439,8 @@ void EVGAGPUv3Controller::SetZone(uint8_t zone, uint8_t mode, EVGAv3_config zone zone_pkt[0] = sizeof(zone_pkt) - 1; zone_pkt[1] = zone_config.brightness; - zone_pkt[2] = speed16.LSB; - zone_pkt[3] = speed16.MSB; + zone_pkt[2] = speed16.lsb; + zone_pkt[3] = speed16.msb; bus->i2c_smbus_write_i2c_block_data(dev, EVGA_GPU_V3_REG_STATIC + ((mode -1) * 4) + zone, sizeof(zone_pkt), zone_pkt); } @@ -456,8 +456,8 @@ void EVGAGPUv3Controller::SetZone(uint8_t zone, uint8_t mode, EVGAv3_config zone zone_pkt[2] = RGBGetRValue(zone_config.colors[0]); zone_pkt[3] = RGBGetGValue(zone_config.colors[0]); zone_pkt[4] = RGBGetBValue(zone_config.colors[0]); - zone_pkt[5] = speed16.LSB; - zone_pkt[6] = speed16.MSB; + zone_pkt[5] = speed16.lsb; + zone_pkt[6] = speed16.msb; bus->i2c_smbus_write_i2c_block_data(dev, EVGA_GPU_V3_REG_STATIC + ((mode -1) * 4) + zone, sizeof(zone_pkt), zone_pkt); } @@ -480,8 +480,8 @@ void EVGAGPUv3Controller::SetZone(uint8_t zone, uint8_t mode, EVGAv3_config zone zone_pkt[3 + color_index * 4] = RGBGetGValue(zone_config.colors[color_index]); zone_pkt[4 + color_index * 4] = RGBGetBValue(zone_config.colors[color_index]); } - zone_pkt[29] = speed16.LSB; - zone_pkt[30] = speed16.MSB; + zone_pkt[29] = speed16.lsb; + zone_pkt[30] = speed16.msb; // Color Count packet construction color_cnt_pkt[0] = sizeof(color_cnt_pkt) - 1; diff --git a/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h index bbd30931..f982b100 100644 --- a/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h +++ b/Controllers/EVGAAmpereGPUController/EVGAGPUv3Controller.h @@ -27,8 +27,8 @@ union u16_to_u8 uint16_t u16; struct { - uint8_t LSB; - uint8_t MSB; + uint8_t lsb; + uint8_t msb; }; }; @@ -67,7 +67,7 @@ enum //Control registers and offsets enum //Mode values for EVGA_GPU_V3_REG_MODE { EVGA_GPU_V3_MODE_OFF = 0x00, - EVGA_GPU_V3_MODE_STATIC = 0x01, + EVGA_GPU_V3_MODE_STATIC = 0x01, EVGA_GPU_V3_MODE_BREATHING = 0x02, EVGA_GPU_V3_MODE_RAINBOW = 0x03, EVGA_GPU_V3_MODE_COLOR_CYCLE = 0x04, diff --git a/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp index 39413d2c..8624581b 100644 --- a/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp +++ b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.cpp @@ -70,7 +70,7 @@ unsigned char EVGAGPUv2Controller::GetMode() return_mode = EVGA_GPU_V2_RGB_MODE_OFF; } break; - + case EVGA_GPU_V2_MODE_STATIC: { return_mode = EVGA_GPU_V2_RGB_MODE_STATIC; @@ -87,8 +87,8 @@ unsigned char EVGAGPUv2Controller::GetMode() { u16_to_u8 speed_16 = { (uint16_t) 0 }; - speed_16.LSB = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_LSB); - speed_16.MSB = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_MSB); + speed_16.lsb = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_LSB); + speed_16.msb = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_MSB); if (speed_16.u16 == 0) { @@ -112,8 +112,8 @@ unsigned char EVGAGPUv2Controller::GetSpeed() { u16_to_u8 speed_16 = { (uint16_t) 0 }; - speed_16.LSB = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_LSB); - speed_16.MSB = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_MSB); + speed_16.lsb = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_LSB); + speed_16.msb = bus->i2c_smbus_read_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_MSB); speed_16.u16 /= SPEED_MULTIPLIER; @@ -235,16 +235,16 @@ void EVGAGPUv2Controller::SendMode(uint8_t mode) void EVGAGPUv2Controller::SendSpeed(u16_to_u8 aOnTime, u16_to_u8 bOnTime, u16_to_u8 b2a, u16_to_u8 a2b, u16_to_u8 speed_un) { - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_UN_LSB, (unsigned char) speed_un.LSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_UN_MSB, (unsigned char) speed_un.MSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_LSB, (unsigned char) b2a.LSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_MSB, (unsigned char) b2a.MSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_ONTIME_LSB, (unsigned char) bOnTime.LSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_ONTIME_MSB, (unsigned char) bOnTime.MSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_A_TO_B_SPEED_LSB, (unsigned char) a2b.LSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_A_TO_B_SPEED_MSB, (unsigned char) a2b.MSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_LSB, (unsigned char) aOnTime.LSB ); - bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_MSB, (unsigned char) aOnTime.MSB ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_UN_LSB, (unsigned char) speed_un.lsb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_UN_MSB, (unsigned char) speed_un.msb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_LSB, (unsigned char) b2a.lsb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_B_TO_A_SPEED_MSB, (unsigned char) b2a.msb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_ONTIME_LSB, (unsigned char) bOnTime.lsb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_B_ONTIME_MSB, (unsigned char) bOnTime.msb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_A_TO_B_SPEED_LSB, (unsigned char) a2b.lsb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_A_TO_B_SPEED_MSB, (unsigned char) a2b.msb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_LSB, (unsigned char) aOnTime.lsb ); + bus->i2c_smbus_write_byte_data(dev, EVGA_GPU_V2_REG_COLOR_A_ONTIME_MSB, (unsigned char) aOnTime.msb ); } void EVGAGPUv2Controller::SetColor(RGBColor colorA, RGBColor colorB, uint8_t brightness) diff --git a/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h index fba55feb..fff03d90 100644 --- a/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h +++ b/Controllers/EVGATuringGPUController/EVGAGPUv2Controller.h @@ -26,8 +26,8 @@ union u16_to_u8 uint16_t u16; struct { - uint8_t LSB; - uint8_t MSB; + uint8_t lsb; + uint8_t msb; }; }; @@ -66,7 +66,7 @@ enum enum { EVGA_GPU_V2_MODE_OFF = 0x00, - EVGA_GPU_V2_MODE_STATIC = 0x01, + EVGA_GPU_V2_MODE_STATIC = 0x01, EVGA_GPU_V2_MODE_RAINBOW = 0x0F, EVGA_GPU_V2_MODE_BREATHING = 0x22, }; diff --git a/Controllers/LogitechController/RGBController_LogitechG815.cpp b/Controllers/LogitechController/RGBController_LogitechG815.cpp index 76ef80d0..0635c526 100644 --- a/Controllers/LogitechController/RGBController_LogitechG815.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG815.cpp @@ -46,9 +46,9 @@ typedef struct const char * name; const unsigned char zone; const unsigned char idx; -} led_type; +} logitech_g815_led; -static const led_type led_names[] = +static const logitech_g815_led led_names[] = { /* Key Label Zone, Index */ { KEY_EN_A, LOGITECH_G815_ZONE_DIRECT_KEYBOARD, 0x04 }, diff --git a/Controllers/MSIMysticLightController/MSIMysticLight162Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight162Controller.cpp index f58d03cb..0d1c12de 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight162Controller.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLight162Controller.cpp @@ -17,7 +17,7 @@ #define BITSET(val, bit, pos) ((unsigned char)std::bitset<8>(val).set((pos), (bit)).to_ulong()) -struct Config +struct mystic_light_162_config { unsigned short pid; // PID of the board size_t numof_onboard_leds; // number of onboard leds @@ -65,9 +65,9 @@ const std::vector zones_set3 = | Boards with yet unknown supported zones are configured to support all zones. | \*-----------------------------------------------------------------------------------------------------------------------------*/ -#define NUMOF_CONFIGS (sizeof(board_configs) / sizeof(Config)) +#define NUMOF_CONFIGS (sizeof(board_configs) / sizeof(mystic_light_162_config)) -static const Config board_configs[] = +static const mystic_light_162_config board_configs[] = { { 0x1720, 10, &zones_set0 }, // MPG Z390 GAMING EDGE AC { 0x7B12, 10, &zones_set0 }, // MEG Z390 ACE @@ -107,7 +107,7 @@ MSIMysticLight162Controller::MSIMysticLight162Controller /*-----------------------------------------*\ | Initialize zone based per LED data | \*-----------------------------------------*/ - const Config* board_config = nullptr; + const mystic_light_162_config* board_config = nullptr; for(std::size_t i = 0; i < NUMOF_CONFIGS; ++i) { diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight185Controller.cpp index 3132f5b3..5843133f 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight185Controller.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLight185Controller.cpp @@ -34,7 +34,7 @@ using namespace std::chrono_literals; #define PER_LED_FULL_SYNC_MODE (PER_LED_BASIC_SYNC_MODE | SYNC_SETTING_JRAINBOW1 | SYNC_SETTING_JRAINBOW2 | SYNC_SETTING_JCORSAIR) -struct Config +struct mystic_light_185_config { unsigned short pid; // PID of the board int numof_onboard_leds; // number of onboard leds @@ -210,9 +210,9 @@ const std::vector zones_set16 = | Boards with yet unknown supported zones are configured to support all zones. | \*---------------------------------------------------------------------------------------------------------------------------------*/ -#define NUMOF_CONFIGS (sizeof(board_configs) / sizeof(Config)) +#define NUMOF_CONFIGS (sizeof(board_configs) / sizeof(mystic_light_185_config)) -static const Config board_configs[] = +static const mystic_light_185_config board_configs[] = { { 0x7B93, 6, 1, 0, 1, &zones_set3, MSIMysticLight185Controller::DIRECT_MODE_ZONE_BASED }, // MPG X570 GAMING PRO CARBON WIFI { 0x7C34, 0, 1, 1, 1, &zones_set8, MSIMysticLight185Controller::DIRECT_MODE_ZONE_BASED }, // MEG X570 GODLIKE @@ -325,7 +325,7 @@ MSIMysticLight185Controller::MSIMysticLight185Controller data.save_data = 0; data.on_board_led.colorFlags = 0x80 | SYNC_SETTING_ONBOARD; // always enable onboard sync flag to have expected zone control - const Config* board_config = nullptr; + const mystic_light_185_config* board_config = nullptr; for(std::size_t i = 0; i < NUMOF_CONFIGS; ++i) { diff --git a/Controllers/OpenRazerController/OpenRazerDevices.h b/Controllers/OpenRazerController/OpenRazerDevices.h index 713c6585..ad34c8dd 100644 --- a/Controllers/OpenRazerController/OpenRazerDevices.h +++ b/Controllers/OpenRazerController/OpenRazerDevices.h @@ -1,4 +1,4 @@ -#define RAZER_MAX_ZONES 6 +#define OPEN_RAZER_MAX_ZONES 6 #include #include "RGBController.h" @@ -10,7 +10,7 @@ typedef struct unsigned int type; unsigned int rows; unsigned int cols; -} razer_zone; +} open_razer_zone; typedef struct { @@ -18,7 +18,7 @@ typedef struct unsigned int row; unsigned int col; const char* name; -} razer_key; +} open_razer_key; typedef struct { @@ -27,17 +27,17 @@ typedef struct bool matrix_type; unsigned int rows; unsigned int cols; - const razer_zone* zones[RAZER_MAX_ZONES]; - const razer_key* keymap; + const open_razer_zone* zones[OPEN_RAZER_MAX_ZONES]; + const open_razer_key* keymap; unsigned int keymap_size; -} razer_device; +} open_razer_device; /*-------------------------------------------------------------------------*\ | KEYMAPS | \*-------------------------------------------------------------------------*/ #define BLACKWIDOW_CHROMA_KEYMAP_SIZE (sizeof(blackwidow_chroma_keymap) / sizeof(blackwidow_chroma_keymap[0])) -static const razer_key blackwidow_chroma_keymap[] = +static const open_razer_key blackwidow_chroma_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -156,7 +156,7 @@ static const razer_key blackwidow_chroma_keymap[] = #define BLACKWIDOW_CHROMA_TE_KEYMAP_SIZE (sizeof(blackwidow_chroma_te_keymap) / sizeof(blackwidow_chroma_te_keymap[0])) -static const razer_key blackwidow_chroma_te_keymap[] = +static const open_razer_key blackwidow_chroma_te_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -253,7 +253,7 @@ static const razer_key blackwidow_chroma_te_keymap[] = #define BLADE_PRO_2017_KEYMAP_SIZE (sizeof(blade_pro_2017_keymap) / sizeof(blade_pro_2017_keymap[0])) -static const razer_key blade_pro_2017_keymap[] = +static const open_razer_key blade_pro_2017_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -347,7 +347,7 @@ static const razer_key blade_pro_2017_keymap[] = #define BLADE_STEALTH_KEYMAP_SIZE (sizeof(blade_stealth_keymap) / sizeof(blade_stealth_keymap[0])) -static const razer_key blade_stealth_keymap[] = +static const open_razer_key blade_stealth_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -443,7 +443,7 @@ static const razer_key blade_stealth_keymap[] = #define CYNOSA_CHROMA_KEYMAP_SIZE (sizeof(cynosa_chroma_keymap) / sizeof(cynosa_chroma_keymap[0])) -static const razer_key cynosa_chroma_keymap[] = +static const open_razer_key cynosa_chroma_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -559,7 +559,7 @@ static const razer_key cynosa_chroma_keymap[] = #define HUNTSMAN_ELITE_KEYMAP_SIZE (sizeof(huntsman_elite_keymap) / sizeof(huntsman_elite_keymap[0])) -static const razer_key huntsman_elite_keymap[] = +static const open_razer_key huntsman_elite_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -678,7 +678,7 @@ static const razer_key huntsman_elite_keymap[] = #define HUNTSMAN_KEYMAP_SIZE (sizeof(huntsman_keymap) / sizeof(huntsman_keymap[0])) -static const razer_key huntsman_keymap[] = +static const open_razer_key huntsman_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -793,7 +793,7 @@ static const razer_key huntsman_keymap[] = #define HUNTSMAN_TE_KEYMAP_SIZE (sizeof(huntsman_te_keymap) / sizeof(huntsman_te_keymap[0])) -static const razer_key huntsman_te_keymap[] = +static const open_razer_key huntsman_te_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -891,7 +891,7 @@ static const razer_key huntsman_te_keymap[] = #define BLACKWIDOW_ELITE_KEYMAP_SIZE (sizeof(blackwidow_elite_keymap) / sizeof(blackwidow_elite_keymap[0])) -static const razer_key blackwidow_elite_keymap[] = +static const open_razer_key blackwidow_elite_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -1011,7 +1011,7 @@ static const razer_key blackwidow_elite_keymap[] = #define BLACKWIDOW_2019_KEYMAP_SIZE (sizeof(blackwidow_2019_keymap) / sizeof(blackwidow_2019_keymap[0])) -static const razer_key blackwidow_2019_keymap[] = +static const open_razer_key blackwidow_2019_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -1127,7 +1127,7 @@ static const razer_key blackwidow_2019_keymap[] = #define ORNATA_CHROMA_KEYMAP_SIZE (sizeof(ornata_chroma_keymap) / sizeof(ornata_chroma_keymap[0])) -static const razer_key ornata_chroma_keymap[] = +static const open_razer_key ornata_chroma_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -1242,7 +1242,7 @@ static const razer_key ornata_chroma_keymap[] = #define BLACKWIDOW_CHROMA_V2_KEYMAP_SIZE (sizeof(blackwidow_chroma_v2_keymap) / sizeof(blackwidow_chroma_v2_keymap[0])) -static const razer_key blackwidow_chroma_v2_keymap[] = +static const open_razer_key blackwidow_chroma_v2_keymap[] = { /*---------------------------------------------------------------------*\ | Zone, Row, Column, Key | @@ -1370,7 +1370,7 @@ static const razer_key blackwidow_chroma_v2_keymap[] = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_2019_zone = +static const open_razer_zone blackwidow_2019_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1378,7 +1378,7 @@ static const razer_zone blackwidow_2019_zone = 22 }; -static const razer_device blackwidow_2019_device = +static const open_razer_device blackwidow_2019_device = { "Razer BlackWidow 2019", DEVICE_TYPE_KEYBOARD, @@ -1404,7 +1404,7 @@ static const razer_device blackwidow_2019_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_chroma_zone = +static const open_razer_zone blackwidow_chroma_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1412,7 +1412,7 @@ static const razer_zone blackwidow_chroma_zone = 22 }; -static const razer_device blackwidow_chroma_device = +static const open_razer_device blackwidow_chroma_device = { "Razer BlackWidow Chroma", DEVICE_TYPE_KEYBOARD, @@ -1438,7 +1438,7 @@ static const razer_device blackwidow_chroma_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_chroma_overwatch_zone = +static const open_razer_zone blackwidow_chroma_overwatch_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1446,7 +1446,7 @@ static const razer_zone blackwidow_chroma_overwatch_zone = 22 }; -static const razer_device blackwidow_chroma_overwatch_device = +static const open_razer_device blackwidow_chroma_overwatch_device = { "Razer Blackwidow Chroma Overwatch", DEVICE_TYPE_KEYBOARD, @@ -1472,7 +1472,7 @@ static const razer_device blackwidow_chroma_overwatch_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_chroma_te_zone = +static const open_razer_zone blackwidow_chroma_te_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1480,7 +1480,7 @@ static const razer_zone blackwidow_chroma_te_zone = 22 }; -static const razer_device blackwidow_chroma_te_device = +static const open_razer_device blackwidow_chroma_te_device = { "Razer BlackWidow Chroma Tournament Edition", DEVICE_TYPE_KEYBOARD, @@ -1506,7 +1506,7 @@ static const razer_device blackwidow_chroma_te_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_elite_zone = +static const open_razer_zone blackwidow_elite_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1514,7 +1514,7 @@ static const razer_zone blackwidow_elite_zone = 22 }; -static const razer_device blackwidow_elite_device = +static const open_razer_device blackwidow_elite_device = { "Razer BlackWidow Elite", DEVICE_TYPE_KEYBOARD, @@ -1540,7 +1540,7 @@ static const razer_device blackwidow_elite_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_chroma_v2_zone = +static const open_razer_zone blackwidow_chroma_v2_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1548,7 +1548,7 @@ static const razer_zone blackwidow_chroma_v2_zone = 22 }; -static const razer_device blackwidow_chroma_v2_device = +static const open_razer_device blackwidow_chroma_v2_device = { "Razer BlackWidow Chroma V2", DEVICE_TYPE_KEYBOARD, @@ -1574,7 +1574,7 @@ static const razer_device blackwidow_chroma_v2_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_x_chroma_zone = +static const open_razer_zone blackwidow_x_chroma_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1582,7 +1582,7 @@ static const razer_zone blackwidow_x_chroma_zone = 22 }; -static const razer_device blackwidow_x_chroma_device = +static const open_razer_device blackwidow_x_chroma_device = { "Razer BlackWidow X Chroma", DEVICE_TYPE_KEYBOARD, @@ -1608,7 +1608,7 @@ static const razer_device blackwidow_x_chroma_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blackwidow_x_chroma_te_zone = +static const open_razer_zone blackwidow_x_chroma_te_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1616,7 +1616,7 @@ static const razer_zone blackwidow_x_chroma_te_zone = 22 }; -static const razer_device blackwidow_x_chroma_te_device = +static const open_razer_device blackwidow_x_chroma_te_device = { "Razer BlackWidow X Chroma Tournament Edition", DEVICE_TYPE_KEYBOARD, @@ -1642,7 +1642,7 @@ static const razer_device blackwidow_x_chroma_te_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone cynosa_chroma_zone = +static const open_razer_zone cynosa_chroma_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1650,7 +1650,7 @@ static const razer_zone cynosa_chroma_zone = 22 }; -static const razer_device cynosa_chroma_device = +static const open_razer_device cynosa_chroma_device = { "Razer Cynosa Chroma", DEVICE_TYPE_KEYBOARD, @@ -1676,7 +1676,7 @@ static const razer_device cynosa_chroma_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone cynosa_v2_zone = +static const open_razer_zone cynosa_v2_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1684,7 +1684,7 @@ static const razer_zone cynosa_v2_zone = 22 }; -static const razer_device cynosa_v2_device = +static const open_razer_device cynosa_v2_device = { "Razer Cynosa V2", DEVICE_TYPE_KEYBOARD, @@ -1710,7 +1710,7 @@ static const razer_device cynosa_v2_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone cynosa_lite_zone = +static const open_razer_zone cynosa_lite_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_SINGLE, @@ -1718,7 +1718,7 @@ static const razer_zone cynosa_lite_zone = 1 }; -static const razer_device cynosa_lite_device = +static const open_razer_device cynosa_lite_device = { "Razer Cynosa Lite", DEVICE_TYPE_KEYBOARD, @@ -1744,7 +1744,7 @@ static const razer_device cynosa_lite_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone ornata_chroma_zone = +static const open_razer_zone ornata_chroma_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1752,7 +1752,7 @@ static const razer_zone ornata_chroma_zone = 22 }; -static const razer_device ornata_chroma_device = +static const open_razer_device ornata_chroma_device = { "Razer Ornata Chroma", DEVICE_TYPE_KEYBOARD, @@ -1778,7 +1778,7 @@ static const razer_device ornata_chroma_device = | Linear | | 12 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone deathstalker_chroma_zone = +static const open_razer_zone deathstalker_chroma_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_LINEAR, @@ -1786,7 +1786,7 @@ static const razer_zone deathstalker_chroma_zone = 12 }; -static const razer_device deathstalker_chroma_device = +static const open_razer_device deathstalker_chroma_device = { "Razer DeathStalker Chroma", DEVICE_TYPE_KEYBOARD, @@ -1812,7 +1812,7 @@ static const razer_device deathstalker_chroma_device = | Matrix | | 6 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone huntsman_zone = +static const open_razer_zone huntsman_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1820,7 +1820,7 @@ static const razer_zone huntsman_zone = 22 }; -static const razer_device huntsman_device = +static const open_razer_device huntsman_device = { "Razer Huntsman", DEVICE_TYPE_KEYBOARD, @@ -1850,7 +1850,7 @@ static const razer_device huntsman_device = | Matrix | | 3 Rows, 22 Columns | \*-------------------------------------------------------------*/ -static const razer_zone huntsman_elite_keyboard_zone = +static const open_razer_zone huntsman_elite_keyboard_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1858,7 +1858,7 @@ static const razer_zone huntsman_elite_keyboard_zone = 22 }; -static const razer_zone huntsman_elite_underglow_zone = +static const open_razer_zone huntsman_elite_underglow_zone = { "Underglow", ZONE_TYPE_MATRIX, @@ -1866,7 +1866,7 @@ static const razer_zone huntsman_elite_underglow_zone = 22 }; -static const razer_device huntsman_elite_device = +static const open_razer_device huntsman_elite_device = { "Razer Huntsman Elite", DEVICE_TYPE_KEYBOARD, @@ -1892,7 +1892,7 @@ static const razer_device huntsman_elite_device = | Matrix | | 6 Rows, 18 Columns | \*-------------------------------------------------------------*/ -static const razer_zone huntsman_te_zone = +static const open_razer_zone huntsman_te_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1900,7 +1900,7 @@ static const razer_zone huntsman_te_zone = 18 }; -static const razer_device huntsman_te_device = +static const open_razer_device huntsman_te_device = { "Razer Huntsman Tournament Edition", DEVICE_TYPE_KEYBOARD, @@ -1930,7 +1930,7 @@ static const razer_device huntsman_te_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_zone = +static const open_razer_zone blade_stealth_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1938,7 +1938,7 @@ static const razer_zone blade_stealth_zone = 16 }; -static const razer_device blade_stealth_device = +static const open_razer_device blade_stealth_device = { "Razer Blade Stealth", DEVICE_TYPE_KEYBOARD, @@ -1964,7 +1964,7 @@ static const razer_device blade_stealth_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_late_2016_zone = +static const open_razer_zone blade_stealth_late_2016_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -1972,7 +1972,7 @@ static const razer_zone blade_stealth_late_2016_zone = 16 }; -static const razer_device blade_stealth_late_2016_device = +static const open_razer_device blade_stealth_late_2016_device = { "Razer Blade Stealth (Late 2016)", DEVICE_TYPE_KEYBOARD, @@ -1998,7 +1998,7 @@ static const razer_device blade_stealth_late_2016_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_mid_2017_zone = +static const open_razer_zone blade_stealth_mid_2017_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2006,7 +2006,7 @@ static const razer_zone blade_stealth_mid_2017_zone = 16 }; -static const razer_device blade_stealth_mid_2017_device = +static const open_razer_device blade_stealth_mid_2017_device = { "Razer Blade Stealth (Mid 2017)", DEVICE_TYPE_KEYBOARD, @@ -2032,7 +2032,7 @@ static const razer_device blade_stealth_mid_2017_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_late_2017_zone = +static const open_razer_zone blade_stealth_late_2017_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2040,7 +2040,7 @@ static const razer_zone blade_stealth_late_2017_zone = 16 }; -static const razer_device blade_stealth_late_2017_device = +static const open_razer_device blade_stealth_late_2017_device = { "Razer Blade Stealth (Late 2017)", DEVICE_TYPE_KEYBOARD, @@ -2066,7 +2066,7 @@ static const razer_device blade_stealth_late_2017_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_2019_zone = +static const open_razer_zone blade_stealth_2019_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2074,7 +2074,7 @@ static const razer_zone blade_stealth_2019_zone = 16 }; -static const razer_device blade_stealth_2019_device = +static const open_razer_device blade_stealth_2019_device = { "Razer Blade Stealth (2019)", DEVICE_TYPE_KEYBOARD, @@ -2100,7 +2100,7 @@ static const razer_device blade_stealth_2019_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_late_2019_zone = +static const open_razer_zone blade_stealth_late_2019_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_SINGLE, @@ -2108,7 +2108,7 @@ static const razer_zone blade_stealth_late_2019_zone = 1 }; -static const razer_device blade_stealth_late_2019_device = +static const open_razer_device blade_stealth_late_2019_device = { "Razer Blade Stealth (Late 2019)", DEVICE_TYPE_KEYBOARD, @@ -2133,7 +2133,7 @@ static const razer_device blade_stealth_late_2019_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone blade_stealth_early_2020_zone = +static const open_razer_zone blade_stealth_early_2020_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_SINGLE, @@ -2141,7 +2141,7 @@ static const razer_zone blade_stealth_early_2020_zone = 1 }; -static const razer_device blade_stealth_early_2020_device = +static const open_razer_device blade_stealth_early_2020_device = { "Razer Blade Stealth (Early 2020)", DEVICE_TYPE_KEYBOARD, @@ -2167,7 +2167,7 @@ static const razer_device blade_stealth_early_2020_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_late_2016_zone = +static const open_razer_zone blade_late_2016_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2175,7 +2175,7 @@ static const razer_zone blade_late_2016_zone = 16 }; -static const razer_device blade_late_2016_device = +static const open_razer_device blade_late_2016_device = { "Razer Blade (Late 2016)", DEVICE_TYPE_KEYBOARD, @@ -2201,7 +2201,7 @@ static const razer_device blade_late_2016_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_qhd_zone = +static const open_razer_zone blade_qhd_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2209,7 +2209,7 @@ static const razer_zone blade_qhd_zone = 16 }; -static const razer_device blade_qhd_device = +static const open_razer_device blade_qhd_device = { "Razer Blade (QHD)", DEVICE_TYPE_KEYBOARD, @@ -2235,7 +2235,7 @@ static const razer_device blade_qhd_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_2018_zone = +static const open_razer_zone blade_15_2018_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2243,7 +2243,7 @@ static const razer_zone blade_15_2018_zone = 16 }; -static const razer_device blade_15_2018_device = +static const open_razer_device blade_15_2018_device = { "Razer Blade 15 (2018)", DEVICE_TYPE_KEYBOARD, @@ -2269,7 +2269,7 @@ static const razer_device blade_15_2018_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_2018_mercury_zone = +static const open_razer_zone blade_15_2018_mercury_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2277,7 +2277,7 @@ static const razer_zone blade_15_2018_mercury_zone = 16 }; -static const razer_device blade_15_2018_mercury_device = +static const open_razer_device blade_15_2018_mercury_device = { "Razer Blade 15 (2018) Mercury", DEVICE_TYPE_KEYBOARD, @@ -2303,7 +2303,7 @@ static const razer_device blade_15_2018_mercury_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_2018_base_zone = +static const open_razer_zone blade_15_2018_base_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2311,7 +2311,7 @@ static const razer_zone blade_15_2018_base_zone = 16 }; -static const razer_device blade_15_2018_base_device = +static const open_razer_device blade_15_2018_base_device = { "Razer Blade 15 (2018) Base Model", DEVICE_TYPE_KEYBOARD, @@ -2337,7 +2337,7 @@ static const razer_device blade_15_2018_base_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_2019_advanced_zone = +static const open_razer_zone blade_15_2019_advanced_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2345,7 +2345,7 @@ static const razer_zone blade_15_2019_advanced_zone = 16 }; -static const razer_device blade_15_2019_advanced_device = +static const open_razer_device blade_15_2019_advanced_device = { "Razer Blade 15 (2019) Advanced", DEVICE_TYPE_KEYBOARD, @@ -2371,7 +2371,7 @@ static const razer_device blade_15_2019_advanced_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_mid_2019_mercury_zone = +static const open_razer_zone blade_15_mid_2019_mercury_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2379,7 +2379,7 @@ static const razer_zone blade_15_mid_2019_mercury_zone = 16 }; -static const razer_device blade_15_mid_2019_mercury_device = +static const open_razer_device blade_15_mid_2019_mercury_device = { "Razer Blade 15 (Mid 2019) Mercury White", DEVICE_TYPE_KEYBOARD, @@ -2405,7 +2405,7 @@ static const razer_device blade_15_mid_2019_mercury_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_mid_2019_base_zone = +static const open_razer_zone blade_15_mid_2019_base_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_SINGLE, @@ -2413,7 +2413,7 @@ static const razer_zone blade_15_mid_2019_base_zone = 1 }; -static const razer_device blade_15_mid_2019_base_device = +static const open_razer_device blade_15_mid_2019_base_device = { "Razer Blade 15 (Mid 2019) Base Model", DEVICE_TYPE_KEYBOARD, @@ -2439,7 +2439,7 @@ static const razer_device blade_15_mid_2019_base_device = | Linear | | 1 Row, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_early_2020_base_zone = +static const open_razer_zone blade_15_early_2020_base_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_LINEAR, @@ -2447,7 +2447,7 @@ static const razer_zone blade_15_early_2020_base_zone = 16 }; -static const razer_device blade_15_early_2020_base_device = +static const open_razer_device blade_15_early_2020_base_device = { "Razer Blade 15 Base (Early 2020)", DEVICE_TYPE_KEYBOARD, @@ -2473,7 +2473,7 @@ static const razer_device blade_15_early_2020_base_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_studio_2019_zone = +static const open_razer_zone blade_15_studio_2019_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2481,7 +2481,7 @@ static const razer_zone blade_15_studio_2019_zone = 16 }; -static const razer_device blade_15_studio_2019_device = +static const open_razer_device blade_15_studio_2019_device = { "Razer Blade 15 Studio Edition (2019)", DEVICE_TYPE_KEYBOARD, @@ -2507,7 +2507,7 @@ static const razer_device blade_15_studio_2019_device = | Matrix | | 6 Rows, 25 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_pro_late_2016_zone = +static const open_razer_zone blade_pro_late_2016_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2515,7 +2515,7 @@ static const razer_zone blade_pro_late_2016_zone = 25 }; -static const razer_device blade_pro_late_2016_device = +static const open_razer_device blade_pro_late_2016_device = { "Razer Blade Pro (Late 2016)", DEVICE_TYPE_KEYBOARD, @@ -2541,7 +2541,7 @@ static const razer_device blade_pro_late_2016_device = | Matrix | | 6 Rows, 25 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_pro_2017_zone = +static const open_razer_zone blade_pro_2017_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2549,7 +2549,7 @@ static const razer_zone blade_pro_2017_zone = 25 }; -static const razer_device blade_pro_2017_device = +static const open_razer_device blade_pro_2017_device = { "Razer Blade Pro (2017)", DEVICE_TYPE_KEYBOARD, @@ -2575,7 +2575,7 @@ static const razer_device blade_pro_2017_device = | Matrix | | 6 Rows, 25 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_pro_2017_fullhd_zone = +static const open_razer_zone blade_pro_2017_fullhd_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2583,7 +2583,7 @@ static const razer_zone blade_pro_2017_fullhd_zone = 25 }; -static const razer_device blade_pro_2017_fullhd_device = +static const open_razer_device blade_pro_2017_fullhd_device = { "Razer Blade Pro FullHD (2017)", DEVICE_TYPE_KEYBOARD, @@ -2608,7 +2608,7 @@ static const razer_device blade_pro_2017_fullhd_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_pro_17_2019_zone = +static const open_razer_zone blade_pro_17_2019_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2616,7 +2616,7 @@ static const razer_zone blade_pro_17_2019_zone = 16 }; -static const razer_device blade_pro_17_2019_device = +static const open_razer_device blade_pro_17_2019_device = { "Razer Blade Pro 17 (2019)", DEVICE_TYPE_KEYBOARD, @@ -2642,7 +2642,7 @@ static const razer_device blade_pro_17_2019_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_pro_late_2019_zone = +static const open_razer_zone blade_pro_late_2019_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2650,7 +2650,7 @@ static const razer_zone blade_pro_late_2019_zone = 16 }; -static const razer_device blade_pro_late_2019_device = +static const open_razer_device blade_pro_late_2019_device = { "Razer Blade Pro (Late 2019)", DEVICE_TYPE_KEYBOARD, @@ -2676,7 +2676,7 @@ static const razer_device blade_pro_late_2019_device = | Matrix | | 6 Rows, 16 Columns | \*-------------------------------------------------------------*/ -static const razer_zone blade_15_advanced_2020_zone = +static const open_razer_zone blade_15_advanced_2020_zone = { ZONE_EN_KEYBOARD, ZONE_TYPE_MATRIX, @@ -2684,7 +2684,7 @@ static const razer_zone blade_15_advanced_2020_zone = 16 }; -static const razer_device blade_15_advanced_2020_device = +static const open_razer_device blade_15_advanced_2020_device = { "Razer Blade 15 Advanced (2020)", DEVICE_TYPE_KEYBOARD, @@ -2714,7 +2714,7 @@ static const razer_device blade_15_advanced_2020_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone abyssus_elite_dva_edition_logo_zone = +static const open_razer_zone abyssus_elite_dva_edition_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2722,7 +2722,7 @@ static const razer_zone abyssus_elite_dva_edition_logo_zone = 1 }; -static const razer_device abyssus_elite_dva_edition_device = +static const open_razer_device abyssus_elite_dva_edition_device = { "Razer Abyssus Elite DVa Edition", DEVICE_TYPE_MOUSE, @@ -2748,7 +2748,7 @@ static const razer_device abyssus_elite_dva_edition_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone abyssus_essential_logo_zone = +static const open_razer_zone abyssus_essential_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2756,7 +2756,7 @@ static const razer_zone abyssus_essential_logo_zone = 1 }; -static const razer_device abyssus_essential_device = +static const open_razer_device abyssus_essential_device = { "Razer Abyssus Essential", DEVICE_TYPE_MOUSE, @@ -2786,7 +2786,7 @@ static const razer_device abyssus_essential_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone basilisk_logo_zone = +static const open_razer_zone basilisk_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2794,7 +2794,7 @@ static const razer_zone basilisk_logo_zone = 1 }; -static const razer_zone basilisk_scroll_wheel_zone = +static const open_razer_zone basilisk_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -2802,7 +2802,7 @@ static const razer_zone basilisk_scroll_wheel_zone = 1 }; -static const razer_device basilisk_device = +static const open_razer_device basilisk_device = { "Razer Basilisk", DEVICE_TYPE_MOUSE, @@ -2832,7 +2832,7 @@ static const razer_device basilisk_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone deathadder_chroma_logo_zone = +static const open_razer_zone deathadder_chroma_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2840,7 +2840,7 @@ static const razer_zone deathadder_chroma_logo_zone = 1 }; -static const razer_zone deathadder_chroma_scroll_wheel_zone = +static const open_razer_zone deathadder_chroma_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -2848,7 +2848,7 @@ static const razer_zone deathadder_chroma_scroll_wheel_zone = 1 }; -static const razer_device deathadder_chroma_device = +static const open_razer_device deathadder_chroma_device = { "Razer DeathAdder Chroma", DEVICE_TYPE_MOUSE, @@ -2878,7 +2878,7 @@ static const razer_device deathadder_chroma_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone deathadder_elite_logo_zone = +static const open_razer_zone deathadder_elite_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2886,7 +2886,7 @@ static const razer_zone deathadder_elite_logo_zone = 1 }; -static const razer_zone deathadder_elite_scroll_wheel_zone = +static const open_razer_zone deathadder_elite_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -2894,7 +2894,7 @@ static const razer_zone deathadder_elite_scroll_wheel_zone = 1 }; -static const razer_device deathadder_elite_device = +static const open_razer_device deathadder_elite_device = { "Razer DeathAdder Elite", DEVICE_TYPE_MOUSE, @@ -2924,7 +2924,7 @@ static const razer_device deathadder_elite_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone deathadder_essential_logo_zone = +static const open_razer_zone deathadder_essential_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2932,7 +2932,7 @@ static const razer_zone deathadder_essential_logo_zone = 1 }; -static const razer_zone deathadder_essential_scroll_wheel_zone = +static const open_razer_zone deathadder_essential_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -2940,7 +2940,7 @@ static const razer_zone deathadder_essential_scroll_wheel_zone = 1 }; -static const razer_device deathadder_essential_device = +static const open_razer_device deathadder_essential_device = { "Razer DeathAdder Essential", DEVICE_TYPE_MOUSE, @@ -2970,7 +2970,7 @@ static const razer_device deathadder_essential_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone deathadder_essential_white_edition_logo_zone = +static const open_razer_zone deathadder_essential_white_edition_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -2978,7 +2978,7 @@ static const razer_zone deathadder_essential_white_edition_logo_zone = 1 }; -static const razer_zone deathadder_essential_white_edition_scroll_wheel_zone = +static const open_razer_zone deathadder_essential_white_edition_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -2986,7 +2986,7 @@ static const razer_zone deathadder_essential_white_edition_scroll_wheel_zone = 1 }; -static const razer_device deathadder_essential_white_edition_device = +static const open_razer_device deathadder_essential_white_edition_device = { "Razer DeathAdder Essential (White Edition)", DEVICE_TYPE_MOUSE, @@ -3016,7 +3016,7 @@ static const razer_device deathadder_essential_white_edition_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone deathadder_v2_logo_zone = +static const open_razer_zone deathadder_v2_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3024,7 +3024,7 @@ static const razer_zone deathadder_v2_logo_zone = 1 }; -static const razer_zone deathadder_v2_scroll_wheel_zone = +static const open_razer_zone deathadder_v2_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3032,7 +3032,7 @@ static const razer_zone deathadder_v2_scroll_wheel_zone = 1 }; -static const razer_device deathadder_v2_device = +static const open_razer_device deathadder_v2_device = { "Razer DeathAdder V2", DEVICE_TYPE_MOUSE, @@ -3066,7 +3066,7 @@ static const razer_device deathadder_v2_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone diamondback_chroma_led_strip_zone = +static const open_razer_zone diamondback_chroma_led_strip_zone = { "LED Strip", ZONE_TYPE_LINEAR, @@ -3074,7 +3074,7 @@ static const razer_zone diamondback_chroma_led_strip_zone = 19 }; -static const razer_zone diamondback_chroma_logo_zone = +static const open_razer_zone diamondback_chroma_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3082,7 +3082,7 @@ static const razer_zone diamondback_chroma_logo_zone = 1 }; -static const razer_zone diamondback_chroma_scroll_wheel_zone = +static const open_razer_zone diamondback_chroma_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3090,7 +3090,7 @@ static const razer_zone diamondback_chroma_scroll_wheel_zone = 1 }; -static const razer_device diamondback_chroma_device = +static const open_razer_device diamondback_chroma_device = { "Razer Diamondback Chroma", DEVICE_TYPE_MOUSE, @@ -3128,7 +3128,7 @@ static const razer_device diamondback_chroma_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone lancehead_te_right_zone = +static const open_razer_zone lancehead_te_right_zone = { "Right LED Strip", ZONE_TYPE_LINEAR, @@ -3136,7 +3136,7 @@ static const razer_zone lancehead_te_right_zone = 7 }; -static const razer_zone lancehead_te_left_zone = +static const open_razer_zone lancehead_te_left_zone = { "Left LED Strip", ZONE_TYPE_LINEAR, @@ -3144,7 +3144,7 @@ static const razer_zone lancehead_te_left_zone = 7 }; -static const razer_zone lancehead_te_logo_zone = +static const open_razer_zone lancehead_te_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3152,7 +3152,7 @@ static const razer_zone lancehead_te_logo_zone = 1 }; -static const razer_zone lancehead_te_scroll_wheel_zone = +static const open_razer_zone lancehead_te_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3160,7 +3160,7 @@ static const razer_zone lancehead_te_scroll_wheel_zone = 1 }; -static const razer_device lancehead_te_device = +static const open_razer_device lancehead_te_device = { "Razer Lancehead Tournament Edition", DEVICE_TYPE_MOUSE, @@ -3198,7 +3198,7 @@ static const razer_device lancehead_te_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone lancehead_v2_wired_right_zone = +static const open_razer_zone lancehead_v2_wired_right_zone = { "Right LED Strip", ZONE_TYPE_LINEAR, @@ -3206,7 +3206,7 @@ static const razer_zone lancehead_v2_wired_right_zone = 7 }; -static const razer_zone lancehead_v2_wired_left_zone = +static const open_razer_zone lancehead_v2_wired_left_zone = { "Left LED Strip", ZONE_TYPE_LINEAR, @@ -3214,7 +3214,7 @@ static const razer_zone lancehead_v2_wired_left_zone = 7 }; -static const razer_zone lancehead_v2_wired_logo_zone = +static const open_razer_zone lancehead_v2_wired_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3222,7 +3222,7 @@ static const razer_zone lancehead_v2_wired_logo_zone = 1 }; -static const razer_zone lancehead_v2_wired_scroll_wheel_zone = +static const open_razer_zone lancehead_v2_wired_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3230,7 +3230,7 @@ static const razer_zone lancehead_v2_wired_scroll_wheel_zone = 1 }; -static const razer_device lancehead_v2_wired_device = +static const open_razer_device lancehead_v2_wired_device = { "Razer Lancehead Wireless (Wired)", DEVICE_TYPE_MOUSE, @@ -3268,7 +3268,7 @@ static const razer_device lancehead_v2_wired_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone lancehead_v2_wireless_right_zone = +static const open_razer_zone lancehead_v2_wireless_right_zone = { "Right LED Strip", ZONE_TYPE_LINEAR, @@ -3276,7 +3276,7 @@ static const razer_zone lancehead_v2_wireless_right_zone = 7 }; -static const razer_zone lancehead_v2_wireless_left_zone = +static const open_razer_zone lancehead_v2_wireless_left_zone = { "Left LED Strip", ZONE_TYPE_LINEAR, @@ -3284,7 +3284,7 @@ static const razer_zone lancehead_v2_wireless_left_zone = 7 }; -static const razer_zone lancehead_v2_wireless_logo_zone = +static const open_razer_zone lancehead_v2_wireless_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3292,7 +3292,7 @@ static const razer_zone lancehead_v2_wireless_logo_zone = 1 }; -static const razer_zone lancehead_v2_wireless_scroll_wheel_zone = +static const open_razer_zone lancehead_v2_wireless_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3300,7 +3300,7 @@ static const razer_zone lancehead_v2_wireless_scroll_wheel_zone = 1 }; -static const razer_device lancehead_v2_wireless_device = +static const open_razer_device lancehead_v2_wireless_device = { "Razer Lancehead Wireless (Receiver)", DEVICE_TYPE_MOUSE, @@ -3326,7 +3326,7 @@ static const razer_device lancehead_v2_wireless_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_2012_wired_zone = +static const open_razer_zone mamba_2012_wired_zone = { "Scroll Wheel", ZONE_TYPE_LINEAR, @@ -3334,7 +3334,7 @@ static const razer_zone mamba_2012_wired_zone = 1 }; -static const razer_device mamba_2012_wired_device = +static const open_razer_device mamba_2012_wired_device = { "Razer Mamba 2012 (Wired)", DEVICE_TYPE_MOUSE, @@ -3360,7 +3360,7 @@ static const razer_device mamba_2012_wired_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_2012_wireless_zone = +static const open_razer_zone mamba_2012_wireless_zone = { "Scroll Wheel", ZONE_TYPE_LINEAR, @@ -3368,7 +3368,7 @@ static const razer_zone mamba_2012_wireless_zone = 1 }; -static const razer_device mamba_2012_wireless_device = +static const open_razer_device mamba_2012_wireless_device = { "Razer Mamba 2012 (Wireless)", DEVICE_TYPE_MOUSE, @@ -3394,7 +3394,7 @@ static const razer_device mamba_2012_wireless_device = | Single | | 15 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone mamba_wired_zone = +static const open_razer_zone mamba_wired_zone = { "Chroma Zone", ZONE_TYPE_LINEAR, @@ -3402,7 +3402,7 @@ static const razer_zone mamba_wired_zone = 15 }; -static const razer_device mamba_wired_device = +static const open_razer_device mamba_wired_device = { "Razer Mamba (Wired)", DEVICE_TYPE_MOUSE, @@ -3428,7 +3428,7 @@ static const razer_device mamba_wired_device = | Single | | 15 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_wireless_zone = +static const open_razer_zone mamba_wireless_zone = { "Chroma Zone", ZONE_TYPE_LINEAR, @@ -3436,7 +3436,7 @@ static const razer_zone mamba_wireless_zone = 15 }; -static const razer_device mamba_wireless_device = +static const open_razer_device mamba_wireless_device = { "Razer Mamba (Wireless)", DEVICE_TYPE_MOUSE, @@ -3475,7 +3475,7 @@ static const razer_device mamba_wireless_device = | 9 LEDs | | | \*-------------------------------------------------------------*/ -static const razer_zone mamba_elite_scroll_wheel_zone = +static const open_razer_zone mamba_elite_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3483,7 +3483,7 @@ static const razer_zone mamba_elite_scroll_wheel_zone = 1 }; -static const razer_zone mamba_elite_logo_zone = +static const open_razer_zone mamba_elite_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3491,7 +3491,7 @@ static const razer_zone mamba_elite_logo_zone = 1 }; -static const razer_zone mamba_elite_left_zone = +static const open_razer_zone mamba_elite_left_zone = { "Left LED Strip", ZONE_TYPE_LINEAR, @@ -3499,7 +3499,7 @@ static const razer_zone mamba_elite_left_zone = 9 }; -static const razer_zone mamba_elite_right_zone = +static const open_razer_zone mamba_elite_right_zone = { "Right LED Strip", ZONE_TYPE_LINEAR, @@ -3507,7 +3507,7 @@ static const razer_zone mamba_elite_right_zone = 9 }; -static const razer_device mamba_elite_device = +static const open_razer_device mamba_elite_device = { "Razer Mamba Elite", DEVICE_TYPE_MOUSE, @@ -3545,7 +3545,7 @@ static const razer_device mamba_elite_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_te_left_zone = +static const open_razer_zone mamba_te_left_zone = { "Left LED Strip", ZONE_TYPE_LINEAR, @@ -3553,7 +3553,7 @@ static const razer_zone mamba_te_left_zone = 7 }; -static const razer_zone mamba_te_right_zone = +static const open_razer_zone mamba_te_right_zone = { "Right LED Strip", ZONE_TYPE_LINEAR, @@ -3561,7 +3561,7 @@ static const razer_zone mamba_te_right_zone = 7 }; -static const razer_zone mamba_te_logo_zone = +static const open_razer_zone mamba_te_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3569,7 +3569,7 @@ static const razer_zone mamba_te_logo_zone = 1 }; -static const razer_zone mamba_te_scroll_wheel_zone = +static const open_razer_zone mamba_te_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3577,7 +3577,7 @@ static const razer_zone mamba_te_scroll_wheel_zone = 1 }; -static const razer_device mamba_te_device = +static const open_razer_device mamba_te_device = { "Razer Mamba Tournament Edition", DEVICE_TYPE_MOUSE, @@ -3607,7 +3607,7 @@ static const razer_device mamba_te_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_wireless_2018_wired_logo_zone = +static const open_razer_zone mamba_wireless_2018_wired_logo_zone = { "Logo Zone", ZONE_TYPE_SINGLE, @@ -3615,7 +3615,7 @@ static const razer_zone mamba_wireless_2018_wired_logo_zone = 1 }; -static const razer_zone mamba_wireless_2018_wired_scroll_wheel_zone = +static const open_razer_zone mamba_wireless_2018_wired_scroll_wheel_zone = { "Scroll Wheel Zone", ZONE_TYPE_SINGLE, @@ -3623,7 +3623,7 @@ static const razer_zone mamba_wireless_2018_wired_scroll_wheel_zone = 1 }; -static const razer_device mamba_wireless_2018_wired_device = +static const open_razer_device mamba_wireless_2018_wired_device = { "Razer Mamba Wireless (Wired)", DEVICE_TYPE_MOUSE, @@ -3654,7 +3654,7 @@ static const razer_device mamba_wireless_2018_wired_device = | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone mamba_wireless_2018_wireless_logo_zone = +static const open_razer_zone mamba_wireless_2018_wireless_logo_zone = { "Logo Zone", ZONE_TYPE_SINGLE, @@ -3662,7 +3662,7 @@ static const razer_zone mamba_wireless_2018_wireless_logo_zone = 1 }; -static const razer_zone mamba_wireless_2018_wireless_scroll_wheel_zone = +static const open_razer_zone mamba_wireless_2018_wireless_scroll_wheel_zone = { "Scroll Wheel Zone", ZONE_TYPE_SINGLE, @@ -3670,7 +3670,7 @@ static const razer_zone mamba_wireless_2018_wireless_scroll_wheel_zone = 1 }; -static const razer_device mamba_wireless_2018_wireless_device = +static const open_razer_device mamba_wireless_2018_wireless_device = { "Razer Mamba Wireless (Receiver)", DEVICE_TYPE_MOUSE, @@ -3704,7 +3704,7 @@ static const razer_device mamba_wireless_2018_wireless_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone naga_chroma_logo_zone = +static const open_razer_zone naga_chroma_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3712,7 +3712,7 @@ static const razer_zone naga_chroma_logo_zone = 1 }; -static const razer_zone naga_chroma_scroll_wheel_zone = +static const open_razer_zone naga_chroma_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3720,7 +3720,7 @@ static const razer_zone naga_chroma_scroll_wheel_zone = 1 }; -static const razer_zone naga_chroma_numpad_zone = +static const open_razer_zone naga_chroma_numpad_zone = { "Numpad", ZONE_TYPE_SINGLE, @@ -3728,7 +3728,7 @@ static const razer_zone naga_chroma_numpad_zone = 1 }; -static const razer_device naga_chroma_device = +static const open_razer_device naga_chroma_device = { "Razer Naga Chroma", DEVICE_TYPE_MOUSE, @@ -3762,7 +3762,7 @@ static const razer_device naga_chroma_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone naga_hex_v2_logo_zone = +static const open_razer_zone naga_hex_v2_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3770,7 +3770,7 @@ static const razer_zone naga_hex_v2_logo_zone = 1 }; -static const razer_zone naga_hex_v2_scroll_wheel_zone = +static const open_razer_zone naga_hex_v2_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3778,7 +3778,7 @@ static const razer_zone naga_hex_v2_scroll_wheel_zone = 1 }; -static const razer_zone naga_hex_v2_numpad_zone = +static const open_razer_zone naga_hex_v2_numpad_zone = { "Numpad", ZONE_TYPE_SINGLE, @@ -3786,7 +3786,7 @@ static const razer_zone naga_hex_v2_numpad_zone = 1 }; -static const razer_device naga_hex_v2_device = +static const open_razer_device naga_hex_v2_device = { "Razer Naga Hex V2", DEVICE_TYPE_MOUSE, @@ -3820,7 +3820,7 @@ static const razer_device naga_hex_v2_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone naga_trinity_logo_zone = +static const open_razer_zone naga_trinity_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3828,7 +3828,7 @@ static const razer_zone naga_trinity_logo_zone = 1 }; -static const razer_zone naga_trinity_scroll_wheel_zone = +static const open_razer_zone naga_trinity_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -3836,7 +3836,7 @@ static const razer_zone naga_trinity_scroll_wheel_zone = 1 }; -static const razer_zone naga_trinity_numpad_zone = +static const open_razer_zone naga_trinity_numpad_zone = { "Numpad", ZONE_TYPE_SINGLE, @@ -3844,7 +3844,7 @@ static const razer_zone naga_trinity_numpad_zone = 1 }; -static const razer_device naga_trinity_device = +static const open_razer_device naga_trinity_device = { "Razer Naga Trinity", DEVICE_TYPE_MOUSE, @@ -3870,7 +3870,7 @@ static const razer_device naga_trinity_device = | Matrix | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone viper_mini_logo_zone = +static const open_razer_zone viper_mini_logo_zone = { "Logo", //Matrix of one as per https://github.com/openrazer/openrazer/blob/master/daemon/openrazer_daemon/hardware/mouse.py#L27 ZONE_TYPE_SINGLE, @@ -3878,7 +3878,7 @@ static const razer_zone viper_mini_logo_zone = 1 }; -static const razer_device viper_mini_device = +static const open_razer_device viper_mini_device = { "Razer Viper Mini", DEVICE_TYPE_MOUSE, @@ -3904,7 +3904,7 @@ static const razer_device viper_mini_device = | Matrix | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone viper_ultimate_wired_logo_zone = +static const open_razer_zone viper_ultimate_wired_logo_zone = { "Logo", //Matrix of one as per https://github.com/openrazer/openrazer/blob/master/daemon/openrazer_daemon/hardware/mouse.py#L1690 ZONE_TYPE_SINGLE, @@ -3912,7 +3912,7 @@ static const razer_zone viper_ultimate_wired_logo_zone = 1 }; -static const razer_device viper_ultimate_wired_device = +static const open_razer_device viper_ultimate_wired_device = { "Razer Viper Ultimate (Wired)", DEVICE_TYPE_MOUSE, @@ -3938,7 +3938,7 @@ static const razer_device viper_ultimate_wired_device = | Matrix | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone viper_ultimate_wireless_logo_zone = +static const open_razer_zone viper_ultimate_wireless_logo_zone = { "Logo", //Matrix of one as per https://github.com/openrazer/openrazer/blob/master/daemon/openrazer_daemon/hardware/mouse.py#L1690 ZONE_TYPE_SINGLE, @@ -3946,7 +3946,7 @@ static const razer_zone viper_ultimate_wireless_logo_zone = 1 }; -static const razer_device viper_ultimate_wireless_device = +static const open_razer_device viper_ultimate_wireless_device = { "Razer Viper Ultimate (Wireless)", DEVICE_TYPE_MOUSE, @@ -3972,7 +3972,7 @@ static const razer_device viper_ultimate_wireless_device = | Matrix | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone viper_logo_zone = +static const open_razer_zone viper_logo_zone = { "Logo", ZONE_TYPE_SINGLE, @@ -3980,7 +3980,7 @@ static const razer_zone viper_logo_zone = 1 }; -static const razer_device viper_device = +static const open_razer_device viper_device = { "Razer Viper", DEVICE_TYPE_MOUSE, @@ -4010,7 +4010,7 @@ static const razer_device viper_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone naga_epic_chroma_scroll_wheel_zone = +static const open_razer_zone naga_epic_chroma_scroll_wheel_zone = { "Scroll Wheel", ZONE_TYPE_SINGLE, @@ -4018,7 +4018,7 @@ static const razer_zone naga_epic_chroma_scroll_wheel_zone = 1 }; -static const razer_zone naga_epic_chroma_numpad_zone = +static const open_razer_zone naga_epic_chroma_numpad_zone = { "Numpad", ZONE_TYPE_SINGLE, @@ -4026,7 +4026,7 @@ static const razer_zone naga_epic_chroma_numpad_zone = 1 }; -static const razer_device naga_epic_chroma_device = +static const open_razer_device naga_epic_chroma_device = { "Razer Naga Epic Chroma", DEVICE_TYPE_MOUSE, @@ -4056,7 +4056,7 @@ static const razer_device naga_epic_chroma_device = | Matrix | | 4 Rows, 5 Columns | \*-------------------------------------------------------------*/ -static const razer_zone orbweaver_chroma_zone = +static const open_razer_zone orbweaver_chroma_zone = { "Keypad", ZONE_TYPE_MATRIX, @@ -4064,7 +4064,7 @@ static const razer_zone orbweaver_chroma_zone = 5 }; -static const razer_device orbweaver_chroma_device = +static const open_razer_device orbweaver_chroma_device = { "Razer Orbweaver Chroma", DEVICE_TYPE_KEYBOARD, @@ -4090,7 +4090,7 @@ static const razer_device orbweaver_chroma_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone tartarus_chroma_zone = +static const open_razer_zone tartarus_chroma_zone = { "Keypad", ZONE_TYPE_SINGLE, @@ -4098,7 +4098,7 @@ static const razer_zone tartarus_chroma_zone = 1 }; -static const razer_device tartarus_chroma_device = +static const open_razer_device tartarus_chroma_device = { "Razer Tartarus Chroma", DEVICE_TYPE_KEYBOARD, @@ -4124,7 +4124,7 @@ static const razer_device tartarus_chroma_device = | Matrix | | 4 Rows, 5 Columns | \*-------------------------------------------------------------*/ -static const razer_zone tartarus_v2_zone = +static const open_razer_zone tartarus_v2_zone = { "Keypad", ZONE_TYPE_MATRIX, @@ -4132,7 +4132,7 @@ static const razer_zone tartarus_v2_zone = 5 }; -static const razer_device tartarus_v2_device = +static const open_razer_device tartarus_v2_device = { "Razer Tartarus V2", DEVICE_TYPE_KEYBOARD, @@ -4162,7 +4162,7 @@ static const razer_device tartarus_v2_device = | Linear | | 15 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone firefly_zone = +static const open_razer_zone firefly_zone = { "LED Strip", ZONE_TYPE_LINEAR, @@ -4170,7 +4170,7 @@ static const razer_zone firefly_zone = 15 }; -static const razer_device firefly_device = +static const open_razer_device firefly_device = { "Razer Firefly", DEVICE_TYPE_MOUSEMAT, @@ -4196,7 +4196,7 @@ static const razer_device firefly_device = | Linear | | 1 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone firefly_hyperflux_zone = +static const open_razer_zone firefly_hyperflux_zone = { "LED Strip", ZONE_TYPE_SINGLE, @@ -4204,7 +4204,7 @@ static const razer_zone firefly_hyperflux_zone = 1 }; -static const razer_device firefly_hyperflux_device = +static const open_razer_device firefly_hyperflux_device = { "Razer Firefly Hyperflux", DEVICE_TYPE_MOUSEMAT, @@ -4230,7 +4230,7 @@ static const razer_device firefly_hyperflux_device = | Matrix | | 19 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone firefly_v2_zone = +static const open_razer_zone firefly_v2_zone = { "LED Strip", ZONE_TYPE_LINEAR, @@ -4238,7 +4238,7 @@ static const razer_zone firefly_v2_zone = 19 }; -static const razer_device firefly_v2_device = +static const open_razer_device firefly_v2_device = { "Razer Firefly V2", DEVICE_TYPE_MOUSEMAT, @@ -4264,7 +4264,7 @@ static const razer_device firefly_v2_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone goliathus_zone = +static const open_razer_zone goliathus_zone = { "LED Strip", ZONE_TYPE_SINGLE, @@ -4272,7 +4272,7 @@ static const razer_zone goliathus_zone = 1 }; -static const razer_device goliathus_device = +static const open_razer_device goliathus_device = { "Razer Goliathus", DEVICE_TYPE_MOUSEMAT, @@ -4298,7 +4298,7 @@ static const razer_device goliathus_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone goliathus_extended_zone = +static const open_razer_zone goliathus_extended_zone = { "LED Strip", ZONE_TYPE_SINGLE, @@ -4306,7 +4306,7 @@ static const razer_zone goliathus_extended_zone = 1 }; -static const razer_device goliathus_extended_device = +static const open_razer_device goliathus_extended_device = { "Razer Goliathus Extended", DEVICE_TYPE_MOUSEMAT, @@ -4336,7 +4336,7 @@ static const razer_device goliathus_extended_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone kraken_chroma_zone = +static const open_razer_zone kraken_chroma_zone = { "Headset", ZONE_TYPE_SINGLE, @@ -4344,7 +4344,7 @@ static const razer_zone kraken_chroma_zone = 1 }; -static const razer_device kraken_chroma_device = +static const open_razer_device kraken_chroma_device = { "Razer Kraken 7.1 Chroma", DEVICE_TYPE_HEADSET, @@ -4370,7 +4370,7 @@ static const razer_device kraken_chroma_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone kraken_v2_zone = +static const open_razer_zone kraken_v2_zone = { "Headset", ZONE_TYPE_SINGLE, @@ -4378,7 +4378,7 @@ static const razer_zone kraken_v2_zone = 1 }; -static const razer_device kraken_v2_device = +static const open_razer_device kraken_v2_device = { "Razer Kraken 7.1 V2", DEVICE_TYPE_HEADSET, @@ -4404,7 +4404,7 @@ static const razer_device kraken_v2_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone kraken_ultimate_zone = +static const open_razer_zone kraken_ultimate_zone = { "Headset", ZONE_TYPE_SINGLE, @@ -4412,7 +4412,7 @@ static const razer_zone kraken_ultimate_zone = 1 }; -static const razer_device kraken_ultimate_device = +static const open_razer_device kraken_ultimate_device = { "Razer Kraken Ultimate", DEVICE_TYPE_HEADSET, @@ -4438,7 +4438,7 @@ static const razer_device kraken_ultimate_device = | Matrix | | 4 LED | \*-------------------------------------------------------------*/ -static const razer_zone kraken_kitty_zone = +static const open_razer_zone kraken_kitty_zone = { "Headset", ZONE_TYPE_LINEAR, @@ -4446,7 +4446,7 @@ static const razer_zone kraken_kitty_zone = 4 }; -static const razer_device kraken_kitty_device = +static const open_razer_device kraken_kitty_device = { "Razer Kraken Kitty Edition", DEVICE_TYPE_HEADSET, @@ -4480,7 +4480,7 @@ static const razer_device kraken_kitty_device = | Single | | 1 LED | \*-------------------------------------------------------------*/ -static const razer_zone tiamat_71_v2_controller_zone = +static const open_razer_zone tiamat_71_v2_controller_zone = { "Controller", ZONE_TYPE_LINEAR, @@ -4488,7 +4488,7 @@ static const razer_zone tiamat_71_v2_controller_zone = 15 }; -static const razer_zone tiamat_71_v2_headset_left_zone = +static const open_razer_zone tiamat_71_v2_headset_left_zone = { "Headset Left", ZONE_TYPE_SINGLE, @@ -4496,7 +4496,7 @@ static const razer_zone tiamat_71_v2_headset_left_zone = 1 }; -static const razer_zone tiamat_71_v2_headset_right_zone = +static const open_razer_zone tiamat_71_v2_headset_right_zone = { "Headset Right", ZONE_TYPE_SINGLE, @@ -4504,7 +4504,7 @@ static const razer_zone tiamat_71_v2_headset_right_zone = 1 }; -static const razer_device tiamat_71_v2_device = +static const open_razer_device tiamat_71_v2_device = { "Razer Tiamat 7.1 V2", DEVICE_TYPE_HEADSET, @@ -4538,7 +4538,7 @@ static const razer_device tiamat_71_v2_device = | Linear | | 8 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone core_side_zone = +static const open_razer_zone core_side_zone = { "Side Window Lights", ZONE_TYPE_SINGLE, @@ -4546,7 +4546,7 @@ static const razer_zone core_side_zone = 1 }; -static const razer_zone core_led_strip_zone = +static const open_razer_zone core_led_strip_zone = { "LED Strip", ZONE_TYPE_LINEAR, @@ -4554,7 +4554,7 @@ static const razer_zone core_led_strip_zone = 8 }; -static const razer_device core_device = +static const open_razer_device core_device = { "Razer Core", DEVICE_TYPE_UNKNOWN, @@ -4580,7 +4580,7 @@ static const razer_device core_device = | Linear | | 15 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone mug_holder_zone = +static const open_razer_zone mug_holder_zone = { "LED Strip", ZONE_TYPE_LINEAR, @@ -4588,7 +4588,7 @@ static const razer_zone mug_holder_zone = 15 }; -static const razer_device mug_holder_device = +static const open_razer_device mug_holder_device = { "Razer Chroma Mug Holder", DEVICE_TYPE_UNKNOWN, @@ -4626,7 +4626,7 @@ static const razer_device mug_holder_device = | Linear | | 16 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone chromahdk_zone_1 = +static const open_razer_zone chromahdk_zone_1 = { "Channel 1", ZONE_TYPE_LINEAR, @@ -4634,7 +4634,7 @@ static const razer_zone chromahdk_zone_1 = 16 }; -static const razer_zone chromahdk_zone_2 = +static const open_razer_zone chromahdk_zone_2 = { "Channel 2", ZONE_TYPE_LINEAR, @@ -4642,7 +4642,7 @@ static const razer_zone chromahdk_zone_2 = 16 }; -static const razer_zone chromahdk_zone_3 = +static const open_razer_zone chromahdk_zone_3 = { "Channel 3", ZONE_TYPE_LINEAR, @@ -4650,7 +4650,7 @@ static const razer_zone chromahdk_zone_3 = 16 }; -static const razer_zone chromahdk_zone_4 = +static const open_razer_zone chromahdk_zone_4 = { "Channel 4", ZONE_TYPE_LINEAR, @@ -4658,7 +4658,7 @@ static const razer_zone chromahdk_zone_4 = 16 }; -static const razer_device chromahdk_device = +static const open_razer_device chromahdk_device = { "Razer Chroma HDK", DEVICE_TYPE_LEDSTRIP, @@ -4684,7 +4684,7 @@ static const razer_device chromahdk_device = | Linear | | 15 LEDs | \*-------------------------------------------------------------*/ -static const razer_zone base_station_zone = +static const open_razer_zone base_station_zone = { "LED Strip", ZONE_TYPE_LINEAR, @@ -4692,7 +4692,7 @@ static const razer_zone base_station_zone = 15 }; -static const razer_device base_station_device = +static const open_razer_device base_station_device = { "Razer Base Station Chroma", DEVICE_TYPE_HEADSET_STAND, @@ -4723,7 +4723,7 @@ static const razer_device base_station_device = | 8 LEDs | | | \*-------------------------------------------------------------*/ -static const razer_zone nommo_pro_left_zone = +static const open_razer_zone nommo_pro_left_zone = { "Left Speaker", ZONE_TYPE_LINEAR, @@ -4731,7 +4731,7 @@ static const razer_zone nommo_pro_left_zone = 8 }; -static const razer_zone nommo_pro_right_zone = +static const open_razer_zone nommo_pro_right_zone = { "Right Speaker", ZONE_TYPE_LINEAR, @@ -4739,7 +4739,7 @@ static const razer_zone nommo_pro_right_zone = 8 }; -static const razer_device nommo_pro_device = +static const open_razer_device nommo_pro_device = { "Razer Nommo Pro", DEVICE_TYPE_SPEAKER, @@ -4770,7 +4770,7 @@ static const razer_device nommo_pro_device = | 8 LEDs | | | \*-------------------------------------------------------------*/ -static const razer_zone nommo_chroma_right_zone = +static const open_razer_zone nommo_chroma_right_zone = { "Right Speaker", ZONE_TYPE_LINEAR, @@ -4778,7 +4778,7 @@ static const razer_zone nommo_chroma_right_zone = 24 }; -static const razer_zone nommo_chroma_left_zone = +static const open_razer_zone nommo_chroma_left_zone = { "Left Speaker", ZONE_TYPE_LINEAR, @@ -4786,7 +4786,7 @@ static const razer_zone nommo_chroma_left_zone = 24 }; -static const razer_device nommo_chroma_device = +static const open_razer_device nommo_chroma_device = { "Razer Nommo Chroma", DEVICE_TYPE_SPEAKER, @@ -4808,9 +4808,9 @@ static const razer_device nommo_chroma_device = /*-------------------------------------------------------------------------*\ | DEVICE MASTER LIST | \*-------------------------------------------------------------------------*/ -#define RAZER_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) +#define OPEN_RAZER_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ])) -static const razer_device* device_list[] = +static const open_razer_device* device_list[] = { /*-----------------------------------------------------------------*\ | KEYBOARDS | diff --git a/Controllers/OpenRazerController/RGBController_OpenRazer.cpp b/Controllers/OpenRazerController/RGBController_OpenRazer.cpp index 23392cf6..27bb539b 100644 --- a/Controllers/OpenRazerController/RGBController_OpenRazer.cpp +++ b/Controllers/OpenRazerController/RGBController_OpenRazer.cpp @@ -20,9 +20,9 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() switch(matrix_type) { - case RAZER_TYPE_MATRIX_FRAME: - case RAZER_TYPE_MATRIX_NOFRAME: - case RAZER_TYPE_MATRIX_STATIC: + case OPEN_RAZER_TYPE_MATRIX_FRAME: + case OPEN_RAZER_TYPE_MATRIX_NOFRAME: + case OPEN_RAZER_TYPE_MATRIX_STATIC: { char update_value = 1; @@ -32,7 +32,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() unsigned int output_offset; unsigned int row_offset = (row * matrix_cols); - if(matrix_type == RAZER_TYPE_MATRIX_FRAME) + if(matrix_type == OPEN_RAZER_TYPE_MATRIX_FRAME) { output_array_size = 3 + (matrix_cols* 3); output_offset = 3; @@ -45,7 +45,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() char* output_array = new char[output_array_size]; - if(matrix_type == RAZER_TYPE_MATRIX_FRAME) + if(matrix_type == OPEN_RAZER_TYPE_MATRIX_FRAME) { output_array[0] = row; output_array[1] = 0; @@ -60,12 +60,12 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() output_array[(col * 3) + 2 + output_offset] = (char)RGBGetBValue(colors[color_idx]); } - if(matrix_type == RAZER_TYPE_MATRIX_FRAME) + if(matrix_type == OPEN_RAZER_TYPE_MATRIX_FRAME) { matrix_custom_frame.write(output_array, output_array_size); matrix_custom_frame.flush(); } - else if(matrix_type == RAZER_TYPE_MATRIX_NOFRAME) + else if(matrix_type == OPEN_RAZER_TYPE_MATRIX_NOFRAME) { matrix_effect_custom.write(output_array, output_array_size); matrix_effect_custom.flush(); @@ -81,7 +81,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() std::this_thread::sleep_for(1ms); } - if(matrix_type == RAZER_TYPE_MATRIX_FRAME) + if(matrix_type == OPEN_RAZER_TYPE_MATRIX_FRAME) { matrix_effect_custom.write(&update_value, 1); matrix_effect_custom.flush(); @@ -89,7 +89,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() } break; - case RAZER_TYPE_NOMATRIX: + case OPEN_RAZER_TYPE_NOMATRIX: { DeviceUpdateMode(); } @@ -113,11 +113,11 @@ void RGBController_OpenRazer::SetupMatrixDevice(unsigned int rows, unsigned int { if(!matrix_effect_custom) { - matrix_type = RAZER_TYPE_MATRIX_STATIC; + matrix_type = OPEN_RAZER_TYPE_MATRIX_STATIC; } else { - matrix_type = RAZER_TYPE_MATRIX_NOFRAME; + matrix_type = OPEN_RAZER_TYPE_MATRIX_NOFRAME; } matrix_rows = 1; @@ -125,7 +125,7 @@ void RGBController_OpenRazer::SetupMatrixDevice(unsigned int rows, unsigned int } else { - matrix_type = RAZER_TYPE_MATRIX_FRAME; + matrix_type = OPEN_RAZER_TYPE_MATRIX_FRAME; matrix_rows = rows; matrix_cols = cols; @@ -134,7 +134,7 @@ void RGBController_OpenRazer::SetupMatrixDevice(unsigned int rows, unsigned int void RGBController_OpenRazer::SetupNonMatrixDevice() { - matrix_type = RAZER_TYPE_NOMATRIX; + matrix_type = OPEN_RAZER_TYPE_NOMATRIX; } void RGBController_OpenRazer::OpenFunctions(std::string dev_path) @@ -267,7 +267,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) /*-----------------------------------------------------------------*\ | Loop through all known devices to look for a name match | \*-----------------------------------------------------------------*/ - for (std::size_t i = 0; i < RAZER_NUM_DEVICES; i++) + for (std::size_t i = 0; i < OPEN_RAZER_NUM_DEVICES; i++) { if (device_list[i]->name == name) { @@ -288,7 +288,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Direct; Direct.name = "Direct"; - Direct.value = RAZER_MODE_CUSTOM; + Direct.value = OPEN_RAZER_MODE_CUSTOM; Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; Direct.color_mode = MODE_COLORS_PER_LED; modes.push_back(Direct); @@ -309,7 +309,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Off; Off.name = "Off"; - Off.value = RAZER_MODE_OFF; + Off.value = OPEN_RAZER_MODE_OFF; Off.flags = 0; Off.color_mode = MODE_COLORS_NONE; modes.push_back(Off); @@ -330,7 +330,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Static; Static.name = "Static"; - Static.value = RAZER_MODE_STATIC; + Static.value = OPEN_RAZER_MODE_STATIC; Static.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; Static.colors_min = 1; Static.colors_max = 1; @@ -350,7 +350,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Breathing; Breathing.name = "Breathing"; - Breathing.value = RAZER_MODE_BREATHING; + Breathing.value = OPEN_RAZER_MODE_BREATHING; Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR; Breathing.colors_min = 1; Breathing.colors_max = 2; @@ -368,7 +368,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Breathing; Breathing.name = "Breathing"; - Breathing.value = RAZER_MODE_BREATHING; + Breathing.value = OPEN_RAZER_MODE_BREATHING; Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; Breathing.colors_min = 1; Breathing.colors_max = 1; @@ -386,7 +386,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Flashing; Flashing.name = "Flashing"; - Flashing.value = RAZER_MODE_FLASHING; + Flashing.value = OPEN_RAZER_MODE_FLASHING; Flashing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; Flashing.colors_min = 1; Flashing.colors_max = 1; @@ -410,7 +410,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode SpectrumCycle; SpectrumCycle.name = "Spectrum Cycle"; - SpectrumCycle.value = RAZER_MODE_SPECTRUM_CYCLE; + SpectrumCycle.value = OPEN_RAZER_MODE_SPECTRUM_CYCLE; SpectrumCycle.flags = 0; SpectrumCycle.color_mode = MODE_COLORS_NONE; modes.push_back(SpectrumCycle); @@ -425,7 +425,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Wave; Wave.name = "Wave"; - Wave.value = RAZER_MODE_WAVE; + Wave.value = OPEN_RAZER_MODE_WAVE; Wave.flags = MODE_FLAG_HAS_DIRECTION_LR; Wave.direction = MODE_DIRECTION_RIGHT; Wave.color_mode = MODE_COLORS_NONE; @@ -443,7 +443,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) { mode Reactive; Reactive.name = "Reactive"; - Reactive.value = RAZER_MODE_REACTIVE; + Reactive.value = OPEN_RAZER_MODE_REACTIVE; Reactive.flags = 0; Reactive.color_mode = MODE_COLORS_NONE; modes.push_back(Reactive); @@ -490,7 +490,7 @@ void RGBController_OpenRazer::SetupZones() /*---------------------------------------------------------*\ | Fill in zone information based on device table | \*---------------------------------------------------------*/ - for(unsigned int zone_id = 0; zone_id < RAZER_MAX_ZONES; zone_id++) + for(unsigned int zone_id = 0; zone_id < OPEN_RAZER_MAX_ZONES; zone_id++) { if(device_list[device_index]->zones[zone_id] != NULL) { @@ -579,7 +579,7 @@ void RGBController_OpenRazer::SetCustomMode() /*---------------------------------------------------------*\ | If device supports custom mode, it will be mode index 0 | \*---------------------------------------------------------*/ - if(modes[0].value == RAZER_MODE_CUSTOM) + if(modes[0].value == OPEN_RAZER_MODE_CUSTOM) { active_mode = 0; } @@ -590,7 +590,7 @@ void RGBController_OpenRazer::SetCustomMode() { for(unsigned int i = 0; i < modes.size(); i++) { - if(modes[i].value == RAZER_MODE_STATIC) + if(modes[i].value == OPEN_RAZER_MODE_STATIC) { active_mode = i; break; @@ -608,7 +608,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() switch(modes[active_mode].value) { - case RAZER_MODE_CUSTOM: + case OPEN_RAZER_MODE_CUSTOM: if(matrix_effect_custom) { matrix_effect_custom.write(update_value, 1); @@ -616,7 +616,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_OFF: + case OPEN_RAZER_MODE_OFF: if(matrix_effect_none) { matrix_effect_none.write(update_value, 1); @@ -669,7 +669,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_STATIC: + case OPEN_RAZER_MODE_STATIC: effect_value[0] = '0'; if(backlight_led_state) @@ -752,7 +752,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_FLASHING: + case OPEN_RAZER_MODE_FLASHING: effect_value[0] = '1'; if(backlight_led_state) @@ -805,7 +805,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_BREATHING: + case OPEN_RAZER_MODE_BREATHING: effect_value[0] = '2'; switch(modes[active_mode].color_mode) @@ -965,7 +965,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_SPECTRUM_CYCLE: + case OPEN_RAZER_MODE_SPECTRUM_CYCLE: effect_value[0] = '4'; if(backlight_led_state) @@ -1038,7 +1038,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_WAVE: + case OPEN_RAZER_MODE_WAVE: switch(modes[active_mode].direction) { case MODE_DIRECTION_LEFT: @@ -1069,7 +1069,7 @@ void RGBController_OpenRazer::DeviceUpdateMode() } break; - case RAZER_MODE_REACTIVE: + case OPEN_RAZER_MODE_REACTIVE: if(matrix_effect_reactive) { matrix_effect_reactive.write(update_value, 1); diff --git a/Controllers/OpenRazerController/RGBController_OpenRazer.h b/Controllers/OpenRazerController/RGBController_OpenRazer.h index 01ba9e1f..ed5e9fa2 100644 --- a/Controllers/OpenRazerController/RGBController_OpenRazer.h +++ b/Controllers/OpenRazerController/RGBController_OpenRazer.h @@ -18,24 +18,24 @@ class RGBController_OpenRazer : public RGBController public: enum { - RAZER_MODE_CUSTOM, - RAZER_MODE_OFF, - RAZER_MODE_STATIC, - RAZER_MODE_BREATHING, - RAZER_MODE_SPECTRUM_CYCLE, - RAZER_MODE_WAVE, - RAZER_MODE_REACTIVE, - RAZER_MODE_FLASHING, - RAZER_NUM_MODES + OPEN_RAZER_MODE_CUSTOM, + OPEN_RAZER_MODE_OFF, + OPEN_RAZER_MODE_STATIC, + OPEN_RAZER_MODE_BREATHING, + OPEN_RAZER_MODE_SPECTRUM_CYCLE, + OPEN_RAZER_MODE_WAVE, + OPEN_RAZER_MODE_REACTIVE, + OPEN_RAZER_MODE_FLASHING, + OPEN_RAZER_NUM_MODES }; enum { - RAZER_TYPE_MATRIX_FRAME, - RAZER_TYPE_MATRIX_NOFRAME, - RAZER_TYPE_MATRIX_STATIC, - RAZER_TYPE_NOMATRIX, - RAZER_NUM_TYPES + OPEN_RAZER_TYPE_MATRIX_FRAME, + OPEN_RAZER_TYPE_MATRIX_NOFRAME, + OPEN_RAZER_TYPE_MATRIX_STATIC, + OPEN_RAZER_TYPE_NOMATRIX, + OPEN_RAZER_NUM_TYPES }; public: @@ -113,11 +113,11 @@ private: std::ofstream backlight_led_effect; std::ofstream backlight_led_rgb; std::ofstream backlight_led_state; - + std::ofstream logo_led_effect; std::ofstream logo_led_rgb; std::ofstream logo_led_state; - + std::ofstream scroll_led_effect; std::ofstream scroll_led_rgb; std::ofstream scroll_led_state;