Techwizz/mouse_m908
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update lightmode and report rate decoding in remaining read* functions

Browse source
This commit is contained in:
dokutan 2021-01-20 21:48:39 +01:00
parent ab6ae05883
commit 65bd23542c
6 changed files with 37 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
include/generic/readers.cpp
View file

@ -377,48 +377,14 @@ int mouse_generic::read_settings(){
_s_speed_levels[i-1] = buffer_in1[i][13]; _s_speed_levels[i-1] = buffer_in1[i][13];
// lightmode // lightmode
if( buffer_in1[i][11] == 0x00 && buffer_in1[i][13] == 0x00 ) std::array<uint8_t, 2> lightmode_bytes = {buffer_in1[i][11], buffer_in1[i][13]};
_s_lightmodes[i-1] = lightmode_off; if( _c_lightmode_values.find(lightmode_bytes) != _c_lightmode_values.end() )
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x04 ) _s_lightmodes[i-1] = _c_lightmode_values.at(lightmode_bytes);
_s_lightmodes[i-1] = lightmode_breathing;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x08 )
_s_lightmodes[i-1] = lightmode_rainbow;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x02 )
_s_lightmodes[i-1] = lightmode_static;
else if( buffer_in1[i][11] == 0x02 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_wave;
else if( buffer_in1[i][11] == 0x06 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_alternating;
else if( buffer_in1[i][11] == 0x07 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_reactive;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x10 )
_s_lightmodes[i-1] = lightmode_flashing;
// polling rate (report rate) // polling rate (report rate)
if( i < 4 ){ uint8_t report_rate_byte = (i < 4) ? buffer_in1[6][6+(2*i)] : buffer_in1[7][(2*i)];
if( _c_report_rate_values.find(report_rate_byte) != _c_report_rate_values.end() )
if( buffer_in1[6][6+(2*i)] == 8 ) _s_report_rates[i-1] = _c_report_rate_values.at(report_rate_byte);
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[6][6+(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[6][6+(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[6][6+(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
} else{
if( buffer_in1[7][(2*i)] == 8 )
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[7][(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[7][(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[7][(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
}
// dpi // dpi
for( int j = 1; j < 6; j++ ){ for( int j = 1; j < 6; j++ ){
@ -444,8 +410,6 @@ int mouse_generic::read_settings(){
} }
} }
// macros
// macros // macros
std::array< std::vector< uint8_t >, 15 > macro_bytes; std::array< std::vector< uint8_t >, 15 > macro_bytes;
int macronumber = 1; int macronumber = 1;

48
include/m709/readers.cpp
View file

@ -377,48 +377,14 @@ int mouse_m709::read_settings(){
_s_speed_levels[i-1] = buffer_in1[i][13]; _s_speed_levels[i-1] = buffer_in1[i][13];
// lightmode // lightmode
if( buffer_in1[i][11] == 0x00 && buffer_in1[i][13] == 0x00 ) std::array<uint8_t, 2> lightmode_bytes = {buffer_in1[i][11], buffer_in1[i][13]};
_s_lightmodes[i-1] = lightmode_off; if( _c_lightmode_values.find(lightmode_bytes) != _c_lightmode_values.end() )
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x04 ) _s_lightmodes[i-1] = _c_lightmode_values.at(lightmode_bytes);
_s_lightmodes[i-1] = lightmode_breathing;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x08 )
_s_lightmodes[i-1] = lightmode_rainbow;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x02 )
_s_lightmodes[i-1] = lightmode_static;
else if( buffer_in1[i][11] == 0x02 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_wave;
else if( buffer_in1[i][11] == 0x06 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_alternating;
else if( buffer_in1[i][11] == 0x07 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_reactive;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x10 )
_s_lightmodes[i-1] = lightmode_flashing;
// polling rate (report rate) // polling rate (report rate)
if( i < 4 ){ uint8_t report_rate_byte = (i < 4) ? buffer_in1[6][6+(2*i)] : buffer_in1[7][(2*i)];
if( _c_report_rate_values.find(report_rate_byte) != _c_report_rate_values.end() )
if( buffer_in1[6][6+(2*i)] == 8 ) _s_report_rates[i-1] = _c_report_rate_values.at(report_rate_byte);
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[6][6+(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[6][6+(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[6][6+(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
} else{
if( buffer_in1[7][(2*i)] == 8 )
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[7][(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[7][(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[7][(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
}
// dpi // dpi
for( int j = 1; j < 6; j++ ){ for( int j = 1; j < 6; j++ ){
@ -444,8 +410,6 @@ int mouse_m709::read_settings(){
} }
} }
// macros
// macros // macros
std::array< std::vector< uint8_t >, 15 > macro_bytes; std::array< std::vector< uint8_t >, 15 > macro_bytes;
int macronumber = 1; int macronumber = 1;

47
include/m715/readers.cpp
View file

@ -381,47 +381,14 @@ int mouse_m715::read_settings(){
_s_speed_levels[i-1] = buffer_in1[i][13]; _s_speed_levels[i-1] = buffer_in1[i][13];
// lightmode // lightmode
if( buffer_in1[i][11] == 0x00 && buffer_in1[i][13] == 0x00 ) std::array<uint8_t, 2> lightmode_bytes = {buffer_in1[i][11], buffer_in1[i][13]};
_s_lightmodes[i-1] = lightmode_off; if( _c_lightmode_values.find(lightmode_bytes) != _c_lightmode_values.end() )
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x04 ) _s_lightmodes[i-1] = _c_lightmode_values.at(lightmode_bytes);
_s_lightmodes[i-1] = lightmode_breathing;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x08 )
_s_lightmodes[i-1] = lightmode_rainbow;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x02 )
_s_lightmodes[i-1] = lightmode_static;
else if( buffer_in1[i][11] == 0x02 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_wave;
else if( buffer_in1[i][11] == 0x06 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_alternating;
else if( buffer_in1[i][11] == 0x07 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_reactive;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x10 )
_s_lightmodes[i-1] = lightmode_flashing;
// polling rate (report rate) // polling rate (report rate)
if( i < 4 ){ uint8_t report_rate_byte = (i < 4) ? buffer_in1[6][6+(2*i)] : buffer_in1[7][(2*i)];
if( _c_report_rate_values.find(report_rate_byte) != _c_report_rate_values.end() )
if( buffer_in1[6][6+(2*i)] == 8 ) _s_report_rates[i-1] = _c_report_rate_values.at(report_rate_byte);
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[6][6+(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[6][6+(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[6][6+(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
} else{
if( buffer_in1[7][(2*i)] == 8 )
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[7][(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[7][(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[7][(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
}
// dpi // dpi
@ -452,8 +419,6 @@ int mouse_m715::read_settings(){
*/ */
} }
// macros
// macros // macros
std::array< std::vector< uint8_t >, 15 > macro_bytes; std::array< std::vector< uint8_t >, 15 > macro_bytes;
int macronumber = 1; int macronumber = 1;

48
include/m908/readers.cpp
View file

@ -375,48 +375,14 @@ int mouse_m908::read_settings(){
_s_speed_levels[i-1] = buffer_in1[i][13]; _s_speed_levels[i-1] = buffer_in1[i][13];
// lightmode // lightmode
if( buffer_in1[i][11] == 0x00 && buffer_in1[i][13] == 0x00 ) std::array<uint8_t, 2> lightmode_bytes = {buffer_in1[i][11], buffer_in1[i][13]};
_s_lightmodes[i-1] = lightmode_off; if( _c_lightmode_values.find(lightmode_bytes) != _c_lightmode_values.end() )
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x04 ) _s_lightmodes[i-1] = _c_lightmode_values.at(lightmode_bytes);
_s_lightmodes[i-1] = lightmode_breathing;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x08 )
_s_lightmodes[i-1] = lightmode_rainbow;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x02 )
_s_lightmodes[i-1] = lightmode_static;
else if( buffer_in1[i][11] == 0x02 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_wave;
else if( buffer_in1[i][11] == 0x06 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_alternating;
else if( buffer_in1[i][11] == 0x07 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_reactive;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x10 )
_s_lightmodes[i-1] = lightmode_flashing;
// polling rate (report rate) // polling rate (report rate)
if( i < 4 ){ uint8_t report_rate_byte = (i < 4) ? buffer_in1[6][6+(2*i)] : buffer_in1[7][(2*i)];
if( _c_report_rate_values.find(report_rate_byte) != _c_report_rate_values.end() )
if( buffer_in1[6][6+(2*i)] == 8 ) _s_report_rates[i-1] = _c_report_rate_values.at(report_rate_byte);
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[6][6+(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[6][6+(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[6][6+(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
} else{
if( buffer_in1[7][(2*i)] == 8 )
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[7][(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[7][(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[7][(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
}
// dpi // dpi
for( int j = 1; j < 6; j++ ){ for( int j = 1; j < 6; j++ ){
@ -442,8 +408,6 @@ int mouse_m908::read_settings(){
} }
} }
// macros
// macros // macros
std::array< std::vector< uint8_t >, 15 > macro_bytes; std::array< std::vector< uint8_t >, 15 > macro_bytes;
int macronumber = 1; int macronumber = 1;

48
include/m990/readers.cpp
View file

@ -386,48 +386,14 @@ int mouse_m990::read_settings(){
_s_speed_levels[i-1] = buffer_in1[i][13]; _s_speed_levels[i-1] = buffer_in1[i][13];
// lightmode // lightmode
if( buffer_in1[i][11] == 0x00 && buffer_in1[i][13] == 0x00 ) std::array<uint8_t, 2> lightmode_bytes = {buffer_in1[i][11], buffer_in1[i][13]};
_s_lightmodes[i-1] = lightmode_off; if( _c_lightmode_values.find(lightmode_bytes) != _c_lightmode_values.end() )
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x04 ) _s_lightmodes[i-1] = _c_lightmode_values.at(lightmode_bytes);
_s_lightmodes[i-1] = lightmode_breathing;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x08 )
_s_lightmodes[i-1] = lightmode_rainbow;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x02 )
_s_lightmodes[i-1] = lightmode_static;
else if( buffer_in1[i][11] == 0x02 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_wave;
else if( buffer_in1[i][11] == 0x06 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_alternating;
else if( buffer_in1[i][11] == 0x07 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_reactive;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x10 )
_s_lightmodes[i-1] = lightmode_flashing;
// polling rate (report rate) // polling rate (report rate)
if( i < 4 ){ uint8_t report_rate_byte = (i < 4) ? buffer_in1[6][6+(2*i)] : buffer_in1[7][(2*i)];
if( _c_report_rate_values.find(report_rate_byte) != _c_report_rate_values.end() )
if( buffer_in1[6][6+(2*i)] == 8 ) _s_report_rates[i-1] = _c_report_rate_values.at(report_rate_byte);
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[6][6+(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[6][6+(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[6][6+(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
} else{
if( buffer_in1[7][(2*i)] == 8 )
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[7][(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[7][(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[7][(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
}
// dpi // dpi
for( int j = 1; j < 6; j++ ){ for( int j = 1; j < 6; j++ ){
@ -453,8 +419,6 @@ int mouse_m990::read_settings(){
} }
} }
// macros
// macros // macros
std::array< std::vector< uint8_t >, 15 > macro_bytes; std::array< std::vector< uint8_t >, 15 > macro_bytes;
int macronumber = 1; int macronumber = 1;

48
include/m990chroma/readers.cpp
View file

@ -380,48 +380,14 @@ int mouse_m990chroma::read_settings(){
_s_speed_levels[i-1] = buffer_in1[i][13]; _s_speed_levels[i-1] = buffer_in1[i][13];
// lightmode // lightmode
if( buffer_in1[i][11] == 0x00 && buffer_in1[i][13] == 0x00 ) std::array<uint8_t, 2> lightmode_bytes = {buffer_in1[i][11], buffer_in1[i][13]};
_s_lightmodes[i-1] = lightmode_off; if( _c_lightmode_values.find(lightmode_bytes) != _c_lightmode_values.end() )
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x04 ) _s_lightmodes[i-1] = _c_lightmode_values.at(lightmode_bytes);
_s_lightmodes[i-1] = lightmode_breathing;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x08 )
_s_lightmodes[i-1] = lightmode_rainbow;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x02 )
_s_lightmodes[i-1] = lightmode_static;
else if( buffer_in1[i][11] == 0x02 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_wave;
else if( buffer_in1[i][11] == 0x06 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_alternating;
else if( buffer_in1[i][11] == 0x07 && buffer_in1[i][13] == 0x00 )
_s_lightmodes[i-1] = lightmode_reactive;
else if( buffer_in1[i][11] == 0x01 && buffer_in1[i][13] == 0x10 )
_s_lightmodes[i-1] = lightmode_flashing;
// polling rate (report rate) // polling rate (report rate)
if( i < 4 ){ uint8_t report_rate_byte = (i < 4) ? buffer_in1[6][6+(2*i)] : buffer_in1[7][(2*i)];
if( _c_report_rate_values.find(report_rate_byte) != _c_report_rate_values.end() )
if( buffer_in1[6][6+(2*i)] == 8 ) _s_report_rates[i-1] = _c_report_rate_values.at(report_rate_byte);
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[6][6+(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[6][6+(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[6][6+(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
} else{
if( buffer_in1[7][(2*i)] == 8 )
_s_report_rates[i-1] = r_125Hz;
else if( buffer_in1[7][(2*i)] == 4 )
_s_report_rates[i-1] = r_250Hz;
else if( buffer_in1[7][(2*i)] == 2 )
_s_report_rates[i-1] = r_500Hz;
else if( buffer_in1[7][(2*i)] == 1 )
_s_report_rates[i-1] = r_1000Hz;
}
// dpi // dpi
for( int j = 1; j < 6; j++ ){ for( int j = 1; j < 6; j++ ){
@ -447,8 +413,6 @@ int mouse_m990chroma::read_settings(){
} }
} }
// macros
// macros // macros
std::array< std::vector< uint8_t >, 15 > macro_bytes; std::array< std::vector< uint8_t >, 15 > macro_bytes;
int macronumber = 1; int macronumber = 1;