From c61b2e8a66ea1d99a0a3ac469a78eb22b47176b4 Mon Sep 17 00:00:00 2001
From: dokutan <54861821+dokutan@users.noreply.github.com>
Date: Tue, 4 Jan 2022 19:43:16 +0100
Subject: [PATCH] M686, M913 button mapping: rename "default" to "keyboard_key"

---
 examples/example_m686.ini     | 3 ++-
 examples/example_m913.ini     | 4 ++--
 include/m686/setters.cpp      | 2 +-
 include/m913/setters.cpp      | 2 +-
 include/rd_mouse_wireless.cpp | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/example_m686.ini b/examples/example_m686.ini
index 0b254e6..51c8fcb 100644
--- a/examples/example_m686.ini
+++ b/examples/example_m686.ini
@@ -27,8 +27,9 @@ dpi5=16000
 
 # Button mapping, currently supported:
 # left, middle, right, forward, back
-# led_toggle, report_rate, default, none
+# led_toggle, report_rate, none
 # dpi-, dpi+, dpi-cycle
+# individual keyboard keys
 button_left=left
 button_right=right
 button_middle=middle
diff --git a/examples/example_m913.ini b/examples/example_m913.ini
index 1529b31..537e74d 100644
--- a/examples/example_m913.ini
+++ b/examples/example_m913.ini
@@ -27,9 +27,9 @@ dpi5=16000
 
 # Button mapping, currently supported:
 # left, middle, right, forward, back
-# led_toggle, report_rate, default, none
+# led_toggle, report_rate, none
 # dpi-, dpi+, dpi-cycle
-# a-z
+# individual keyboard keys
 button_left=left
 button_right=right
 button_middle=middle
diff --git a/include/m686/setters.cpp b/include/m686/setters.cpp
index 3752c61..9f8901d 100644
--- a/include/m686/setters.cpp
+++ b/include/m686/setters.cpp
@@ -178,7 +178,7 @@ int mouse_m686::set_key_mapping( rd_profile profile, int key, std::string mappin
 	if( _c_keyboard_key_values.find(mapping) != _c_keyboard_key_values.end() ){ // keyboard key
 
 		// the button gets mapped as "default"
-		_s_keymap_data[rd_profile_to_m686_profile(profile)][key] = rd_mouse_wireless::_c_keycodes["default"];
+		_s_keymap_data[rd_profile_to_m686_profile(profile)][key] = rd_mouse_wireless::_c_keycodes["keyboard_key"];
 		
 		// and additional packets are sent
 		_s_keyboard_key_packets.push_back(_c_data_button_as_keyboard_key);
diff --git a/include/m913/setters.cpp b/include/m913/setters.cpp
index 7945540..1fca2b2 100644
--- a/include/m913/setters.cpp
+++ b/include/m913/setters.cpp
@@ -178,7 +178,7 @@ int mouse_m913::set_key_mapping( rd_profile profile, int key, std::string mappin
 	if( _c_keyboard_key_values.find(mapping) != _c_keyboard_key_values.end() ){ // keyboard key
 
 		// the button gets mapped as "default"
-		_s_keymap_data[rd_profile_to_m913_profile(profile)][key] = rd_mouse_wireless::_c_keycodes["default"];
+		_s_keymap_data[rd_profile_to_m913_profile(profile)][key] = rd_mouse_wireless::_c_keycodes["keyboard_key"];
 		
 		// and additional packets are sent
 		_s_keyboard_key_packets.push_back(_c_data_button_as_keyboard_key);
diff --git a/include/rd_mouse_wireless.cpp b/include/rd_mouse_wireless.cpp
index 07d8d39..0b50868 100644
--- a/include/rd_mouse_wireless.cpp
+++ b/include/rd_mouse_wireless.cpp
@@ -29,7 +29,7 @@ std::map< std::string, std::array<uint8_t, 4> > rd_mouse_wireless::_c_keycodes =
 	{ "dpi-", { 0x02, 0x03, 0x00, 0x50 } },
 	{ "dpi+", { 0x02, 0x02, 0x00, 0x51 } },
 	{ "dpi-cycle", { 0x02, 0x01, 0x00, 0x52 } },
-	{ "default", { 0x05, 0x00, 0x00, 0x50 } },
+	{ "keyboard_key", { 0x05, 0x00, 0x00, 0x50 } },
 	{ "none", { 0x00, 0x00, 0x00, 0x55 } },
 	{ "profile_switch", { 0x09, 0x00, 0x00, 0x4c } },
 };