kim/modular-kbd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

separated HID struct for both nkro and 6kro

Browse Source
This commit is contained in:
Oliver "Kim" Avecilla Cabral
2025-07-02 23:45:59 -07:00
parent ce728bb600
commit d519070ef8
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/components/mainboard/stmf446retx/.vscode/c_cpp_properties.json vendored
View File

@@ -36,8 +36,8 @@
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Src", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Src",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Inc", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Src", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Src",
"/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Src", "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Src",
"/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Inc", "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Inc",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Include", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Include",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Device/ST/STM32F4xx/Include", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/STM32F4xx_HAL_Driver/Inc", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/STM32F4xx_HAL_Driver/Inc",
@@ -128,8 +128,8 @@
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Src", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Src",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Inc", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Src", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Src",
"/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Src", "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Src",
"/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Inc", "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Inc",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Include", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Include",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Device/ST/STM32F4xx/Include", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
"/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/STM32F4xx_HAL_Driver/Inc", "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/STM32F4xx_HAL_Driver/Inc",

6
firmware/components/mainboard/stmf446retx/.vscode/launch.json vendored
View File

@@ -12,7 +12,7 @@
"type": "platformio-debug", "type": "platformio-debug",
"request": "launch", "request": "launch",
"name": "PIO Debug", "name": "PIO Debug",
"executable": "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf", "executable": "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
"projectEnvName": "nucleo_f446re", "projectEnvName": "nucleo_f446re",
"toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin", "toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin",
"internalConsoleOptions": "openOnSessionStart", "internalConsoleOptions": "openOnSessionStart",
@@ -26,7 +26,7 @@
"type": "platformio-debug", "type": "platformio-debug",
"request": "launch", "request": "launch",
"name": "PIO Debug (skip Pre-Debug)", "name": "PIO Debug (skip Pre-Debug)",
"executable": "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf", "executable": "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
"projectEnvName": "nucleo_f446re", "projectEnvName": "nucleo_f446re",
"toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin", "toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin",
"internalConsoleOptions": "openOnSessionStart", "internalConsoleOptions": "openOnSessionStart",
@@ -36,7 +36,7 @@
"type": "platformio-debug", "type": "platformio-debug",
"request": "launch", "request": "launch",
"name": "PIO Debug (without uploading)", "name": "PIO Debug (without uploading)",
"executable": "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf", "executable": "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
"projectEnvName": "nucleo_f446re", "projectEnvName": "nucleo_f446re",
"toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin", "toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin",
"internalConsoleOptions": "openOnSessionStart", "internalConsoleOptions": "openOnSessionStart",

10
firmware/components/mainboard/stmf446retx/Src/main.c
View File

@@ -30,11 +30,17 @@
/* Private typedef -----------------------------------------------------------*/ /* Private typedef -----------------------------------------------------------*/
/* USER CODE BEGIN PTD */ /* USER CODE BEGIN PTD */
typedef struct{
uint8_t MODIFIER;
uint8_t RESERVED;
uint8_t KEYPRESS[13];
} HIDReportNKRO;
typedef struct{ typedef struct{
uint8_t MODIFIER; uint8_t MODIFIER;
uint8_t RESERVED; uint8_t RESERVED;
uint8_t KEYPRESS[6]; // for 6 Key Rollover, changed index to 6. uint8_t KEYPRESS[6]; // for 6 Key Rollover, changed index to 6.
} HIDReport; } HIDReport6KRO;
typedef struct{ typedef struct{
GPIO_TypeDef* PORT; GPIO_TypeDef* PORT;
@@ -70,7 +76,7 @@ KbdPins col_pins[COLS] = {
{GPIOB, GPIO_PIN_14}, {GPIOB, GPIO_PIN_14},
{GPIOB, GPIO_PIN_13} {GPIOB, GPIO_PIN_13}
}; };
HIDReport REPORT = {0,0,0,0,0,0,0,0}; HIDReportNKRO REPORT = {0,0,0,0,0,0,0,0};
CAN_RxHeaderTypeDef RxHeader; CAN_RxHeaderTypeDef RxHeader;
uint8_t RxData[8]; uint8_t RxData[8];
/* USER CODE END PV */ /* USER CODE END PV */