X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Freport.h;h=2a2ff2ded50199dc23e2af7acd5aa1c4a568486a;hb=41c36024ba0395da3db445fea5ceb41470175fd9;hp=f6c0a315de9307de6c62ac6e2489e3ce2e62e750;hpb=d9fee5571d7de08e76dff5ce75816faf522240f6;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h
index f6c0a315..2a2ff2de 100644
--- a/tmk_core/common/report.h
+++ b/tmk_core/common/report.h
@@ -33,6 +33,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSE_BTN3 (1<<2)
 #define MOUSE_BTN4 (1<<3)
 #define MOUSE_BTN5 (1<<4)
+#define MOUSE_BTN6 (1<<5)
+#define MOUSE_BTN7 (1<<6)
+#define MOUSE_BTN8 (1<<7)
 
 /* Consumer Page(0x0C)
  * following are supported by Windows: http://msdn.microsoft.com/en-us/windows/hardware/gg463372.aspx
@@ -46,25 +49,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TRANSPORT_STOP_EJECT    0x00CC
 #define TRANSPORT_PLAY_PAUSE    0x00CD
 /* application launch */
-#define AL_CC_CONFIG            0x0183
-#define AL_EMAIL                0x018A
-#define AL_CALCULATOR           0x0192
-#define AL_LOCAL_BROWSER        0x0194
+#define APPLAUNCH_CC_CONFIG     0x0183
+#define APPLAUNCH_EMAIL         0x018A
+#define APPLAUNCH_CALCULATOR    0x0192
+#define APPLAUNCH_LOCAL_BROWSER 0x0194
 /* application control */
-#define AC_SEARCH               0x0221
-#define AC_HOME                 0x0223
-#define AC_BACK                 0x0224
-#define AC_FORWARD              0x0225
-#define AC_STOP                 0x0226
-#define AC_REFRESH              0x0227
-#define AC_BOOKMARKS            0x022A
+#define APPCONTROL_SEARCH       0x0221
+#define APPCONTROL_HOME         0x0223
+#define APPCONTROL_BACK         0x0224
+#define APPCONTROL_FORWARD      0x0225
+#define APPCONTROL_STOP         0x0226
+#define APPCONTROL_REFRESH      0x0227
+#define APPCONTROL_BOOKMARKS    0x022A
 /* supplement for Bluegiga iWRAP HID(not supported by Windows?) */
-#define AL_LOCK                 0x019E
+#define APPLAUNCH_LOCK          0x019E
 #define TRANSPORT_RECORD        0x00B2
 #define TRANSPORT_FAST_FORWARD  0x00B3
 #define TRANSPORT_REWIND        0x00B4
 #define TRANSPORT_EJECT         0x00B8
-#define AC_MINIMIZE             0x0206
+#define APPCONTROL_MINIMIZE     0x0206
 
 /* Generic Desktop Page(0x01) - system power control */
 #define SYSTEM_POWER_DOWN       0x0081
@@ -84,6 +87,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #   define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
 #   define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
 #   define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
+#elif defined(PROTOCOL_CHIBIOS) && defined(NKRO_ENABLE)
+#   include "protocol/chibios/usb_main.h"
+#   define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
+#   define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
+#   define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
 
 #else
 #   define KEYBOARD_REPORT_SIZE 8
@@ -154,27 +162,27 @@ typedef struct {
 
 /* keycode to consumer usage */
 #define KEYCODE2CONSUMER(key) \
-    (key == KC_AUDIO_MUTE       ?  AUDIO_MUTE : \
-    (key == KC_AUDIO_VOL_UP     ?  AUDIO_VOL_UP : \
-    (key == KC_AUDIO_VOL_DOWN   ?  AUDIO_VOL_DOWN : \
-    (key == KC_MEDIA_NEXT_TRACK ?  TRANSPORT_NEXT_TRACK : \
-    (key == KC_MEDIA_PREV_TRACK ?  TRANSPORT_PREV_TRACK : \
-    (key == KC_MEDIA_FAST_FORWARD ?  TRANSPORT_FAST_FORWARD : \
-    (key == KC_MEDIA_REWIND     ?  TRANSPORT_REWIND : \
-    (key == KC_MEDIA_STOP       ?  TRANSPORT_STOP : \
-    (key == KC_MEDIA_EJECT      ?  TRANSPORT_STOP_EJECT : \
-    (key == KC_MEDIA_PLAY_PAUSE ?  TRANSPORT_PLAY_PAUSE : \
-    (key == KC_MEDIA_SELECT     ?  AL_CC_CONFIG : \
-    (key == KC_MAIL             ?  AL_EMAIL : \
-    (key == KC_CALCULATOR       ?  AL_CALCULATOR : \
-    (key == KC_MY_COMPUTER      ?  AL_LOCAL_BROWSER : \
-    (key == KC_WWW_SEARCH       ?  AC_SEARCH : \
-    (key == KC_WWW_HOME         ?  AC_HOME : \
-    (key == KC_WWW_BACK         ?  AC_BACK : \
-    (key == KC_WWW_FORWARD      ?  AC_FORWARD : \
-    (key == KC_WWW_STOP         ?  AC_STOP : \
-    (key == KC_WWW_REFRESH      ?  AC_REFRESH : \
-    (key == KC_WWW_FAVORITES    ?  AC_BOOKMARKS : 0)))))))))))))))))))))
+    (key == KC_AUDIO_MUTE           ?  AUDIO_MUTE : \
+    (key == KC_AUDIO_VOL_UP         ?  AUDIO_VOL_UP : \
+    (key == KC_AUDIO_VOL_DOWN       ?  AUDIO_VOL_DOWN : \
+    (key == KC_MEDIA_NEXT_TRACK     ?  TRANSPORT_NEXT_TRACK : \
+    (key == KC_MEDIA_PREV_TRACK     ?  TRANSPORT_PREV_TRACK : \
+    (key == KC_MEDIA_FAST_FORWARD   ?  TRANSPORT_FAST_FORWARD : \
+    (key == KC_MEDIA_REWIND         ?  TRANSPORT_REWIND : \
+    (key == KC_MEDIA_STOP           ?  TRANSPORT_STOP : \
+    (key == KC_MEDIA_EJECT          ?  TRANSPORT_STOP_EJECT : \
+    (key == KC_MEDIA_PLAY_PAUSE     ?  TRANSPORT_PLAY_PAUSE : \
+    (key == KC_MEDIA_SELECT         ?  APPLAUNCH_CC_CONFIG : \
+    (key == KC_MAIL                 ?  APPLAUNCH_EMAIL : \
+    (key == KC_CALCULATOR           ?  APPLAUNCH_CALCULATOR : \
+    (key == KC_MY_COMPUTER          ?  APPLAUNCH_LOCAL_BROWSER : \
+    (key == KC_WWW_SEARCH           ?  APPCONTROL_SEARCH : \
+    (key == KC_WWW_HOME             ?  APPCONTROL_HOME : \
+    (key == KC_WWW_BACK             ?  APPCONTROL_BACK : \
+    (key == KC_WWW_FORWARD          ?  APPCONTROL_FORWARD : \
+    (key == KC_WWW_STOP             ?  APPCONTROL_STOP : \
+    (key == KC_WWW_REFRESH          ?  APPCONTROL_REFRESH : \
+    (key == KC_WWW_FAVORITES        ?  APPCONTROL_BOOKMARKS : 0)))))))))))))))))))))
 
 #ifdef __cplusplus
 }