From 852e3a98c5b4ba568dd38969c43e5521aba28a7a Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Fri, 4 Sep 2020 15:16:13 +0100 Subject: [PATCH 01/16] Initial test version of Scarlet keyboard --- keyboards/ghostseven/scarlet/config.h | 219 ++++++++++++++++++ .../scarlet/keymaps/default/keymap.c | 21 ++ keyboards/ghostseven/scarlet/readme.md | 3 + keyboards/ghostseven/scarlet/rules.mk | 33 +++ keyboards/ghostseven/scarlet/scarlet.c | 16 ++ keyboards/ghostseven/scarlet/scarlet.h | 25 ++ 6 files changed, 317 insertions(+) create mode 100644 keyboards/ghostseven/scarlet/config.h create mode 100644 keyboards/ghostseven/scarlet/keymaps/default/keymap.c create mode 100644 keyboards/ghostseven/scarlet/readme.md create mode 100644 keyboards/ghostseven/scarlet/rules.mk create mode 100644 keyboards/ghostseven/scarlet/scarlet.c create mode 100644 keyboards/ghostseven/scarlet/scarlet.h diff --git a/keyboards/ghostseven/scarlet/config.h b/keyboards/ghostseven/scarlet/config.h new file mode 100644 index 000000000000..609bd39a4421 --- /dev/null +++ b/keyboards/ghostseven/scarlet/config.h @@ -0,0 +1,219 @@ +/*Copyright 2020 GhostSeven + +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" + +#define VENDOR_ID 0x6B62 +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER GhostSeven +#define PRODUCT SCARLET +#define DESCRIPTION Test of Scarlet POC + +/* key matrix size */ +#define MATRIX_ROWS 1 +#define MATRIX_COLS 2 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ + +#define MATRIX_ROW_PINS { B0 } +#define MATRIX_COL_PINS { B1, B2 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define USB_MAX_POWER_CONSUMPTION 100 + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +// #define RGB_DI_PIN E2 +// #ifdef RGB_DI_PIN +// #define RGBLED_NUM 16 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +// /*== all animations enable ==*/ +// #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #define RGBLIGHT_EFFECT_BREATHING +// #define RGBLIGHT_EFFECT_RAINBOW_MOOD +// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL +// #define RGBLIGHT_EFFECT_SNAKE +// #define RGBLIGHT_EFFECT_KNIGHT +// #define RGBLIGHT_EFFECT_CHRISTMAS +// #define RGBLIGHT_EFFECT_STATIC_GRADIENT +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING +// #endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +/* defined by default; to change, uncomment and set to the combination you want */ +// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP H +//#define MAGIC_KEY_HELP_ALT SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER0_ALT GRAVE +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER B +//#define MAGIC_KEY_BOOTLOADER_ALT ESC +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_EEPROM_CLEAR BSPACE +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 + diff --git a/keyboards/ghostseven/scarlet/keymaps/default/keymap.c b/keyboards/ghostseven/scarlet/keymaps/default/keymap.c new file mode 100644 index 000000000000..47fdf19db704 --- /dev/null +++ b/keyboards/ghostseven/scarlet/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +/* Copyright 2019 COSEYFANNITUTTI + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_poc( + KC_S, KC_D), +}; diff --git a/keyboards/ghostseven/scarlet/readme.md b/keyboards/ghostseven/scarlet/readme.md new file mode 100644 index 000000000000..c750818e2d85 --- /dev/null +++ b/keyboards/ghostseven/scarlet/readme.md @@ -0,0 +1,3 @@ +# SCARLET + +A proof of concept test for a keyboard called Scarlet. diff --git a/keyboards/ghostseven/scarlet/rules.mk b/keyboards/ghostseven/scarlet/rules.mk new file mode 100644 index 000000000000..3df1a700beb9 --- /dev/null +++ b/keyboards/ghostseven/scarlet/rules.mk @@ -0,0 +1,33 @@ +# MCU name + +#Both ATmega328P and ATmega32A have been tested and work with USBasp, please ensure you configure the right one. +#MCU = atmega328p +MCU = atmega32a + +# Processor frequency +F_CPU = 16000000 + +# Bootloader selection +BOOTLOADER = USBasp + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # 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 on B7 by default +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches + +LAYOUTS = poc diff --git a/keyboards/ghostseven/scarlet/scarlet.c b/keyboards/ghostseven/scarlet/scarlet.c new file mode 100644 index 000000000000..88dcaf07a0de --- /dev/null +++ b/keyboards/ghostseven/scarlet/scarlet.c @@ -0,0 +1,16 @@ +/*Copyright 2020 GhostSeven + * + * 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 "scarlet.h" diff --git a/keyboards/ghostseven/scarlet/scarlet.h b/keyboards/ghostseven/scarlet/scarlet.h new file mode 100644 index 000000000000..1b94820a981a --- /dev/null +++ b/keyboards/ghostseven/scarlet/scarlet.h @@ -0,0 +1,25 @@ +/*Copyright 2020 GhostSeven + * + * 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_poc( \ + K00, K01 \ +) { \ +{ K00, K01 } \ +} From 31f4edc6a303373c52379ded9819e04b3c0b2100 Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Mon, 12 Oct 2020 15:21:13 +0100 Subject: [PATCH 02/16] First commit of DElec Scarlet --- .../scarlet/config.h | 16 ++++++++-------- .../scarlet/keymaps/default/keymap.c | 10 +++++++--- .../scarlet/readme.md | 0 .../scarlet/rules.mk | 2 +- .../scarlet/scarlet.c | 0 .../scarlet/scarlet.h | 14 +++++++++++--- 6 files changed, 27 insertions(+), 15 deletions(-) rename keyboards/{ghostseven => draysonelectronics}/scarlet/config.h (95%) rename keyboards/{ghostseven => draysonelectronics}/scarlet/keymaps/default/keymap.c (75%) rename keyboards/{ghostseven => draysonelectronics}/scarlet/readme.md (100%) rename keyboards/{ghostseven => draysonelectronics}/scarlet/rules.mk (98%) rename keyboards/{ghostseven => draysonelectronics}/scarlet/scarlet.c (100%) rename keyboards/{ghostseven => draysonelectronics}/scarlet/scarlet.h (72%) diff --git a/keyboards/ghostseven/scarlet/config.h b/keyboards/draysonelectronics/scarlet/config.h similarity index 95% rename from keyboards/ghostseven/scarlet/config.h rename to keyboards/draysonelectronics/scarlet/config.h index 609bd39a4421..fa12b12b7cb2 100644 --- a/keyboards/ghostseven/scarlet/config.h +++ b/keyboards/draysonelectronics/scarlet/config.h @@ -18,16 +18,16 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x6B62 -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 +#define VENDOR_ID 0x4445 //DE for Drayson Electronics +#define PRODUCT_ID 0x5343 //SC for Scarlet +#define DEVICE_VER 0x0001 //Version 1 #define MANUFACTURER GhostSeven #define PRODUCT SCARLET -#define DESCRIPTION Test of Scarlet POC +#define DESCRIPTION 17 key numpad. /* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 2 +#define MATRIX_ROWS 5 +#define MATRIX_COLS 4 /* * Keyboard Matrix Assignments @@ -40,8 +40,8 @@ along with this program. If not, see . * */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B1, B2 } +#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } +#define MATRIX_COL_PINS { A5, A6, A7, C7 } #define UNUSED_PINS /* COL2ROW, ROW2COL*/ diff --git a/keyboards/ghostseven/scarlet/keymaps/default/keymap.c b/keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c similarity index 75% rename from keyboards/ghostseven/scarlet/keymaps/default/keymap.c rename to keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c index 47fdf19db704..95a347bc4740 100644 --- a/keyboards/ghostseven/scarlet/keymaps/default/keymap.c +++ b/keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 COSEYFANNITUTTI +/*Copyright 2020 GhostSeven * * 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 @@ -16,6 +16,10 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_poc( - KC_S, KC_D), + [0] = LAYOUT_numpad( + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT ) }; diff --git a/keyboards/ghostseven/scarlet/readme.md b/keyboards/draysonelectronics/scarlet/readme.md similarity index 100% rename from keyboards/ghostseven/scarlet/readme.md rename to keyboards/draysonelectronics/scarlet/readme.md diff --git a/keyboards/ghostseven/scarlet/rules.mk b/keyboards/draysonelectronics/scarlet/rules.mk similarity index 98% rename from keyboards/ghostseven/scarlet/rules.mk rename to keyboards/draysonelectronics/scarlet/rules.mk index 3df1a700beb9..de57cd6c569f 100644 --- a/keyboards/ghostseven/scarlet/rules.mk +++ b/keyboards/draysonelectronics/scarlet/rules.mk @@ -30,4 +30,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -LAYOUTS = poc +LAYOUTS = numpad diff --git a/keyboards/ghostseven/scarlet/scarlet.c b/keyboards/draysonelectronics/scarlet/scarlet.c similarity index 100% rename from keyboards/ghostseven/scarlet/scarlet.c rename to keyboards/draysonelectronics/scarlet/scarlet.c diff --git a/keyboards/ghostseven/scarlet/scarlet.h b/keyboards/draysonelectronics/scarlet/scarlet.h similarity index 72% rename from keyboards/ghostseven/scarlet/scarlet.h rename to keyboards/draysonelectronics/scarlet/scarlet.h index 1b94820a981a..4aa39c4a907e 100644 --- a/keyboards/ghostseven/scarlet/scarlet.h +++ b/keyboards/draysonelectronics/scarlet/scarlet.h @@ -18,8 +18,16 @@ #include "quantum.h" -#define LAYOUT_poc( \ - K00, K01 \ +#define LAYOUT_numpad( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, \ + K30, K31, K32, K33, \ + K40, K42 \ ) { \ -{ K00, K01 } \ +{ K00, K01, K02, K03, }, \ +{ K10, K11, K12, K13, }, \ +{ K20, K21, K22, KC_NO, }, \ +{ K30, K31, K32, K33, }, \ +{ K40, KC_NO, K42, KC_NO, }, \ } From 0b3c853cfa0da0f658e9c807f4306770a4c9e353 Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Thu, 15 Oct 2020 12:27:25 +0100 Subject: [PATCH 03/16] Change to new Draytronics branding --- .../scarlet/keymaps/default/keymap.c | 25 ------------- .../draysonelectronics/scarlet/scarlet.c | 16 --------- .../draysonelectronics/scarlet/scarlet.h | 33 ----------------- .../scarlet/config.h | 8 +++-- .../scarlet/keymaps/default/keymap.c | 28 +++++++++++++++ .../scarlet/readme.md | 0 .../scarlet/rules.mk | 3 -- keyboards/draytronics/scarlet/scarlet.c | 19 ++++++++++ keyboards/draytronics/scarlet/scarlet.h | 35 +++++++++++++++++++ 9 files changed, 87 insertions(+), 80 deletions(-) delete mode 100644 keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c delete mode 100644 keyboards/draysonelectronics/scarlet/scarlet.c delete mode 100644 keyboards/draysonelectronics/scarlet/scarlet.h rename keyboards/{draysonelectronics => draytronics}/scarlet/config.h (97%) create mode 100644 keyboards/draytronics/scarlet/keymaps/default/keymap.c rename keyboards/{draysonelectronics => draytronics}/scarlet/readme.md (100%) rename keyboards/{draysonelectronics => draytronics}/scarlet/rules.mk (89%) create mode 100644 keyboards/draytronics/scarlet/scarlet.c create mode 100644 keyboards/draytronics/scarlet/scarlet.h diff --git a/keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c b/keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c deleted file mode 100644 index 95a347bc4740..000000000000 --- a/keyboards/draysonelectronics/scarlet/keymaps/default/keymap.c +++ /dev/null @@ -1,25 +0,0 @@ -/*Copyright 2020 GhostSeven - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad( - KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT ) -}; diff --git a/keyboards/draysonelectronics/scarlet/scarlet.c b/keyboards/draysonelectronics/scarlet/scarlet.c deleted file mode 100644 index 88dcaf07a0de..000000000000 --- a/keyboards/draysonelectronics/scarlet/scarlet.c +++ /dev/null @@ -1,16 +0,0 @@ -/*Copyright 2020 GhostSeven - * - * 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 "scarlet.h" diff --git a/keyboards/draysonelectronics/scarlet/scarlet.h b/keyboards/draysonelectronics/scarlet/scarlet.h deleted file mode 100644 index 4aa39c4a907e..000000000000 --- a/keyboards/draysonelectronics/scarlet/scarlet.h +++ /dev/null @@ -1,33 +0,0 @@ -/*Copyright 2020 GhostSeven - * - * 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_numpad( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K42 \ -) { \ -{ K00, K01, K02, K03, }, \ -{ K10, K11, K12, K13, }, \ -{ K20, K21, K22, KC_NO, }, \ -{ K30, K31, K32, K33, }, \ -{ K40, KC_NO, K42, KC_NO, }, \ -} diff --git a/keyboards/draysonelectronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h similarity index 97% rename from keyboards/draysonelectronics/scarlet/config.h rename to keyboards/draytronics/scarlet/config.h index fa12b12b7cb2..d283c769b3b1 100644 --- a/keyboards/draysonelectronics/scarlet/config.h +++ b/keyboards/draytronics/scarlet/config.h @@ -1,4 +1,6 @@ -/*Copyright 2020 GhostSeven +/*Copyright 2020 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk 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 @@ -18,10 +20,10 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x4445 //DE for Drayson Electronics +#define VENDOR_ID 0x4454 //DT for DrayTronics #define PRODUCT_ID 0x5343 //SC for Scarlet #define DEVICE_VER 0x0001 //Version 1 -#define MANUFACTURER GhostSeven +#define MANUFACTURER Draytronics #define PRODUCT SCARLET #define DESCRIPTION 17 key numpad. diff --git a/keyboards/draytronics/scarlet/keymaps/default/keymap.c b/keyboards/draytronics/scarlet/keymaps/default/keymap.c new file mode 100644 index 000000000000..71cf956ff5d8 --- /dev/null +++ b/keyboards/draytronics/scarlet/keymaps/default/keymap.c @@ -0,0 +1,28 @@ +/*Copyright 2020 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numpad( + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT ) +}; diff --git a/keyboards/draysonelectronics/scarlet/readme.md b/keyboards/draytronics/scarlet/readme.md similarity index 100% rename from keyboards/draysonelectronics/scarlet/readme.md rename to keyboards/draytronics/scarlet/readme.md diff --git a/keyboards/draysonelectronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk similarity index 89% rename from keyboards/draysonelectronics/scarlet/rules.mk rename to keyboards/draytronics/scarlet/rules.mk index de57cd6c569f..c39f69a7baf1 100644 --- a/keyboards/draysonelectronics/scarlet/rules.mk +++ b/keyboards/draytronics/scarlet/rules.mk @@ -1,7 +1,4 @@ # MCU name - -#Both ATmega328P and ATmega32A have been tested and work with USBasp, please ensure you configure the right one. -#MCU = atmega328p MCU = atmega32a # Processor frequency diff --git a/keyboards/draytronics/scarlet/scarlet.c b/keyboards/draytronics/scarlet/scarlet.c new file mode 100644 index 000000000000..fdcc811d52a3 --- /dev/null +++ b/keyboards/draytronics/scarlet/scarlet.c @@ -0,0 +1,19 @@ +/*Copyright 2020 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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 "scarlet.h" diff --git a/keyboards/draytronics/scarlet/scarlet.h b/keyboards/draytronics/scarlet/scarlet.h new file mode 100644 index 000000000000..0c8ee1925899 --- /dev/null +++ b/keyboards/draytronics/scarlet/scarlet.h @@ -0,0 +1,35 @@ +/*Copyright 2020 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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_numpad( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, \ + K30, K31, K32, K33, \ + K40, K42 \ +) { \ +{ K00, K01, K02, K03, }, \ +{ K10, K11, K12, K13, }, \ +{ K20, K21, K22, KC_NO, }, \ +{ K30, K31, K32, K33, }, \ +{ K40, KC_NO, K42, KC_NO, }, \ +} From b39c69bbf5a3aad6afa86902a7d907d9e461be60 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 12:53:39 +0100 Subject: [PATCH 04/16] Update to keyboard details Update to keyboard details and link to Draytronics website. --- keyboards/draytronics/scarlet/readme.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/keyboards/draytronics/scarlet/readme.md b/keyboards/draytronics/scarlet/readme.md index c750818e2d85..615c46f501d2 100644 --- a/keyboards/draytronics/scarlet/readme.md +++ b/keyboards/draytronics/scarlet/readme.md @@ -1,3 +1,15 @@ # SCARLET -A proof of concept test for a keyboard called Scarlet. +![scarlet](https://www.draytronics.co.uk/wp-content/uploads/2020/10/Scarlet-PCB-Compared-Combined.png) + +A open source 17 key numpad keyboard, designed to be easily built at home with through hole components. More info / kits / PCB designs available at [draytronics.co.uk/scarlet](draytronics.co.uk) + +Keyboard Maintainer: [Blake Drayson](https://github.com/ghostseven) +Hardware Supported: SCARLET PCB / ATMega32A +Hardware Availability: [draytronics.co.uk](draytronics.co.uk) + +Make example for this keyboard (after setting up your build environment): + + make draytronics/scarlet:default + +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 cda3b854670ab03c008cca8cac1e07ff46e21a9b Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 19:56:52 +0100 Subject: [PATCH 05/16] Update keyboards/draytronics/scarlet/scarlet.h Co-authored-by: Joel Challis --- keyboards/draytronics/scarlet/scarlet.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/draytronics/scarlet/scarlet.h b/keyboards/draytronics/scarlet/scarlet.h index 0c8ee1925899..7998757e67c2 100644 --- a/keyboards/draytronics/scarlet/scarlet.h +++ b/keyboards/draytronics/scarlet/scarlet.h @@ -20,12 +20,12 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT_numpad( \ +#define LAYOUT_numpad_5x4( \ K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K42 \ + K10, K11, K12, \ + K20, K21, K22, K13, \ + K30, K31, K32, \ + K40, K42, K33\ ) { \ { K00, K01, K02, K03, }, \ { K10, K11, K12, K13, }, \ From a7a066888476cff6632b67e06dc8b0b0932bf637 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 19:57:13 +0100 Subject: [PATCH 06/16] Update keyboards/draytronics/scarlet/rules.mk Co-authored-by: Joel Challis --- keyboards/draytronics/scarlet/rules.mk | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk index c39f69a7baf1..43f524034aa8 100644 --- a/keyboards/draytronics/scarlet/rules.mk +++ b/keyboards/draytronics/scarlet/rules.mk @@ -10,21 +10,18 @@ BOOTLOADER = USBasp # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # 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 on B7 by default +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output -LAYOUTS = numpad +LAYOUTS = numpad_5x4 From 23d0b4e808c2352c69a3c96dd21aa7fc78d9d7a1 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 19:57:29 +0100 Subject: [PATCH 07/16] Update keyboards/draytronics/scarlet/readme.md Co-authored-by: Joel Challis --- keyboards/draytronics/scarlet/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/keyboards/draytronics/scarlet/readme.md b/keyboards/draytronics/scarlet/readme.md index 615c46f501d2..4f1c5e0f56df 100644 --- a/keyboards/draytronics/scarlet/readme.md +++ b/keyboards/draytronics/scarlet/readme.md @@ -4,12 +4,16 @@ A open source 17 key numpad keyboard, designed to be easily built at home with through hole components. More info / kits / PCB designs available at [draytronics.co.uk/scarlet](draytronics.co.uk) -Keyboard Maintainer: [Blake Drayson](https://github.com/ghostseven) -Hardware Supported: SCARLET PCB / ATMega32A -Hardware Availability: [draytronics.co.uk](draytronics.co.uk) +* Keyboard Maintainer: [Blake Drayson](https://github.com/ghostseven) +* Hardware Supported: SCARLET PCB / ATMega32A +* Hardware Availability: [draytronics.co.uk](draytronics.co.uk) Make example for this keyboard (after setting up your build environment): make draytronics/scarlet:default +Flashing example for this keyboard: + + make draytronics/scarlet:default:flash + 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 10c2341d08a327a3593b2d366360ad12399d3b80 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 19:57:40 +0100 Subject: [PATCH 08/16] Update keyboards/draytronics/scarlet/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/draytronics/scarlet/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/draytronics/scarlet/keymaps/default/keymap.c b/keyboards/draytronics/scarlet/keymaps/default/keymap.c index 71cf956ff5d8..eb22def11c12 100644 --- a/keyboards/draytronics/scarlet/keymaps/default/keymap.c +++ b/keyboards/draytronics/scarlet/keymaps/default/keymap.c @@ -19,10 +19,10 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numpad( + [0] = LAYOUT_numpad_5x4( KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT ) + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT) }; From 733d38c5cda6ee4ff030b2b45521f089b247d76f Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 19:58:00 +0100 Subject: [PATCH 09/16] Update keyboards/draytronics/scarlet/config.h Co-authored-by: Joel Challis --- keyboards/draytronics/scarlet/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h index d283c769b3b1..5753e1becdca 100644 --- a/keyboards/draytronics/scarlet/config.h +++ b/keyboards/draytronics/scarlet/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 //Version 1 #define MANUFACTURER Draytronics #define PRODUCT SCARLET -#define DESCRIPTION 17 key numpad. - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 @@ -218,4 +216,3 @@ along with this program. If not, see . /* Bootmagic Lite key configuration */ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 - From d292d161a9021c6fb3430d917f573a40ba946e63 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 20:11:12 +0100 Subject: [PATCH 10/16] Update keymap.c --- keyboards/draytronics/scarlet/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/draytronics/scarlet/keymaps/default/keymap.c b/keyboards/draytronics/scarlet/keymaps/default/keymap.c index eb22def11c12..1dd27bc418ce 100644 --- a/keyboards/draytronics/scarlet/keymaps/default/keymap.c +++ b/keyboards/draytronics/scarlet/keymaps/default/keymap.c @@ -21,8 +21,8 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_numpad_5x4( KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, KC_PPLS - KC_P1, KC_P2, KC_P3, - KC_P0, KC_PDOT, KC_PENT) + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT) }; From 4e898a1db7d40e97dfe7733ae08b4d3cd6c69769 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 20:17:05 +0100 Subject: [PATCH 11/16] Update config.h --- keyboards/draytronics/scarlet/config.h | 163 ++++++------------------- 1 file changed, 37 insertions(+), 126 deletions(-) diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h index 5753e1becdca..46fe613cd408 100644 --- a/keyboards/draytronics/scarlet/config.h +++ b/keyboards/draytronics/scarlet/config.h @@ -47,57 +47,48 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define USB_MAX_POWER_CONSUMPTION 100 - -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 - -// #define RGB_DI_PIN E2 -// #ifdef RGB_DI_PIN -// #define RGBLED_NUM 16 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -// /*== all animations enable ==*/ -// #define RGBLIGHT_ANIMATIONS -// /*== or choose animations ==*/ -// #define RGBLIGHT_EFFECT_BREATHING -// #define RGBLIGHT_EFFECT_RAINBOW_MOOD -// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -// #define RGBLIGHT_EFFECT_SNAKE -// #define RGBLIGHT_EFFECT_KNIGHT -// #define RGBLIGHT_EFFECT_CHRISTMAS -// #define RGBLIGHT_EFFECT_STATIC_GRADIENT -// #define RGBLIGHT_EFFECT_RGB_TEST -// #define RGBLIGHT_EFFECT_ALTERNATING -// #endif - +//#define BACKLIGHT_PIN B7 +//#define BACKLIGHT_LEVELS 3 +//#define BACKLIGHT_BREATHING +//#define RGB_DI_PIN E2 +//#ifdef RGB_DI_PIN +//# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +//# define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +//# define RGBLIGHT_EFFECT_BREATHING +//# define RGBLIGHT_EFFECT_RAINBOW_MOOD +//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//# define RGBLIGHT_EFFECT_SNAKE +//# define RGBLIGHT_EFFECT_KNIGHT +//# define RGBLIGHT_EFFECT_CHRISTMAS +//# define RGBLIGHT_EFFECT_STATIC_GRADIENT +//# define RGBLIGHT_EFFECT_RGB_TEST +//# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +//#endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 - /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST - -/* number of backlight levels */ - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). */ -// #define GRAVE_ESC_CTRL_OVERRIDE - +//#define GRAVE_ESC_CTRL_OVERRIDE /* * Force NKRO * @@ -118,101 +109,21 @@ along with this program. If not, see . * */ //#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* key combination for magic key command */ -/* defined by default; to change, uncomment and set to the combination you want */ -// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP H -//#define MAGIC_KEY_HELP_ALT SLASH -//#define MAGIC_KEY_DEBUG D -//#define MAGIC_KEY_DEBUG_MATRIX X -//#define MAGIC_KEY_DEBUG_KBD K -//#define MAGIC_KEY_DEBUG_MOUSE M -//#define MAGIC_KEY_VERSION V -//#define MAGIC_KEY_STATUS S -//#define MAGIC_KEY_CONSOLE C -//#define MAGIC_KEY_LAYER0 0 -//#define MAGIC_KEY_LAYER0_ALT GRAVE -//#define MAGIC_KEY_LAYER1 1 -//#define MAGIC_KEY_LAYER2 2 -//#define MAGIC_KEY_LAYER3 3 -//#define MAGIC_KEY_LAYER4 4 -//#define MAGIC_KEY_LAYER5 5 -//#define MAGIC_KEY_LAYER6 6 -//#define MAGIC_KEY_LAYER7 7 -//#define MAGIC_KEY_LAYER8 8 -//#define MAGIC_KEY_LAYER9 9 -//#define MAGIC_KEY_BOOTLOADER B -//#define MAGIC_KEY_BOOTLOADER_ALT ESC -//#define MAGIC_KEY_LOCK CAPS -//#define MAGIC_KEY_EEPROM E -//#define MAGIC_KEY_EEPROM_CLEAR BSPACE -//#define MAGIC_KEY_NKRO N -//#define MAGIC_KEY_SLEEP_LED Z - /* * Feature disable options * These options are also useful to firmware size reduction. */ - /* disable debug print */ //#define NO_DEBUG - /* disable print */ //#define NO_PRINT - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -/* - * MIDI options - */ - -/* Prevent use of disabled MIDI features in the keymap */ -//#define MIDI_ENABLE_STRICT 1 - -/* enable basic MIDI features: - - MIDI notes can be sent when in Music mode is on -*/ -//#define MIDI_BASIC - -/* enable advanced MIDI features: - - MIDI notes can be added to the keymap - - Octave shift and transpose - - Virtual sustain, portamento, and modulation wheel - - etc. -*/ -//#define MIDI_ADVANCED - -/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ -//#define MIDI_TONE_KEYCODE_OCTAVES 1 - +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION /* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 From bf107c9c4bdf64cdbb0bd46ca18f743a9a881946 Mon Sep 17 00:00:00 2001 From: Blake Date: Thu, 15 Oct 2020 20:32:25 +0100 Subject: [PATCH 12/16] Update scarlet.h --- keyboards/draytronics/scarlet/scarlet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/draytronics/scarlet/scarlet.h b/keyboards/draytronics/scarlet/scarlet.h index 7998757e67c2..5fd46c09fc02 100644 --- a/keyboards/draytronics/scarlet/scarlet.h +++ b/keyboards/draytronics/scarlet/scarlet.h @@ -22,10 +22,10 @@ along with this program. If not, see . #define LAYOUT_numpad_5x4( \ K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33\ + K10, K11, K12, K13, \ + K20, K21, K22, \ + K30, K31, K32, K33,\ + K40, K42 \ ) { \ { K00, K01, K02, K03, }, \ { K10, K11, K12, K13, }, \ From 5133b7a106ac17dbc76a49a1aee2a05ae48e30fe Mon Sep 17 00:00:00 2001 From: Blake Date: Sat, 17 Oct 2020 08:51:14 +0100 Subject: [PATCH 13/16] Update keyboards/draytronics/scarlet/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/draytronics/scarlet/config.h | 30 -------------------------- 1 file changed, 30 deletions(-) diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h index 46fe613cd408..393bc0a8322e 100644 --- a/keyboards/draytronics/scarlet/config.h +++ b/keyboards/draytronics/scarlet/config.h @@ -47,36 +47,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ -//# define RGBLIGHT_ANIMATIONS -/*== or choose animations ==*/ -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS -//# define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ From e8d1a11269e9a37d06b066d91a347def476eeee5 Mon Sep 17 00:00:00 2001 From: Blake Date: Sat, 17 Oct 2020 08:52:18 +0100 Subject: [PATCH 14/16] Update keyboards/draytronics/scarlet/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/draytronics/scarlet/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h index 393bc0a8322e..f7b50dee7597 100644 --- a/keyboards/draytronics/scarlet/config.h +++ b/keyboards/draytronics/scarlet/config.h @@ -94,6 +94,3 @@ along with this program. If not, see . /* disable these deprecated features by default */ #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 From e068f4c168c3fd90b2a0c4cb3eced603dfb639bd Mon Sep 17 00:00:00 2001 From: Blake Date: Sat, 17 Oct 2020 08:55:24 +0100 Subject: [PATCH 15/16] Update keyboards/draytronics/scarlet/scarlet.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/draytronics/scarlet/scarlet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/draytronics/scarlet/scarlet.h b/keyboards/draytronics/scarlet/scarlet.h index 5fd46c09fc02..d96f198db3e2 100644 --- a/keyboards/draytronics/scarlet/scarlet.h +++ b/keyboards/draytronics/scarlet/scarlet.h @@ -22,10 +22,10 @@ along with this program. If not, see . #define LAYOUT_numpad_5x4( \ K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33,\ - K40, K42 \ + K10, K11, K12, \ + K20, K21, K22, K13, \ + K30, K31, K32, \ + K40, K42, K33 \ ) { \ { K00, K01, K02, K03, }, \ { K10, K11, K12, K13, }, \ From 91f1e0a513183481126a2689c200a66fa0f14fdd Mon Sep 17 00:00:00 2001 From: Blake Date: Sat, 17 Oct 2020 08:55:33 +0100 Subject: [PATCH 16/16] Update keyboards/draytronics/scarlet/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/draytronics/scarlet/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/draytronics/scarlet/keymaps/default/keymap.c b/keyboards/draytronics/scarlet/keymaps/default/keymap.c index 1dd27bc418ce..950ec6172994 100644 --- a/keyboards/draytronics/scarlet/keymaps/default/keymap.c +++ b/keyboards/draytronics/scarlet/keymaps/default/keymap.c @@ -21,8 +21,8 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_numpad_5x4( KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT) + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT) };