kenji/alloy_elite2_rgb
1
Fork 0
Code Releases 2 Activity

update for pico-sdk v2.2.0

Browse Source
This commit is contained in:
kenji
2025-08-12 11:51:26 -04:00
parent bab8f9678c
commit f0d79038c1
6 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -6
View File
@@ -15,14 +15,8 @@ target_sources(${PROJECT} PRIVATE
main_host.c
usb_descriptors.c
hyperx_elite2.c
# can use 'tinyusb_pico_pio_usb' library later when pico-sdk is updated
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/pio_usb/dcd_pio_usb.c
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/pio_usb/hcd_pio_usb.c
)
# print memory usage, enable all warnings
target_link_options(${PROJECT} PRIVATE -Xlinker --print-memory-usage)
target_compile_options(${PROJECT} PRIVATE ) #-Wall -Wextra
@@ -36,8 +30,10 @@ target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
target_link_libraries(${PROJECT} PRIVATE
pico_stdlib
pico_pio_usb
tinyusb_board
tinyusb_device
tinyusb_host
tinyusb_pico_pio_usb
hardware_adc
)
build/hyperx_kb_rgb.uf2
BIN
View File
Binary file not shown.
hyperx_elite2.h
+1 -1
View File
@@ -5,7 +5,7 @@ enum
{
HYPERX_KEYBOARD_VID = 0x0951,
HYPERX_ELITE2_PID = 0x1711,
NUM_KEYS = 129,
NUM_KEYS = 128,
BUF_SIZE = 64,
NUM_PACKETS = 10,
NKRO_BUF_SIZE = 15,
tusb_config.h
+28 -1
View File
@@ -65,11 +65,24 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
//------------------------- Board Specific --------------------------
// RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_TUD_RHPORT
#define BOARD_TUD_RHPORT 0
#endif
// RHPort max operational speed can defined by board.mk
#ifndef BOARD_TUD_MAX_SPEED
#define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif
#ifndef CFG_TUD_ENDPOINT0_SIZE
#define CFG_TUD_ENDPOINT0_SIZE 64
#endif
//------------- CLASS -------------//
//-----------------------Driver configuration-------------------------
#define CFG_TUD_CDC 1
#define CFG_TUD_HID 1
@@ -87,6 +100,20 @@
// HOST CONFIGURATION
//--------------------------------------------------------------------
//------------------------- Board Specific --------------------------
// RHPort number used for host can be defined by board.mk, default to port 0
#ifndef BOARD_TUH_RHPORT
#define BOARD_TUH_RHPORT 1
#endif
// RHPort max operational speed can defined by board.mk
#ifndef BOARD_TUH_MAX_SPEED
#define BOARD_TUH_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif
//-----------------------Driver configuration-------------------------
// Size of buffer to hold descriptors and other data used for enumeration
#define CFG_TUH_ENUMERATION_BUFSIZE 256
usb_descriptors.c
+14 -30
View File
@@ -25,21 +25,10 @@
*/
#include "tusb.h"
#include "bsp/board_api.h"
#include "usb_descriptors.h"
/* A combination of interfaces must have a unique product id, since PC will save device driver after the first plug.
* Same VID/PID with different interface e.g MSC (first), then CDC (later) will possibly cause system error on PC.
*
* Auto ProductID layout's Bitmap:
* [MSB] HID | MSC | CDC [LSB]
*/
#define _PID_MAP(itf, n) ( (CFG_TUD_##itf) << (n) )
#define USB_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \
_PID_MAP(MIDI, 3) | _PID_MAP(VENDOR, 4) )
#define USB_VID 0xCafe
#define USB_BCD 0x0200
//--------------------------------------------------------------------+
// Device Descriptors
//--------------------------------------------------------------------+
@@ -80,12 +69,7 @@ uint8_t const * tud_descriptor_device_cb(void)
// Configuration Descriptor
//--------------------------------------------------------------------+
#define EPNUM_CDC_NOTIF 0x81
#define EPNUM_CDC_OUT 0x02
#define EPNUM_CDC_IN 0x82
#define EPNUM_HID 0x83
#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_HID_DESC_LEN)
uint8_t const desc_hid_report[] =
{
@@ -125,13 +109,10 @@ char const* string_desc_arr [] =
(const char[]) { 0x09, 0x04 }, // 0: is supported language is English (0x0409)
"Raspberry Pi", // 1: Manufacturer
"Pico HyperX RGB Controller", // 2: Product
"1234567890123456789", // 3: Serials, should use chip ID
"Pico HyperX RGB Controller CDC", // 4: CDC Interface
"Pico HyperX RGB Controller Keyboard",// 5: HID Keyboard Interface
"Pico HyperX RGB Controller Rollover",// 6: HID Keyboard Rollover Keys
NULL, // 3: Serials, should use chip ID
};
static uint16_t _desc_str[32];
static uint16_t _desc_str[32+1];
// Invoked when received GET STRING DESCRIPTOR request
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
@@ -141,28 +122,31 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid)
uint8_t chr_count;
if ( index == 0)
{
switch (index) {
case 0: // langid
memcpy(&_desc_str[1], string_desc_arr[0], 2);
chr_count = 1;
}else
{
break;
case 3: // serial
chr_count = board_usb_get_serial(_desc_str+1, 32);
break;
default:
// Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors.
// https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors
if ( !(index < sizeof(string_desc_arr)/sizeof(string_desc_arr[0])) ) return NULL;
const char* str = string_desc_arr[index];
char* str = string_desc_arr[index];
// Cap at max char
chr_count = (uint8_t) strlen(str);
if ( chr_count > 31 ) chr_count = 31;
// Convert ASCII string into UTF-16
for(uint8_t i=0; i<chr_count; i++)
{
for(uint8_t i=0; i<chr_count; i++) {
_desc_str[1+i] = str[i];
}
break;
}
// first byte is length (including header), second byte is string type
usb_descriptors.h
+10
View File
@@ -16,6 +16,16 @@ enum
ITF_NUM_TOTAL
};
#define USB_PID 0xE2BD
#define USB_VID 0xCEC0
#define USB_BCD 0x0200
#define EPNUM_CDC_NOTIF 0x81
#define EPNUM_CDC_OUT 0x02
#define EPNUM_CDC_IN 0x82
#define EPNUM_HID 0x83
#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_HID_DESC_LEN)
#define TUD_HID_REPORT_DESC_NKRO(...) \
HID_USAGE_PAGE(HID_USAGE_PAGE_DESKTOP), HID_USAGE(HID_USAGE_PAGE_KEYBOARD), \