aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/report.h
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2022-11-28 07:54:00 +1100
committerNick Brassel <[email protected]>2022-11-28 07:54:00 +1100
commit4020674163fc80914059c4c9c3be5c0ae00bd150 (patch)
tree6f4187d72b04d03572adf507502afbda9726d696 /tmk_core/protocol/report.h
parent8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff)
parent9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff)
downloadqmk_firmware-0.19.0.tar.gz
qmk_firmware-0.19.0.zip
Merge remote-tracking branch 'upstream/develop'0.19.0
Diffstat (limited to 'tmk_core/protocol/report.h')
-rw-r--r--tmk_core/protocol/report.h24
1 files changed, 16 insertions, 8 deletions
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 735ccdb4a1..e4526e4ee6 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -226,26 +226,30 @@ typedef struct {
#ifdef DIGITIZER_SHARED_EP
uint8_t report_id;
#endif
- uint8_t tip : 1;
- uint8_t inrange : 1;
- uint8_t pad2 : 6;
+ bool in_range : 1;
+ bool tip : 1;
+ bool barrel : 1;
+ uint8_t reserved : 5;
uint16_t x;
uint16_t y;
} __attribute__((packed)) report_digitizer_t;
typedef struct {
-#if JOYSTICK_AXES_COUNT > 0
-# if JOYSTICK_AXES_RESOLUTION > 8
- int16_t axes[JOYSTICK_AXES_COUNT];
+#ifdef JOYSTICK_SHARED_EP
+ uint8_t report_id;
+#endif
+#if JOYSTICK_AXIS_COUNT > 0
+# if JOYSTICK_AXIS_RESOLUTION > 8
+ int16_t axes[JOYSTICK_AXIS_COUNT];
# else
- int8_t axes[JOYSTICK_AXES_COUNT];
+ int8_t axes[JOYSTICK_AXIS_COUNT];
# endif
#endif
#if JOYSTICK_BUTTON_COUNT > 0
uint8_t buttons[(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1];
#endif
-} __attribute__((packed)) joystick_report_t;
+} __attribute__((packed)) report_joystick_t;
/* keycode to system usage */
static inline uint16_t KEYCODE2SYSTEM(uint8_t key) {
@@ -292,6 +296,10 @@ static inline uint16_t KEYCODE2CONSUMER(uint8_t key) {
return AL_CALCULATOR;
case KC_MY_COMPUTER:
return AL_LOCAL_BROWSER;
+ case KC_CONTROL_PANEL:
+ return AL_CONTROL_PANEL;
+ case KC_ASSISTANT:
+ return AL_ASSISTANT;
case KC_WWW_SEARCH:
return AC_SEARCH;
case KC_WWW_HOME: