Add a MACRO button type

and relocate the raw value 0 of RATBAG_BUTTON_TYPE_NONE to be below 0x06.
The windows application sets 0x06 when disabling a button.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

src/driver-etekcity.c

@@ -115,11 +115,12 @@ struct etekcity_button_mapping {
 };
 
 static struct etekcity_button_mapping etekcity_button_mapping[] = {
-	{ 0, RATBAG_BUTTON_TYPE_NONE },
 	{ 1, RATBAG_BUTTON_TYPE_LEFT },
 	{ 2, RATBAG_BUTTON_TYPE_RIGHT },
 	{ 3, RATBAG_BUTTON_TYPE_MIDDLE },
 //	{ 4, "2 x BTN_LEFT" },
+	{ 6, RATBAG_BUTTON_TYPE_NONE },
+	{ 0, RATBAG_BUTTON_TYPE_NONE },
 	{ 7, RATBAG_BUTTON_TYPE_EXTRA },
 	{ 8, RATBAG_BUTTON_TYPE_SIDE },
 	{ 9, RATBAG_BUTTON_TYPE_WHEEL_UP },
@@ -132,6 +133,9 @@ static struct etekcity_button_mapping etekcity_button_mapping[] = {
 	{ 14, RATBAG_BUTTON_TYPE_RESOLUTION_UP },
 	{ 15, RATBAG_BUTTON_TYPE_RESOLUTION_DOWN },
 
+	/* Macro */
+	{ 16, RATBAG_BUTTON_TYPE_MACRO },
+
 	/* Profile */
 	{ 18, RATBAG_BUTTON_TYPE_PROFILE_CYCLE_UP },
 	{ 19, RATBAG_BUTTON_TYPE_PROFILE_UP },

src/libratbag.h

@@ -477,6 +477,9 @@ enum ratbag_button_type {
 	RATBAG_BUTTON_TYPE_PROFILE_UP,
 	RATBAG_BUTTON_TYPE_PROFILE_DOWN,
 
+	/* Macro */
+	RATBAG_BUTTON_TYPE_MACRO,
+
 	/* multimedia */
 	RATBAG_BUTTON_TYPE_KEY_CONFIG,
 	RATBAG_BUTTON_TYPE_KEY_PREVIOUSSONG,

tools/ratbag-command.c

@@ -154,6 +154,9 @@ button_type_to_str(enum ratbag_button_type type)
 	case RATBAG_BUTTON_TYPE_PROFILE_UP:		str = "profile up"; break;
 	case RATBAG_BUTTON_TYPE_PROFILE_DOWN:		str = "profile down"; break;
 
+	/* Macro */
+	case RATBAG_BUTTON_TYPE_MACRO:			str = "macro"; break;
+
 	/* multimedia */
 	case RATBAG_BUTTON_TYPE_KEY_CONFIG:		str = "key config"; break;
 	case RATBAG_BUTTON_TYPE_KEY_PREVIOUSSONG:	str = "key previous song"; break;