Run IWYU on imported KeyboardioHID driver files

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
f/driver/keyboardiohid
Michael Richters 3 years ago
parent 3450ee6947
commit 085bae2b91
No known key found for this signature in database
GPG Key ID: 1288FD13E4EEF0C0

@ -19,7 +19,7 @@
#include "kaleidoscope/device/virtual/Virtual.h"
#include <EEPROM.h> // for EEPROMClass, EERef
#include <EEPROM.h> // for EEPROMClass, EERef
#include <stdint.h> // for uint8_t, uint16_t
#include <stdlib.h> // for exit, size_t
#include <virtual_io.h> // for getLineOfInput, isInte...
@ -30,8 +30,8 @@
#include "kaleidoscope/device/virtual/DefaultHIDReportConsumer.h" // for DefaultHIDReportConsumer
#include "kaleidoscope/device/virtual/Logging.h" // for log_error, logging
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
#include "kaleidoscope/key_defs.h" // for Key_NoKey
#include "kaleidoscope/keyswitch_state.h" // for IS_PRESSED, WAS_PRESSED
#include "kaleidoscope/key_defs.h" // for Key_NoKey
#include "kaleidoscope/keyswitch_state.h" // for IS_PRESSED, WAS_PRESSED
// FIXME: This relates to virtual/cores/arduino/EEPROM.h.
// EEPROM static data must be defined here as only

@ -22,9 +22,9 @@
// library KeyboardioHID. It replaces all hardware related stuff
// with stub implementations.
#include <PluggableUSB.h> // for USBSetup, EP_TYPE_INTERRUPT_IN, PluggableUSBModule
#include <stddef.h> // for NULL
#include <stdint.h> // for uint8_t
#include <PluggableUSB.h> // for USBSetup, EP_TYPE_INTERRUPT_IN, PluggableUSBModule
#include <stddef.h> // for NULL
#include <stdint.h> // for uint8_t
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"

@ -17,10 +17,11 @@
#pragma once
#include <KeyboardioHID.h> // for SingleAbsoluteMouse_, SingleAbso...
#include <stdint.h> // for uint8_t, int8_t, uint16_t
#include <stdint.h> // for uin...
#include "kaleidoscope/driver/hid/base/AbsoluteMouse.h" // for AbsoluteMouse, AbsoluteMouseProps
#include "kaleidoscope/driver/hid/base/AbsoluteMouse.h" // for Abs...
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h" // for Abs...
#include "kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h" // for Sin...
// IWYU pragma: no_include "DeviceAPIs/AbsoluteMouseAPI.hpp"

@ -17,13 +17,13 @@
#pragma once
#include <stdint.h> // for uint8_t, uint16_t
#include <stdint.h> // for uint8_t
#include "kaleidoscope/driver/hid/base/Keyboard.h" // for Keyboard, Keyboar...
#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
#include "kaleidoscope/driver/hid/base/Keyboard.h" // for Keyboard
#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h" // for BootKeyb...
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h" // for Consumer...
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h" // for Keyboard
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h" // for SystemCo...
namespace kaleidoscope {
namespace driver {

@ -17,10 +17,10 @@
#pragma once
#include <stdint.h> // for int8_t, uint8_t
#include <stdint.h> // for int8_t, uint8_t
#include "kaleidoscope/driver/hid/base/Mouse.h" // for Mouse, MouseProps
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"
#include "kaleidoscope/driver/hid/base/Mouse.h" // for Mouse, MouseProps
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h" // for HID_MouseReport_Da...
namespace kaleidoscope {
namespace driver {

@ -24,8 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
#include <string.h> // for memcmp, memcpy
#include "Arduino.h" // for PROGMEM
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_REPORT_COUNT
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h" // for HID_KEYBOARD_FI...
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h" // for HIDReportObserver
// See Appendix B of USB HID spec
static const uint8_t boot_keyboard_hid_descriptor_[] PROGMEM = {

@ -26,11 +26,11 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h"
#include "kaleidoscope/HIDTables.h"
#include <stddef.h> // for size_t
#include <stdint.h> // for uint8_t
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for USBSetup, EPTYPE_DESCRI...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID_REPORT_PROTOCOL
typedef union {
// Low level key report: up to 6 keys and shift, ctrl etc at once

@ -26,11 +26,10 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <stdint.h> // for uint8_t, uint16_t
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_DATA, D_INPUT
#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h" // for MOUSE_LEFT
// clang-format off
@ -104,4 +103,4 @@ class AbsoluteMouseAPI {
inline int16_t qadd16(int16_t base, int16_t increment);
};
#include "AbsoluteMouseAPI.hpp"
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.hpp" // IWYU pragma: export

@ -26,7 +26,7 @@ THE SOFTWARE.
#pragma once
AbsoluteMouseAPI::AbsoluteMouseAPI()
: x_axis_(0), y_axis_(0), buttons_(0) {}
: x_axis_(0), y_axis_(0), buttons_(0) {}
void AbsoluteMouseAPI::buttons(uint8_t b) {
if (b != buttons_) {
@ -75,9 +75,9 @@ void AbsoluteMouseAPI::moveTo(uint16_t x, uint16_t y, signed char wheel) {
y_axis_ = y;
HID_MouseAbsoluteReport_Data_t report;
report.buttons = buttons_;
report.xAxis = x;
report.yAxis = y;
report.wheel = wheel;
report.xAxis = x;
report.yAxis = y;
report.wheel = wheel;
sendReport(&report, sizeof(report));
}

@ -27,6 +27,8 @@ THE SOFTWARE.
#pragma once
// IWYU pragma: no_include "PluggableUSB.h"
#define HID_REPORTID_NONE 0
#ifndef HID_REPORTID_MOUSE
@ -37,11 +39,14 @@ THE SOFTWARE.
#define HID_REPORTID_KEYBOARD 2
#endif
/* Commented out so that IWYU won't remove it:
-------------------------------------------
#ifndef HID_REPORTID_RAWHID
// This will not work properly in most cases.
// The number is just kept from the old number counting.
//#define HID_REPORTID_RAWHID 3
#endif
// ------------------------------------------- */
#ifndef HID_REPORTID_CONSUMERCONTROL
#define HID_REPORTID_CONSUMERCONTROL 4
@ -78,7 +83,7 @@ void USB_PackMessages(bool pack);
#if defined(ARDUINO_ARCH_AVR)
#include <PluggableUSB.h>
#include <PluggableUSB.h> // IWYU pragma: export
#define EPTYPE_DESCRIPTOR_SIZE uint8_t

@ -25,7 +25,7 @@ THE SOFTWARE.
#pragma once
#include "kaleidoscope/HIDTables.h"
#include "kaleidoscope/HIDTables.h" // for HID_KEYBOARD_LEFT_CONTROL, HID_KEYBOARD_NO_EVENT
#define HID_FIRST_KEY HID_KEYBOARD_NO_EVENT
#define HID_LAST_KEY HID_KEYPAD_HEXADECIMAL

@ -24,7 +24,7 @@ THE SOFTWARE.
#pragma once
#include <stdint.h>
#include <stdint.h> // for uint8_t
class HIDReportObserver {
public:

@ -19,6 +19,7 @@
#ifndef KEYBOARDIOHID_BUILD_WITHOUT_HID
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
#if defined(USBCON)
@ -173,11 +174,11 @@ bool HID_::setup(USBSetup &setup) {
if (length == sizeof(setReportData)) {
USB_RecvControl(&raw_report_data, length);
setReportData.reportId = raw_report_data[0];
setReportData.leds = raw_report_data[1];
setReportData.leds = raw_report_data[1];
} else if (length == sizeof(setReportData.leds)) {
USB_RecvControl(&raw_report_data, length);
setReportData.reportId = 0;
setReportData.leds = raw_report_data[0];
setReportData.leds = raw_report_data[0];
}
// Once the GD32 core bug is fixed, we can replace the above code with the
// original code below:

@ -18,9 +18,11 @@
#pragma once
#include <stdint.h>
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include <Arduino.h> // for highByte, lowByte
#include <stddef.h> // for NULL
#include <stdint.h> // for uint8_t, uint16_t
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for USBSetup, EPTYPE_DESCRI...
#if defined(USBCON)

@ -24,7 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <Arduino.h> // for PROGMEM
#include <stdint.h> // for uint8_t
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_APPLICATION
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_MO...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID, HID_, HIDS...
static const uint8_t absolute_mouse_hid_descriptor_[] PROGMEM = {
// clang-format off

@ -26,10 +26,7 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h" // for Absolute...
class AbsoluteMouse_ : public AbsoluteMouseAPI {
public:

@ -24,7 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <Arduino.h> // for PROGMEM
#include <string.h> // for memset, memcmp
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_MULTIBYTE
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_CO...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID, HID_, HIDS...
static const uint8_t consumer_control_hid_descriptor_[] PROGMEM = {
// clang-format off

@ -26,9 +26,7 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include <stdint.h> // for uint16_t
typedef union {
// Every usable Consumer key possible, up to 4 keys presses possible

@ -24,7 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <Arduino.h> // for PROGMEM
#include <string.h> // for memset
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_USAGE, D_ABSO...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_GA...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID, HID_, HIDS...
static const uint8_t gamepad_hid_descriptor_[] PROGMEM = {
// clang-format off

@ -26,9 +26,7 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include <stdint.h> // for uint8_t, int16_t, int8_t, uint32_t
// Dpad directions
#define GAMEPAD_DPAD_CENTERED 0

@ -24,7 +24,14 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <Arduino.h> // for PROGMEM, byte
#include <string.h> // for memcmp, memcpy
#include "kaleidoscope/HIDTables.h" // for HID_KEYBOARD_A_...
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_REPORT_COUNT
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_NK...
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h" // for HID_KEYBOARD_FI...
static const uint8_t nkro_keyboard_hid_descriptor_[] PROGMEM = {
// clang-format off

@ -26,12 +26,10 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include <stddef.h> // for size_t
#include <stdint.h> // for uint8_t
#include "kaleidoscope/HIDTables.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID, HID_
#define KEY_BYTES 28

@ -24,7 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <Arduino.h> // for PROGMEM
#include <string.h> // for memset
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_USAGE, D_USAG...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_MOUSE
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID, HID_, HIDS...
static const uint8_t mouse_hid_descriptor_[] PROGMEM = {
// clang-format off

@ -26,10 +26,9 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
#include <stdint.h> // for int8_t, uint8_t
#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h" // for MOUSE_LEFT
typedef union {
// Mouse report: 8 buttons, position, wheel

@ -24,7 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
#include <Arduino.h> // for PROGMEM
#include "kaleidoscope/HIDTables.h" // for HID_SYSTEM_WAKE_UP
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_ABSOLUTE, D_A...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_SY...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HID, HID_, HIDS...
static const uint8_t system_control_hid_descriptor_[] PROGMEM = {
// clang-format off

@ -26,10 +26,7 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include "kaleidoscope/HIDTables.h"
#include <stdint.h> // for uint8_t
typedef union {
// Every usable system control key possible

@ -24,7 +24,13 @@ THE SOFTWARE.
*/
#include "kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
#include <Arduino.h> // for PROGMEM
#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h" // for D_APPLIC...
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h" // for Absolute...
#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h" // for HIDRepor...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h" // for HIDDescr...
static const uint8_t _hidSingleReportDescriptorAbsoluteMouse[] PROGMEM = {
// clang-format off

@ -26,10 +26,10 @@ THE SOFTWARE.
// Include guard
#pragma once
#include <Arduino.h>
#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
#include <stdint.h> // for uint8_t
#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h" // for Absolute...
#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for USBSetup
class SingleAbsoluteMouse_ : public PluggableUSBModule, public AbsoluteMouseAPI {

@ -1,4 +1,4 @@
#include "Arduino.h"
#include <Arduino.h> // IWYU pragma: keep
#ifdef ARDUINO_ARCH_AVR

@ -1,4 +1,4 @@
#include "Arduino.h"
#include <Arduino.h> // IWYU pragma: keep
#ifdef ARDUINO_ARCH_GD32

@ -1,4 +1,4 @@
#include "Arduino.h"
#include <Arduino.h> // IWYU pragma: keep
#ifdef ARDUINO_ARCH_SAMD

Loading…
Cancel
Save