M711: update DPI values and enable reading the button mapping

This commit is contained in:
dokutan 2021-11-30 22:09:01 +01:00
parent a7387de00c
commit ded077560e
3 changed files with 71 additions and 82 deletions

View file

@ -26,10 +26,12 @@ dpi3_enable=1
dpi4_enable=1
dpi5_enable=0
# dpi
# 100-10000 in steps of 100 (200 above 5000)
# X<100-10000>Y<100-10000>
# 0x[04-8c][00-01] (same value for x and y)
# 0x[04-8c][00-01][04-8c][00-01] (different values for x and y)
dpi1=X100Y200
dpi2=0x16000400
dpi2=2000
dpi3=0x2d00
dpi4=0x4300
dpi5=0x8c00
@ -37,8 +39,7 @@ dpi5=0x8c00
# usb report rate (125, 250, 500, 1000) Hz
report_rate=500
# NOT FULLY IMPLEMENTED
# button mapping: there is a total of ? programmable buttons.
# button mapping: there is a total of 10 programmable buttons.
# keymap.md for full details
button_left=left
button_right=right
@ -62,7 +63,6 @@ brightness=3
[profile5]
# NOT TESTED, NO DATA CAPTURES AVAILABLE
# Macro definitions
# Each macro (1-15) is defined in its own section, starting with ";## macro"
# Each action is prefixed by ";# "

View file

@ -43,88 +43,81 @@ std::map< int, std::string > mouse_m711::_c_button_names = {
// Mapping of real DPI values to bytecode
std::map< unsigned int, std::array<uint8_t, 2> > mouse_m711::_c_dpi_codes = {
{ 100, {0x2, 0x00} },
{ 200, {0x4, 0x00} },
{ 300, {0x6, 0x00} },
{ 400, {0x9, 0x00} },
{ 500, {0xb, 0x00} },
{ 600, {0xd, 0x00} },
{ 700, {0xf, 0x00} },
{ 100, {0x02, 0x00} },
{ 200, {0x04, 0x00} },
{ 300, {0x06, 0x00} },
{ 400, {0x08, 0x00} },
{ 500, {0x0b, 0x00} },
{ 600, {0x0d, 0x00} },
{ 700, {0x0f, 0x00} },
{ 800, {0x12, 0x00} },
{ 900, {0x14, 0x00} },
{ 1000, {0x16, 0x00} },
{ 1100, {0x18, 0x00} },
{ 1100, {0x19, 0x00} },
{ 1200, {0x1b, 0x00} },
{ 1300, {0x1d, 0x00} },
{ 1400, {0x1f, 0x00} },
{ 1500, {0x21, 0x00} },
{ 1400, {0x20, 0x00} },
{ 1500, {0x22, 0x00} },
{ 1600, {0x24, 0x00} },
{ 1700, {0x26, 0x00} },
{ 1800, {0x28, 0x00} },
{ 1700, {0x27, 0x00} },
{ 1800, {0x29, 0x00} },
{ 1900, {0x2b, 0x00} },
{ 2000, {0x2d, 0x00} },
{ 2100, {0x2f, 0x00} },
{ 2200, {0x31, 0x00} },
{ 2000, {0x2e, 0x00} },
{ 2100, {0x30, 0x00} },
{ 2200, {0x32, 0x00} },
{ 2300, {0x34, 0x00} },
{ 2400, {0x36, 0x00} },
{ 2500, {0x38, 0x00} },
{ 2600, {0x3a, 0x00} },
{ 2700, {0x3d, 0x00} },
{ 2800, {0x3f, 0x00} },
{ 2900, {0x41, 0x00} },
{ 3000, {0x43, 0x00} },
{ 3100, {0x46, 0x00} },
{ 3200, {0x48, 0x00} },
{ 3300, {0x4a, 0x00} },
{ 3400, {0x4d, 0x00} },
{ 3500, {0x4f, 0x00} },
{ 3600, {0x51, 0x00} },
{ 3700, {0x53, 0x00} },
{ 3800, {0x56, 0x00} },
{ 3900, {0x58, 0x00} },
{ 4000, {0x5a, 0x00} },
{ 4100, {0x5c, 0x00} },
{ 4200, {0x5f, 0x00} },
{ 4300, {0x61, 0x00} },
{ 4400, {0x63, 0x00} },
{ 4500, {0x66, 0x00} },
{ 4600, {0x68, 0x00} },
{ 4700, {0x6a, 0x00} },
{ 4800, {0x6c, 0x00} },
{ 4900, {0x6f, 0x00} },
{ 5000, {0x71, 0x00} },
{ 5100, {0x73, 0x00} },
{ 5200, {0x75, 0x00} },
{ 5300, {0x78, 0x00} },
{ 5400, {0x7a, 0x00} },
{ 5500, {0x7c, 0x00} },
{ 5600, {0x7f, 0x00} },
{ 5700, {0x81, 0x00} },
{ 5800, {0x83, 0x00} },
{ 5900, {0x85, 0x00} },
{ 6000, {0x87, 0x00} },
{ 6100, {0x8a, 0x00} },
{ 6200, {0x8c, 0x00} },
{ 6400, {0x48, 0x01} },
{ 6600, {0x4a, 0x01} },
{ 6800, {0x4d, 0x01} },
{ 7000, {0x4f, 0x01} },
{ 7200, {0x51, 0x01} },
{ 7400, {0x53, 0x01} },
{ 7600, {0x56, 0x01} },
{ 7800, {0x58, 0x01} },
{ 8000, {0x5a, 0x01} },
{ 8200, {0x5c, 0x01} },
{ 8400, {0x5f, 0x01} },
{ 8600, {0x61, 0x01} },
{ 8800, {0x63, 0x01} },
{ 9000, {0x66, 0x01} },
{ 9200, {0x68, 0x01} },
{ 9400, {0x6a, 0x01} },
{ 9600, {0x6c, 0x01} },
{ 9800, {0x6f, 0x01} },
{ 10000, {0x71, 0x01} },
{ 10200, {0x73, 0x01} },
{ 2400, {0x37, 0x00} },
{ 2500, {0x39, 0x00} },
{ 2600, {0x3b, 0x00} },
{ 2700, {0x3e, 0x00} },
{ 2800, {0x40, 0x00} },
{ 2900, {0x42, 0x00} },
{ 3000, {0x45, 0x00} },
{ 3100, {0x47, 0x00} },
{ 3200, {0x49, 0x00} },
{ 3300, {0x4c, 0x00} },
{ 3400, {0x4e, 0x00} },
{ 3500, {0x50, 0x00} },
{ 3600, {0x53, 0x00} },
{ 3700, {0x55, 0x00} },
{ 3800, {0x57, 0x00} },
{ 3900, {0x5a, 0x00} },
{ 4000, {0x5c, 0x00} },
{ 4100, {0x5e, 0x00} },
{ 4200, {0x61, 0x00} },
{ 4300, {0x63, 0x00} },
{ 4400, {0x65, 0x00} },
{ 4500, {0x68, 0x00} },
{ 4600, {0x6a, 0x00} },
{ 4700, {0x6c, 0x00} },
{ 4800, {0x6f, 0x00} },
{ 4900, {0x71, 0x00} },
{ 5000, {0x73, 0x00} },
{ 5200, {0x3b, 0x01} },
{ 5400, {0x3e, 0x01} },
{ 5600, {0x40, 0x01} },
{ 5800, {0x42, 0x01} },
{ 6000, {0x45, 0x01} },
{ 6200, {0x47, 0x01} },
{ 6400, {0x49, 0x01} },
{ 6600, {0x4c, 0x01} },
{ 6800, {0x4e, 0x01} },
{ 7000, {0x50, 0x01} },
{ 7200, {0x53, 0x01} },
{ 7400, {0x55, 0x01} },
{ 7600, {0x57, 0x01} },
{ 7800, {0x5a, 0x01} },
{ 8000, {0x5c, 0x01} },
{ 8200, {0x5e, 0x01} },
{ 8400, {0x61, 0x01} },
{ 8600, {0x63, 0x01} },
{ 8800, {0x65, 0x01} },
{ 9000, {0x68, 0x01} },
{ 9200, {0x6a, 0x01} },
{ 9400, {0x6c, 0x01} },
{ 9600, {0x6f, 0x01} },
{ 9800, {0x71, 0x01} },
{ 10000, {0x73, 0x01} }
};
//usb data packets

View file

@ -437,8 +437,6 @@ int mouse_m711::read_settings(){
}
/* Currently not implemented, missing captured data
*
// button mapping
for( int j = 0; j < 8; j++ ){
@ -448,8 +446,6 @@ int mouse_m711::read_settings(){
_s_keymap_data[i-1][j][3] = buffer_in3[j+(8*(i-1))][11];
}
*
*/
}
// macros