From 4bf2d0cbfd68c5a06e33d5c169fd682ed25297c8 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Wed, 9 Jun 2021 21:14:09 +0500 Subject: [PATCH 01/24] [Keyboard] Add Creator Pro by SergioPoverony --- keyboards/sergiopoverony/creator_pro/config.h | 55 ++++++++ .../sergiopoverony/creator_pro/creator_pro.c | 36 ++++++ .../sergiopoverony/creator_pro/creator_pro.h | 29 +++++ .../sergiopoverony/creator_pro/info.json | 22 ++++ .../creator_pro/keymaps/default/keymap.c | 121 ++++++++++++++++++ .../creator_pro/keymaps/default/readme.md | 5 + .../creator_pro/keymaps/via/keymap.c | 121 ++++++++++++++++++ .../creator_pro/keymaps/via/rules.mk | 1 + .../sergiopoverony/creator_pro/readme.md | 28 ++++ keyboards/sergiopoverony/creator_pro/rules.mk | 36 ++++++ 10 files changed, 454 insertions(+) create mode 100644 keyboards/sergiopoverony/creator_pro/config.h create mode 100644 keyboards/sergiopoverony/creator_pro/creator_pro.c create mode 100644 keyboards/sergiopoverony/creator_pro/creator_pro.h create mode 100644 keyboards/sergiopoverony/creator_pro/info.json create mode 100644 keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c create mode 100644 keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md create mode 100644 keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c create mode 100644 keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk create mode 100644 keyboards/sergiopoverony/creator_pro/readme.md create mode 100644 keyboards/sergiopoverony/creator_pro/rules.mk diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h new file mode 100644 index 000000000000..515a2afe6550 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -0,0 +1,55 @@ +/* Copyright 2020-2021 SergioPoverony + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#include "config_common.h" + +/* SergioPoverony official vid pid */ +#define VENDOR_ID 0x20A0 +#define PRODUCT_ID 0x42dc +#define DEVICE_VER 0x0001 +#define MANUFACTURER SergioPoverony +#define PRODUCT Creator Pro + + +/* Optimise size swith off unused functions*/ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +#define NO_ACTION_TAPPING +#define NO_ACTION_ONESHOT + +/* key matrix size pins */ +#define MATRIX_ROWS 1 +#define MATRIX_COLS 9 +#define DIRECT_PINS { \ + { D1, D4, C6, D7, \ + E6, \ + B2, B3, B1, F7 } \ +} + + +/*led layout indication pins*/ +#define RED_LED D0 +#define BLUE_LED B5 +#define GREEN_LED B6 + +/* encoder pins*/ +#define ENCODERS_PAD_A { D2 } +#define ENCODERS_PAD_B { D3 } +#define ENCODER_RESOLUTION 1 + +#define UNUSED_PINS + diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.c b/keyboards/sergiopoverony/creator_pro/creator_pro.c new file mode 100644 index 000000000000..24be3edc89b1 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.c @@ -0,0 +1,36 @@ +/* Copyright 2020-2021 SergioPoverony + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "creator_pro.h" + +void matrix_init_kb(void) +{ + matrix_init_user(); +/* led pins */ + setPinOutput(RED_LED); + setPinOutput(BLUE_LED); + setPinOutput(GREEN_LED); +} +void turn_off_leds(void) +{ + writePinLow(RED_LED); + writePinLow(BLUE_LED); + writePinLow(GREEN_LED); +} +void turn_on_led(pin_t pin) +{ + writePinHigh(pin); +} diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.h b/keyboards/sergiopoverony/creator_pro/creator_pro.h new file mode 100644 index 000000000000..1b78d95ea49a --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.h @@ -0,0 +1,29 @@ +/* Copyright 2020-2021 SergioPoverony + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#include "quantum.h" + +#define LAYOUT( \ +K01, K02, K03, K04, K05, K06, K07, K08, K09 \ +) { { \ +K01, K02, K03, K04, K05, K06, K07, K08, K09 \ +} } + +/*led work*/ +void turn_off_leds(void); +void turn_on_led(pin_t pin); + diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json new file mode 100644 index 000000000000..656ef581d1fb --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -0,0 +1,22 @@ +{ + "keyboard_name": "Creator Pro", + "url": "", + "maintainer": "SergioPoverony", + "width": 3, + "height": 3, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2} + ] + } + } +} diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c new file mode 100644 index 000000000000..a47908c2e848 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c @@ -0,0 +1,121 @@ +/* Copyright 2020-2021 SergioPoverony + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #include QMK_KEYBOARD_H + +/* define layers */ +#define _HOME 0 +#define _RED 1 +#define _BLUE 2 +#define _GREEN 3 + +/* Encoder function with layers function */ +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (get_highest_layer(layer_state)) { + + case _HOME: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + + case _RED: + if (clockwise) { + tap_code(KC_MS_WH_UP); + } else { + tap_code(KC_MS_WH_DOWN); + } + break; + + case _BLUE: + if (clockwise) { + tap_code(KC_PGUP); + } else { + tap_code(KC_PGDN); + } + break; + + case _GREEN: + default: + if (clockwise) { + tap_code16(KC_LEFT); + } else { + tap_code16(KC_RIGHT); + } + break; + } + } + return true; +} + + +/* Layout */ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_HOME] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, + TO(_RED), + KC_5, KC_6, KC_7, KC_8 + ), + + [_RED] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, + TO(_BLUE), + KC_A, KC_S, KC_D, KC_F + ), + + [_BLUE] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, + TO(_GREEN), + KC_5, KC_6, KC_7, KC_8 + ), + + [_GREEN] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, + TO(_HOME), + KC_5, KC_6, KC_7, KC_8 + ), +}; + + +/* Select led layout */ +layer_state_t layer_state_set_user(layer_state_t state) +{ + turn_off_leds(); + + switch (get_highest_layer(state)) + { + case _HOME: + turn_on_led(RED_LED); + turn_on_led(BLUE_LED); + break; + + case _RED: + turn_on_led(RED_LED); + break; + + case _BLUE: + turn_on_led(BLUE_LED); + break; + + case _GREEN: + turn_on_led(GREEN_LED); + break; + } + return state; +}; diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md b/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md new file mode 100644 index 000000000000..f899eb3c1348 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md @@ -0,0 +1,5 @@ +![Creator Pro Layout](https://i.imgur.com/0PmpLcM.png) + +# Default Creator Pro Layout + +This is the default layout that comes flashed on every Creator Pro. The right most key (Encoder) is the rotary and the key is binded to layer switching. \ No newline at end of file diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c new file mode 100644 index 000000000000..a47908c2e848 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c @@ -0,0 +1,121 @@ +/* Copyright 2020-2021 SergioPoverony + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #include QMK_KEYBOARD_H + +/* define layers */ +#define _HOME 0 +#define _RED 1 +#define _BLUE 2 +#define _GREEN 3 + +/* Encoder function with layers function */ +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (get_highest_layer(layer_state)) { + + case _HOME: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + + case _RED: + if (clockwise) { + tap_code(KC_MS_WH_UP); + } else { + tap_code(KC_MS_WH_DOWN); + } + break; + + case _BLUE: + if (clockwise) { + tap_code(KC_PGUP); + } else { + tap_code(KC_PGDN); + } + break; + + case _GREEN: + default: + if (clockwise) { + tap_code16(KC_LEFT); + } else { + tap_code16(KC_RIGHT); + } + break; + } + } + return true; +} + + +/* Layout */ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_HOME] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, + TO(_RED), + KC_5, KC_6, KC_7, KC_8 + ), + + [_RED] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, + TO(_BLUE), + KC_A, KC_S, KC_D, KC_F + ), + + [_BLUE] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, + TO(_GREEN), + KC_5, KC_6, KC_7, KC_8 + ), + + [_GREEN] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, + TO(_HOME), + KC_5, KC_6, KC_7, KC_8 + ), +}; + + +/* Select led layout */ +layer_state_t layer_state_set_user(layer_state_t state) +{ + turn_off_leds(); + + switch (get_highest_layer(state)) + { + case _HOME: + turn_on_led(RED_LED); + turn_on_led(BLUE_LED); + break; + + case _RED: + turn_on_led(RED_LED); + break; + + case _BLUE: + turn_on_led(BLUE_LED); + break; + + case _GREEN: + turn_on_led(GREEN_LED); + break; + } + return state; +}; diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk b/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md new file mode 100644 index 000000000000..ec9c4e5809d6 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -0,0 +1,28 @@ +# Creator Pro + +![Creator Pro Layout](https://i.imgur.com/0PmpLcM.png) + +This Keypad has 1 rows x 9 columns of keys. It has the top/default layer that +has a few 1-8 keys as well as one dedicated encoder key for change layer. The + second layer has QWERASDF keys. Encoder have 4 function on any layer is + Volume Control, Mouse Wheel, PageUp/PageDn, Left/Righ buttons. +The keypad also includes three RGB LEDs that show active layer. + +Keyboard Maintainer: [SergioPoverony](https://github.com/sergiopoverony) + +Hardware: + * Key switch holes cut fabrication in blank PCB + * Uses Gateron Brown switches with gray keycaps XDA profile + * Chassis is PCB with supports + * PCB fabrication + * Uses a Pro Micro wint MicroUSB connector + * Includes a reset switch accessible by a hole on the bottom + + +Make example for this keyboard (after setting up your build environment): + + make sergiopoverony/creator_pro:default + or + make sergiopoverony/creator_pro:via + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk new file mode 100644 index 000000000000..ae35c1833bea --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/rules.mk @@ -0,0 +1,36 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +EXTRAFLAGS += -flto + +#BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +#BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +TERMINAL_ENABLE = no +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +UNICODE_ENABLE = no +ENCODER_ENABLE = yes +HD44780_ENABLE = no +FAUXCLICKY_ENABLE = no +MIDI_ENABLE = no From 912173939f44b33fcf06360326a3905b98c5d004 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Sun, 13 Jun 2021 11:13:13 +0500 Subject: [PATCH 02/24] Update info.json --- keyboards/sergiopoverony/creator_pro/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json index 656ef581d1fb..1e6bceec5b18 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "Creator Pro", - "url": "", + "url": "https://github.com/sergiopoverony", "maintainer": "SergioPoverony", "width": 3, "height": 3, @@ -10,12 +10,12 @@ {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4.5, "y":0.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2} + {"x":3, "y":1} ] } } From 1378cd2268ed54a71a5eb9aadfa2dae7a05b8853 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Sun, 13 Jun 2021 11:14:11 +0500 Subject: [PATCH 03/24] Update rules.mk --- keyboards/sergiopoverony/creator_pro/rules.mk | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk index ae35c1833bea..d48fcf4b7de7 100644 --- a/keyboards/sergiopoverony/creator_pro/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/rules.mk @@ -11,26 +11,8 @@ MCU = atmega32u4 # ATmega328P USBasp BOOTLOADER = caterina -EXTRAFLAGS += -flto - -#BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -#BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -TERMINAL_ENABLE = no -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = no -ENCODER_ENABLE = yes -HD44780_ENABLE = no -FAUXCLICKY_ENABLE = no -MIDI_ENABLE = no +MOUSEKEY_ENABLE = yes +EXTRAKEY_ENABLE = yes +CONSOLE_ENABLE = yes +COMMAND_ENABLE = yes +ENCODER_ENABLE = yes From 6e26dc6f43ce76aa1c7b89f5ebcffc409cc3f7c6 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Sun, 13 Jun 2021 11:44:39 +0500 Subject: [PATCH 04/24] Update creator_pro.h --- keyboards/sergiopoverony/creator_pro/creator_pro.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.h b/keyboards/sergiopoverony/creator_pro/creator_pro.h index 1b78d95ea49a..566e94a77ad5 100644 --- a/keyboards/sergiopoverony/creator_pro/creator_pro.h +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.h @@ -18,9 +18,13 @@ #include "quantum.h" #define LAYOUT( \ -K01, K02, K03, K04, K05, K06, K07, K08, K09 \ +K01, K02, K03, K04, \ + K05, \ +K06, K07, K08, K09 \ ) { { \ -K01, K02, K03, K04, K05, K06, K07, K08, K09 \ +K01, K02, K03, K04, \ + K05, \ +K06, K07, K08, K09 \ } } /*led work*/ From ef6a4d89ce17298191f06bc4b7065da81ad9baf0 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Sun, 13 Jun 2021 11:54:13 +0500 Subject: [PATCH 05/24] Update keymap.c --- keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c index a47908c2e848..60eab1f26e0d 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c @@ -54,9 +54,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) { case _GREEN: default: if (clockwise) { - tap_code16(KC_LEFT); + tap_code16(KC_LEFT); } else { - tap_code16(KC_RIGHT); + tap_code16(KC_RIGHT); } break; } From 731e3a8c3afe03309d719ee036662f14308ff882 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Tue, 15 Jun 2021 10:35:18 +0500 Subject: [PATCH 06/24] via layout via layout --- .../creator_pro/keymaps/via/creator_pro.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json new file mode 100644 index 000000000000..a835ed84d71d --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json @@ -0,0 +1,34 @@ +{ + "name": "Creator Pro", + "vendorId": "0x20A0", + "productId": "0x42dc", + "lighting": "none", + "matrix": + { + "rows": 1, + "cols": 9 + }, + "layouts": { + "keymap": [ + + [ + + "0,0", "0,1", "0,2", "0,3" + ], + [ + { + "y": -0.5, + "x": 4.5 + + }, + "0,4" + ], + [ + { + "y": -0.5 + }, + "0,5", "0,6", "0,7", "0,8" + ] + ] + } +} \ No newline at end of file From 5190213ecf133153d6531bbfe7ea551f51c03ce1 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Tue, 15 Jun 2021 10:37:06 +0500 Subject: [PATCH 07/24] Update creator_pro.json --- .../sergiopoverony/creator_pro/keymaps/via/creator_pro.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json index a835ed84d71d..130b9fbea6b7 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json @@ -31,4 +31,4 @@ ] ] } -} \ No newline at end of file +} From 54c4612b160130561b585fff8fe8ab51cbcb2f3f Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Tue, 15 Jun 2021 12:04:49 +0500 Subject: [PATCH 08/24] vid/pid --- keyboards/sergiopoverony/creator_pro/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h index 515a2afe6550..5e180eead4f6 100644 --- a/keyboards/sergiopoverony/creator_pro/config.h +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -18,8 +18,8 @@ #include "config_common.h" /* SergioPoverony official vid pid */ -#define VENDOR_ID 0x20A0 -#define PRODUCT_ID 0x42dc +#define VENDOR_ID 0x8B1E +#define PRODUCT_ID 0x0C00 #define DEVICE_VER 0x0001 #define MANUFACTURER SergioPoverony #define PRODUCT Creator Pro From 86358a0dd0f46861125a9be10d541cc81fd88751 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Tue, 15 Jun 2021 12:05:22 +0500 Subject: [PATCH 09/24] vid-pid --- .../sergiopoverony/creator_pro/keymaps/via/creator_pro.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json index 130b9fbea6b7..3b8902ff901b 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json @@ -1,7 +1,7 @@ { "name": "Creator Pro", - "vendorId": "0x20A0", - "productId": "0x42dc", + "vendorId": "0x8B1E", + "productId": "0x0C00", "lighting": "none", "matrix": { From 5413fbdd85b0cfd0c84907f1003722177f6b4e90 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Tue, 15 Jun 2021 15:06:36 +0500 Subject: [PATCH 10/24] Update config.h --- keyboards/sergiopoverony/creator_pro/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h index 5e180eead4f6..df88e5470517 100644 --- a/keyboards/sergiopoverony/creator_pro/config.h +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -17,7 +17,7 @@ #pragma once #include "config_common.h" -/* SergioPoverony official vid pid */ +/* vid pid */ #define VENDOR_ID 0x8B1E #define PRODUCT_ID 0x0C00 #define DEVICE_VER 0x0001 From 66c72cc5c99cf790877f23051734db25f634911e Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 10:37:59 +0500 Subject: [PATCH 11/24] Update readme.md added flash hw instruction --- keyboards/sergiopoverony/creator_pro/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index ec9c4e5809d6..d304f809d8cf 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -17,6 +17,7 @@ Hardware: * PCB fabrication * Uses a Pro Micro wint MicroUSB connector * Includes a reset switch accessible by a hole on the bottom + * For flash fw need press hardware reset button in bottom case hole Make example for this keyboard (after setting up your build environment): From 5e4e581363b6df1ac6a03619337a676e9d16a644 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 10:39:21 +0500 Subject: [PATCH 12/24] Update config.h std def --- keyboards/sergiopoverony/creator_pro/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h index df88e5470517..3bf7efc77dc3 100644 --- a/keyboards/sergiopoverony/creator_pro/config.h +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -24,12 +24,6 @@ #define MANUFACTURER SergioPoverony #define PRODUCT Creator Pro - -/* Optimise size swith off unused functions*/ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION -#define NO_ACTION_TAPPING -#define NO_ACTION_ONESHOT /* key matrix size pins */ #define MATRIX_ROWS 1 From 85750242848dcfd5ea6e94c46efbe265f0e51917 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 10:39:46 +0500 Subject: [PATCH 13/24] Delete creator_pro.json only for via --- .../creator_pro/keymaps/via/creator_pro.json | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json b/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json deleted file mode 100644 index 3b8902ff901b..000000000000 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/creator_pro.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "Creator Pro", - "vendorId": "0x8B1E", - "productId": "0x0C00", - "lighting": "none", - "matrix": - { - "rows": 1, - "cols": 9 - }, - "layouts": { - "keymap": [ - - [ - - "0,0", "0,1", "0,2", "0,3" - ], - [ - { - "y": -0.5, - "x": 4.5 - - }, - "0,4" - ], - [ - { - "y": -0.5 - }, - "0,5", "0,6", "0,7", "0,8" - ] - ] - } -} From 7db08ba5ea3db743d03f42b9cb8bedb7bd79bca4 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 10:42:19 +0500 Subject: [PATCH 14/24] Update readme.md --- keyboards/sergiopoverony/creator_pro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index d304f809d8cf..0fad9cd1b6c9 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -17,7 +17,7 @@ Hardware: * PCB fabrication * Uses a Pro Micro wint MicroUSB connector * Includes a reset switch accessible by a hole on the bottom - * For flash fw need press hardware reset button in bottom case hole + * For enter the bootloader to flash new firmware need press hw reset button hole on the bottom Make example for this keyboard (after setting up your build environment): From a5aee0a08711f6b6b45f7b1041fc4356fb48dc67 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 10:42:45 +0500 Subject: [PATCH 15/24] Update rules.mk fix --- keyboards/sergiopoverony/creator_pro/rules.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk index d48fcf4b7de7..3af29cafbe67 100644 --- a/keyboards/sergiopoverony/creator_pro/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/rules.mk @@ -1,14 +1,6 @@ # MCU name MCU = atmega32u4 -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = caterina MOUSEKEY_ENABLE = yes From d391b54158e574106ccf86df8ebdd604c8aed7d2 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 22:34:38 +0500 Subject: [PATCH 16/24] Update keymap.c enum layers --- .../creator_pro/keymaps/default/keymap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c index a47908c2e848..d29621929b8e 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c +++ b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c @@ -16,11 +16,13 @@ #include QMK_KEYBOARD_H -/* define layers */ -#define _HOME 0 -#define _RED 1 -#define _BLUE 2 -#define _GREEN 3 +/* enum layers num */ +enum layer_number { + _HOME = 0, + _RED, + _BLUE, + _GREEN +}; /* Encoder function with layers function */ bool encoder_update_user(uint8_t index, bool clockwise) { From 68e9fb967b92826a46d128af25421a4cf413d10e Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 22:35:32 +0500 Subject: [PATCH 17/24] Update keymap.c enum layers --- .../sergiopoverony/creator_pro/keymaps/via/keymap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c index 60eab1f26e0d..756677246158 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c @@ -16,11 +16,13 @@ #include QMK_KEYBOARD_H -/* define layers */ -#define _HOME 0 -#define _RED 1 -#define _BLUE 2 -#define _GREEN 3 +/* enum layers num */ +enum layer_number { + _HOME = 0, + _RED, + _BLUE, + _GREEN +}; /* Encoder function with layers function */ bool encoder_update_user(uint8_t index, bool clockwise) { From 6c57c3e96da37b7405745b56bd62f714d41097a1 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 22:37:21 +0500 Subject: [PATCH 18/24] Update readme.md --- keyboards/sergiopoverony/creator_pro/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index 0fad9cd1b6c9..813dd01b8b52 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -11,13 +11,14 @@ The keypad also includes three RGB LEDs that show active layer. Keyboard Maintainer: [SergioPoverony](https://github.com/sergiopoverony) Hardware: + * For enter the bootloader to flash new firmware need press hw reset button hole on the bottom * Key switch holes cut fabrication in blank PCB * Uses Gateron Brown switches with gray keycaps XDA profile * Chassis is PCB with supports * PCB fabrication * Uses a Pro Micro wint MicroUSB connector * Includes a reset switch accessible by a hole on the bottom - * For enter the bootloader to flash new firmware need press hw reset button hole on the bottom + Make example for this keyboard (after setting up your build environment): From e85c228fc6346ad73cdf67cf2e019123b7270a62 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 22:37:59 +0500 Subject: [PATCH 19/24] Update readme.md --- keyboards/sergiopoverony/creator_pro/readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index 813dd01b8b52..92e3d8ba25fb 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -7,9 +7,7 @@ has a few 1-8 keys as well as one dedicated encoder key for change layer. The second layer has QWERASDF keys. Encoder have 4 function on any layer is Volume Control, Mouse Wheel, PageUp/PageDn, Left/Righ buttons. The keypad also includes three RGB LEDs that show active layer. - Keyboard Maintainer: [SergioPoverony](https://github.com/sergiopoverony) - Hardware: * For enter the bootloader to flash new firmware need press hw reset button hole on the bottom * Key switch holes cut fabrication in blank PCB @@ -19,8 +17,6 @@ Hardware: * Uses a Pro Micro wint MicroUSB connector * Includes a reset switch accessible by a hole on the bottom - - Make example for this keyboard (after setting up your build environment): make sergiopoverony/creator_pro:default From 9263920f62f579dedb2d59dbaea6948346a1327d Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 17 Jun 2021 22:38:39 +0500 Subject: [PATCH 20/24] Update readme.md idk. writed --- keyboards/sergiopoverony/creator_pro/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index 92e3d8ba25fb..6a8873d066a3 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -7,7 +7,10 @@ has a few 1-8 keys as well as one dedicated encoder key for change layer. The second layer has QWERASDF keys. Encoder have 4 function on any layer is Volume Control, Mouse Wheel, PageUp/PageDn, Left/Righ buttons. The keypad also includes three RGB LEDs that show active layer. +For enter the bootloader to flash new firmware need press hw reset button hole on the bottom + Keyboard Maintainer: [SergioPoverony](https://github.com/sergiopoverony) + Hardware: * For enter the bootloader to flash new firmware need press hw reset button hole on the bottom * Key switch holes cut fabrication in blank PCB From e1ff2c7dabe850ad04c5e9389a4f5626bec50cf2 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Wed, 30 Jun 2021 13:29:59 +0500 Subject: [PATCH 21/24] Update readme.md Add real photo --- keyboards/sergiopoverony/creator_pro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index 6a8873d066a3..2a7c0d43bd85 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -1,6 +1,6 @@ # Creator Pro -![Creator Pro Layout](https://i.imgur.com/0PmpLcM.png) +![Creator Pro Layout](https://i.imgur.com/G3Yf20D.jpg) This Keypad has 1 rows x 9 columns of keys. It has the top/default layer that has a few 1-8 keys as well as one dedicated encoder key for change layer. The From e77ffada241a7adac83817d6d337910ec995b050 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 1 Jul 2021 09:21:39 +0500 Subject: [PATCH 22/24] Update keyboards/sergiopoverony/creator_pro/readme.md Co-authored-by: Ryan --- keyboards/sergiopoverony/creator_pro/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/readme.md b/keyboards/sergiopoverony/creator_pro/readme.md index 2a7c0d43bd85..601c069d9132 100644 --- a/keyboards/sergiopoverony/creator_pro/readme.md +++ b/keyboards/sergiopoverony/creator_pro/readme.md @@ -23,7 +23,5 @@ Hardware: Make example for this keyboard (after setting up your build environment): make sergiopoverony/creator_pro:default - or - make sergiopoverony/creator_pro:via See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 72b7dcbc3626e4edd90475cb4e6410820e0de299 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 1 Jul 2021 09:21:46 +0500 Subject: [PATCH 23/24] Update keyboards/sergiopoverony/creator_pro/rules.mk Co-authored-by: Ryan --- keyboards/sergiopoverony/creator_pro/rules.mk | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk index 3af29cafbe67..aee3a1398e13 100644 --- a/keyboards/sergiopoverony/creator_pro/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/rules.mk @@ -1,10 +1,23 @@ # MCU name MCU = atmega32u4 +# Bootloader selection BOOTLOADER = caterina -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes -COMMAND_ENABLE = yes -ENCODER_ENABLE = yes +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes From 83b123fec9d93acb98f168f65ff6518485d156c2 Mon Sep 17 00:00:00 2001 From: SergioPoverony Date: Thu, 1 Jul 2021 11:55:04 +0500 Subject: [PATCH 24/24] Update keyboards/sergiopoverony/creator_pro/creator_pro.c Co-authored-by: Drashna Jaelre --- keyboards/sergiopoverony/creator_pro/creator_pro.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.c b/keyboards/sergiopoverony/creator_pro/creator_pro.c index 24be3edc89b1..55c0497df24c 100644 --- a/keyboards/sergiopoverony/creator_pro/creator_pro.c +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.c @@ -16,21 +16,18 @@ #include "creator_pro.h" -void matrix_init_kb(void) -{ +void matrix_init_kb(void) { matrix_init_user(); /* led pins */ setPinOutput(RED_LED); setPinOutput(BLUE_LED); setPinOutput(GREEN_LED); } -void turn_off_leds(void) -{ +void turn_off_leds(void) { writePinLow(RED_LED); writePinLow(BLUE_LED); writePinLow(GREEN_LED); } -void turn_on_led(pin_t pin) -{ +void turn_on_led(pin_t pin) { writePinHigh(pin); }