Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added my prototype keyboard K_Pro v1 TKL #23797

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Added my prototype keyboard K_Pro v1 TKL #23797

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
124f4a5
New Keyboard created
ksmosna May 25, 2024
b3643af
Modified default layout + pinout in info.json.
ksmosna May 25, 2024
f628e5b
Created LED matrix
May 27, 2024
bca6a3b
LED matrix updated
May 27, 2024
404e2e1
Added Simple VIA support + LED Matrix updated
May 28, 2024
491b7d8
Merge branch 'qmk:master' into master
ksmosna May 30, 2024
f5735ba
Changed name of keyboard, moved to keyboard.json
May 31, 2024
68a22d1
Cleaning up after changing Keyboard name, Changed the pid and vid to …
May 31, 2024
cf4b5ff
Merge branch 'qmk:master' into master
ksmosna Jun 3, 2024
54d0cf7
Added partial keyboard configuration using OLED and knob. Max brightn…
ksmosna Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaning up after changing Keyboard name, Changed the pid and vid to … 
…the one received from STMicroelectronics, added missing licence headers
  • Loading branch information
Krzysztof Smosna committed May 31, 2024
commit 68a22d10064ee59decd139e4abe7daa921bdf8af
11 changes: 0 additions & 11 deletions keyboards/k_pro_v1_tkl/rules.mk
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions keyboards/skdevices/adler/adler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2024 ksmosna (@ksmosna)
// SPDX-License-Identifier: GPL-2.0-or-later

#include "quantum.h"
#include "i2c_master.h"
#include "drivers/led/issi/is31fl3733.h"
Expand Down
3 changes: 3 additions & 0 deletions keyboards/skdevices/adler/halconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2024 ksmosna (@ksmosna)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once
#define HAL_USE_I2C TRUE
#include_next <halconf.h>
4 changes: 2 additions & 2 deletions keyboards/skdevices/adler/keyboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"url": "https://skdevices.pl",
"usb": {
"device_version": "1.0.0",
"pid": "0x0001",
"vid": "0x5301"
"pid": "0xA4CE",
"vid": "0x0483"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is STM's vendor ID, please use a different vendor ID.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I've contacted with STMicroelectronics and I can use that VID with that speciffic PID. This is reserved for that project . Here is reply from support

"" SKDevices“ company can use the original PID: 0xA4CE and VID: 0x0483 pending to be licensed by USB-IF of "STM32F411RET6" and solely for the purpose of Adler using STM32F411RET6 silicon USB device microcontrollers” This license is revocable and nontransferable and no other rights are granted except those expressly stated here.

Please note that They would only be able to test their products for USB-IF certification under our company name. All products will be listed under our company name ( STMicroelectronics) on the Integrators list if certified. They would not have rights to use the USB-IF logos on their products. If they intend to use the USB-IF logos they must obtain their own VID. The requirements to display the USB-IF’s trademarked and licensed USB logo are:

    1. The company must be a USB vendor (i.e. obtain a USB vendor ID). 

    2. The company must execute the USB-IF Trademark License Agreement. 

    3. The product bearing the logo must successfully pass USB-IF Compliance Testing and appear on the Integrators List under that company’s name.

These requirements apply to manufacturers and resellers. "

},
"encoder": {
"rotary": [
Expand Down
2 changes: 1 addition & 1 deletion keyboards/skdevices/adler/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 QMK
// Copyright 2024 ksmosna (@ksmosna)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H
Expand Down
2 changes: 1 addition & 1 deletion keyboards/skdevices/adler/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 QMK
// Copyright 2024 ksmosna (@ksmosna)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H
Expand Down
3 changes: 3 additions & 0 deletions keyboards/skdevices/adler/mcuconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2024 ksmosna (@ksmosna)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include_next <mcuconf.h>
Expand Down
Loading