From 6b4585f639f4211f79e2e09919f9bd8267dbe0f9 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Thu, 11 Jul 2019 03:35:18 +0900 Subject: [PATCH 01/41] make silverbullet44 --- keyboards/silverbullet44/config.h | 259 ++++++++++++++++++ keyboards/silverbullet44/info.json | 0 .../silverbullet44/keymaps/default/config.h | 19 ++ .../silverbullet44/keymaps/default/keymap.c | 205 ++++++++++++++ .../silverbullet44/keymaps/default/readme.md | 1 + keyboards/silverbullet44/readme.md | 15 + keyboards/silverbullet44/rules.mk | 82 ++++++ keyboards/silverbullet44/silverbullet44.c | 51 ++++ keyboards/silverbullet44/silverbullet44.h | 43 +++ util/new_project.sh | 66 +++++ 10 files changed, 741 insertions(+) create mode 100644 keyboards/silverbullet44/config.h create mode 100644 keyboards/silverbullet44/info.json create mode 100644 keyboards/silverbullet44/keymaps/default/config.h create mode 100644 keyboards/silverbullet44/keymaps/default/keymap.c create mode 100644 keyboards/silverbullet44/keymaps/default/readme.md create mode 100644 keyboards/silverbullet44/readme.md create mode 100644 keyboards/silverbullet44/rules.mk create mode 100644 keyboards/silverbullet44/silverbullet44.c create mode 100644 keyboards/silverbullet44/silverbullet44.h create mode 100644 util/new_project.sh diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h new file mode 100644 index 000000000000..5de99a99d4f3 --- /dev/null +++ b/keyboards/silverbullet44/config.h @@ -0,0 +1,259 @@ +/* +Copyright %YEAR% %YOUR_NAME% + +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" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER %YOUR_NAME% +#define PRODUCT silverbullet44 +#define DESCRIPTION A custom keyboard + +/* key matrix size */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 6 + +/* + * 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 { D4, C6, D7, E6 } +#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6 +#define MASTER_RIGHT + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + +#define RGB_DI_PIN D3 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 25 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 130 /* 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 + +/* Audio */ +#ifdef AUDIO_ENABLE + #define B6_AUDIO + #define STARTUP_SONG SONG(STARTUP_SOUND) + #define AUDIO_CLICKY +#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 + +/* + * HD44780 LCD Display Configuration + */ +/* +#define LCD_LINES 2 //< number of visible lines of the display +#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display + +#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode + +#if LCD_IO_MODE +#define LCD_PORT PORTB //< port for the LCD lines +#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0 +#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1 +#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2 +#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3 +#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0 +#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1 +#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2 +#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3 +#define LCD_RS_PORT LCD_PORT //< port for RS line +#define LCD_RS_PIN 3 //< pin for RS line +#define LCD_RW_PORT LCD_PORT //< port for RW line +#define LCD_RW_PIN 2 //< pin for RW line +#define LCD_E_PORT LCD_PORT //< port for Enable line +#define LCD_E_PIN 1 //< pin for Enable line +#endif +*/ + +/* Bootmagic Lite key configuration */ +// #define BOOTMAGIC_LITE_ROW 0 +// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/silverbullet44/keymaps/default/config.h b/keyboards/silverbullet44/keymaps/default/config.h new file mode 100644 index 000000000000..5b00c8956f9d --- /dev/null +++ b/keyboards/silverbullet44/keymaps/default/config.h @@ -0,0 +1,19 @@ +/* Copyright %YEAR% %YOUR_NAME% + * + * 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 + +// place overrides here diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c new file mode 100644 index 000000000000..88e1d8eedaa6 --- /dev/null +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -0,0 +1,205 @@ +/* Copyright %YEAR% %YOUR_NAME% + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + +#define _QWERTY 0 +#define _CURSOL 1 +#define _CALC 2 +#define _ADJUST 3 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST, + RGBRST, + KC_00, +}; +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define CALC LT(_CALC, KC_ESC) +#define CUSL LT(_CURSOL, KC_TAB) +#define REVERSE(kc) \ +case kc: \ + if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { \ + if (record->event.pressed) { \ + unregister_code(KC_LSFT); \ + register_code(kc); \ + unregister_code(kc); \ + register_code(KC_LSFT); \ + } \ +/* } else if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { \ + if (record->event.pressed) { \ + unregister_code(KC_RSFT); \ + register_code(kc); \ + unregister_code(kc); \ + register_code(KC_RSFT); + } */ \ + } else { \ + if (record->event.pressed) { \ + register_code(KC_LSFT); \ + register_code(kc); \ + unregister_code(kc); \ + unregister_code(KC_LSFT); \ + } \ + } \ + return false; \ + break; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | + * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | + * `-----------------------------' '---------------------------' + */ + [_QWERTY] = LAYOUT( \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ + LALT_T(KC_F5), KC_BSPC, LSFT_T(KC_SPC), CALC, CUSL, LCTL_T(KC_ENT), KC_DEL, GUI_T(KC_F12) \ + ), + +/* Cursol + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | ` | CLft | F3 | CRgt | ( |-------.-------. ,---------------| ) | OSL | F8 | OSR | | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | LAlt | LGUI | / / / \ \ \ | | | + * | | |/ LOWER / / \ \ \ | | | + * `-----------------------------' '-----------------------------' + */ + [_CURSOL] = LAYOUT( \ + RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RGBRST, \ + _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, \ + _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), KC_LPRN, KC_RPRN, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, _______, \ + _______, _______, C(KC_SPC), ADJUST, _______, _______, _______, _______ \ + ), + +/* Calculater + * ,-----------------------------------------. ,-----------------------------------------. + * | ~ | | | | | | | | NmLk | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | + | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | ~ | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | /-------/ / \ \-------\ | | | + * | | |/ / / \ \ 0 \ | 00 | . | + * `-----------------------------' '------------------------------' + */ + [_CALC] = LAYOUT( \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_PPLS, _______, \ + _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_TILD, _______, \ + _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, \ + _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT \ + ), + +/* ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * |RESET | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | SPD+ | SPD+ | VAL+ | SAD+ | HUE+ | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | SPD- | MOD- | VAL- | SAD- | HUE- | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | |-------.-------. ,---------------| | | | | | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | /-------/ / \ \-------\ | | | + * | | |/ / / \ \ \ | | | + * `-----------------------------' '------------------------------' +*/ + + [_ADJUST] = LAYOUT( \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ) +}; + + +#ifdef RGBLIGHT_ENABLE +//Following line allows macro to read current RGB settings +extern rgblight_config_t rgblight_config; +#endif +int RGB_current_mode; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + case RGBRST: + #ifdef RGBLIGHT_ENABLE + if (record->event.pressed) { + eeconfig_update_rgblight_default(); + rgblight_enable(); + RGB_current_mode = rgblight_config.mode; + } + #endif + break; + REVERSE(KC_SCLN) + case KC_00: + if (record->event.pressed) { + SEND_STRING("00"); + } + return false; + break; + } + return true; +} + +void matrix_init_user(void) { + #ifdef RGBLIGHT_ENABLE + RGB_current_mode = rgblight_config.mode; + #endif +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/silverbullet44/keymaps/default/readme.md b/keyboards/silverbullet44/keymaps/default/readme.md new file mode 100644 index 000000000000..76893dc66ebc --- /dev/null +++ b/keyboards/silverbullet44/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for silverbullet44 \ No newline at end of file diff --git a/keyboards/silverbullet44/readme.md b/keyboards/silverbullet44/readme.md new file mode 100644 index 000000000000..a72fa4b6196e --- /dev/null +++ b/keyboards/silverbullet44/readme.md @@ -0,0 +1,15 @@ +# silverbullet44 + +![silverbullet44](imgur.com image replace me!) + +A short description of the keyboard/project + +Keyboard Maintainer: [swan_match](https://github.com/yourusername) +Hardware Supported: The PCBs, controllers supported +Hardware Availability: links to where you can find this hardware + +Make example for this keyboard (after setting up your build environment): + + make silverbullet44: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). diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk new file mode 100644 index 000000000000..4d7e3e316481 --- /dev/null +++ b/keyboards/silverbullet44/rules.mk @@ -0,0 +1,82 @@ +# MCU name +#MCU = at90usb1286 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID +BOOTLOADER = atmel-dfu + + +# If you don't know the bootloader type, then you can specify the +# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +# OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = no # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +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 = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +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 = yes # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) +SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/keyboards/silverbullet44/silverbullet44.c b/keyboards/silverbullet44/silverbullet44.c new file mode 100644 index 000000000000..d2e89c750ee6 --- /dev/null +++ b/keyboards/silverbullet44/silverbullet44.c @@ -0,0 +1,51 @@ +/* Copyright %YEAR% %YOUR_NAME% + * + * 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 "silverbullet44.h" + +// Optional override functions below. +// You can leave any or all of these undefined. +// These are only required if you want to perform custom actions. + +/* + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} + +*/ diff --git a/keyboards/silverbullet44/silverbullet44.h b/keyboards/silverbullet44/silverbullet44.h new file mode 100644 index 000000000000..2455605f1321 --- /dev/null +++ b/keyboards/silverbullet44/silverbullet44.h @@ -0,0 +1,43 @@ +/* Copyright %YEAR% %YOUR_NAME% + * + * 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" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ + L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ + L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ + L32, L33, L34, L35, R35, R34, R33, R32 \ +) \ +{ \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { KC_NO, KC_NO, L32, L33, L34, L35 }, \ + { R00, R01, R02, R03, R04, R05 }, \ + { R10, R11, R12, R13, R14, R15 }, \ + { R20, R21, R22, R23, R24, R25 }, \ + { KC_NO, KC_NO, R32, R33, R34, R35 } \ +} diff --git a/util/new_project.sh b/util/new_project.sh new file mode 100644 index 000000000000..d1d1ed82ca38 --- /dev/null +++ b/util/new_project.sh @@ -0,0 +1,66 @@ +#!/bin/sh +# Script to make a new quantum project +# Jack Humbert 2015 + +KEYBOARD=$1 +KEYBOARD_TYPE=$2 + +if [ -z "$KEYBOARD" ]; then + echo "Usage: $0 " + echo "Example: $0 gh60 avr" + echo "Example: $0 bfake ps2avrgb" + exit 1 +elif [ -z "$KEYBOARD_TYPE" ]; then + KEYBOARD_TYPE=avr +fi + +if [ "$KEYBOARD_TYPE" != "avr" ] && [ "$KEYBOARD_TYPE" != "ps2avrgb" ]; then + echo "Invalid keyboard type target" + exit 1 +fi + +if [ -e "keyboards/$1" ]; then + echo "Error! keyboards/$1 already exists!" + exit 1 +fi + +cd "$(dirname "$0")/.." || exit + +KEYBOARD_NAME=$(basename "$1") +KEYBOARD_NAME_UPPERCASE=$(echo "$KEYBOARD_NAME" | awk '{print toupper($0)}') +NEW_KBD=keyboards/${KEYBOARD} + + +cp -r quantum/template/base "$NEW_KBD" +cp -r "quantum/template/$KEYBOARD_TYPE/." "$NEW_KBD" + +mv "${NEW_KBD}/template.c" "${NEW_KBD}/${KEYBOARD_NAME}.c" +mv "${NEW_KBD}/template.h" "${NEW_KBD}/${KEYBOARD_NAME}.h" +find "${NEW_KBD}" -type f -exec sed -i '' -e "s;%KEYBOARD%;${KEYBOARD_NAME};g" {} \; +find "${NEW_KBD}" -type f -exec sed -i '' -e "s;%KEYBOARD_UPPERCASE%;${KEYBOARD_NAME_UPPERCASE};g" {} \; + +GIT=$(whereis git) +if [ "$GIT" != "" ]; then + IS_GIT_REPO=$($GIT log >>/dev/null 2>&1; echo $?) + if [ "$IS_GIT_REPO" -eq 0 ]; then + ID="'$($GIT config --get user.name)'" + echo "Using $ID as user name" + + for i in "$NEW_KBD/config.h" \ + "$NEW_KBD/$KEYBOARD_NAME.c" \ + "$NEW_KBD/$KEYBOARD_NAME.h" \ + "$NEW_KBD/keymaps/default/config.h" \ + "$NEW_KBD/keymaps/default/keymap.c" + do + awk -v id="$ID" '{sub(/REPLACE_WITH_YOUR_NAME/,id); print}' < "$i" > "$i.$$" + mv "$i.$$" "$i" + done + fi +fi + +cat <<-EOF +###################################################### +# $NEW_KBD project created. To start +# working on things, cd into $NEW_KBD +###################################################### +EOF From 189c915c0eb6fe0c15927e83bc003a8dcf4dd0de Mon Sep 17 00:00:00 2001 From: swanmatch Date: Thu, 11 Jul 2019 03:54:50 +0900 Subject: [PATCH 02/41] comment edit --- keyboards/silverbullet44/keymaps/default/keymap.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 88e1d8eedaa6..2cec50b2e8b8 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -69,8 +69,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* QWERTY * ,-----------------------------------------. ,-----------------------------------------. - * | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | \ | - * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | * |------+------+------+------+------+------| |------+------+------+------+------+------| * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | @@ -90,13 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Cursol * ,-----------------------------------------. ,-----------------------------------------. - * | ` | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | * |------+------+------+------+------+------+ +------+------+------+------+------+------| - * | | ` | CLft | F3 | CRgt | ( |-------.-------. ,---------------| ) | OSL | F8 | OSR | | | + * | | ` | CLft | F3 | CRgt | ( |-------.-------. ,---------------| ) | OSL | F8 | OSR | | | * `-----------------------------------------/ / / \ \ \----------------------------------------' * | LAlt | LGUI | / / / \ \ \ | | | * | | |/ LOWER / / \ \ \ | | | @@ -111,8 +107,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Calculater * ,-----------------------------------------. ,-----------------------------------------. - * | ~ | | | | | | | | NmLk | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | + | | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | ~ | | @@ -132,8 +126,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* ADJUST * ,-----------------------------------------. ,-----------------------------------------. - * |RESET | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | | | | | | | SPD+ | SPD+ | VAL+ | SAD+ | HUE+ | | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | | | | | | | SPD- | MOD- | VAL- | SAD- | HUE- | | From bcc492139ad3b01c78ece7e92bbbb61c8e8866ab Mon Sep 17 00:00:00 2001 From: swanmatch Date: Sun, 14 Jul 2019 03:01:59 +0900 Subject: [PATCH 03/41] venderID --- keyboards/silverbullet44/config.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index 5de99a99d4f3..08fb712a301b 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -20,12 +20,18 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0x16C0 +#define PRODUCT_ID 0x27DB #define DEVICE_VER 0x0001 +<<<<<<< HEAD #define MANUFACTURER %YOUR_NAME% #define PRODUCT silverbullet44 #define DESCRIPTION A custom keyboard +======= +#define MANUFACTURER SwanMatch +#define PRODUCT SilverBullet44 +#define DESCRIPTION Metalical Keyboard +>>>>>>> d668b2e6b... venderID /* key matrix size */ #define MATRIX_ROWS 8 @@ -94,7 +100,7 @@ along with this program. If not, see . #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 +#define DEBOUNCE 10 /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST From 033c400f67297c85ac623780e0e13effba6e4c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Tue, 9 Jul 2019 20:16:24 +0200 Subject: [PATCH 04/41] Fix parentheses in macros, and in general clean up quantum.h (#5021) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix up GPIO macros * Fix up send string macros `string` arguments must not be parenthesized * Fix up miscellaneous macros * Make indentation uniform (4 spaces) * Make #ifdef vs #if defined usage consistent * Reorder standard includes * Revert indentation changes as per review comments * Revert #if defined(__AVR__) → #ifdef __AVR__ change * Change 2 space indent to 4 spaces on a couple of lines * Replace include guard with #pragma once From 50faa8bfcde8c662844d1e04d73598af3b2188a0 Mon Sep 17 00:00:00 2001 From: swan_match Date: Thu, 29 Aug 2019 12:40:01 +0900 Subject: [PATCH 05/41] alt+tab --- .../silverbullet44/keymaps/default/keymap.c | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 2cec50b2e8b8..827bed882577 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -178,6 +178,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; +<<<<<<< HEAD +======= + case S(ALTAB): + case ALTAB: + if (record->event.pressed) { + if (!alt_pressed) { + alt_pressed = true; + register_code(KC_LALT); + } + if (keycode == S(ALTAB)) { + register_code(KC_LSFT); + } + register_code(KC_TAB); + } else { + unregister_code(KC_TAB); + if (keycode == S(ALTAB)) { + unregister_code(KC_LSFT); + } + } + return false; + break; + default: + if (alt_pressed) { + alt_pressed = false; + unregister_code(KC_LALT); + if (record->event.pressed) { + return false; + } + } + break; +>>>>>>> 81e9406e6... alt+tab } return true; } From 866e27b7bb0b57b523bf24b1e5c4c86b255749f4 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 14:30:06 +0900 Subject: [PATCH 06/41] copy from master:silverbullet44 --- keyboards/silverbullet44/config.h | 83 +++++++---- .../silverbullet44/keymaps/default/keymap.c | 141 ++++++++++-------- .../silverbullet44/keymaps/default/readme.md | 52 ++++++- keyboards/silverbullet44/rules.mk | 12 +- keyboards/silverbullet44/silverbullet44.c | 30 +++- 5 files changed, 218 insertions(+), 100 deletions(-) diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index 08fb712a301b..5bb3b1ed94bf 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -1,5 +1,5 @@ /* -Copyright %YEAR% %YOUR_NAME% +Copyright 2019 SwanMatch 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 @@ -23,15 +23,9 @@ along with this program. If not, see . #define VENDOR_ID 0x16C0 #define PRODUCT_ID 0x27DB #define DEVICE_VER 0x0001 -<<<<<<< HEAD -#define MANUFACTURER %YOUR_NAME% -#define PRODUCT silverbullet44 -#define DESCRIPTION A custom keyboard -======= #define MANUFACTURER SwanMatch #define PRODUCT SilverBullet44 #define DESCRIPTION Metalical Keyboard ->>>>>>> d668b2e6b... venderID /* key matrix size */ #define MATRIX_ROWS 8 @@ -66,30 +60,54 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN - #define RGBLED_NUM 25 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 130 /* The maximum brightness level */ - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + //#define RGBLIGHT_SPLIT + #define RGBLED_SPLIT {26, 26} + #define RGBLED_NUM 52 + #ifdef RGB_MATRIX_ENABLE + #define DRIVER_LED_TOTAL 52 + #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 + + #define RGB_MATRIX_HUE_STEP 8 + #define RGB_MATRIX_SAT_STEP 8 + #define RGB_MATRIX_VAL_STEP 8 + #define RGB_MATRIX_SPD_STEP 8 + + #define RGB_MATRIX_FRAMEBUFFER_EFFECTS + + #define RGB_MATRIX_KEYPRESSES // reacts to keypresses + + #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP + #else + #define RGBLIGHT_LED_MAP { 0,1,2,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,3,4,5,6, \ + 26,27,28,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,29,30,31,32 } + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 150 /* 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_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_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 + #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 + #define RGBLIGHT_EFFECT_BREATHE_CENTER 2 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +/*== customize snake effect ==*/ + #define RGBLIGHT_EFFECT_SNAKE_LENGTH RGBLED_NUM +/*== customize knight effect ==*/ + #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 6 + #endif #endif /* Audio */ @@ -97,20 +115,31 @@ along with this program. If not, see . #define B6_AUDIO #define STARTUP_SONG SONG(STARTUP_SOUND) #define AUDIO_CLICKY + #define AUDIO_CLUCKY_FREQ_MAX 220.0f + #define AUDIO_CLUCKY_FREQ_MIN 1760.0f + #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 10 +//#define RETRO_TAPPING + +#ifdef MOUSEKEY_ENABLE + #define MOUSEKEY_INTERVAL 20 + #define MOUSEKEY_MAX_SPEED 5 + #define MOUSEKEY_TIME_TO_MAX 60 +#endif + /* 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 +//#define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE +//#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). @@ -205,9 +234,9 @@ along with this program. If not, see . /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION +#define NO_ACTION_ONESHOT +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION /* * MIDI options diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 827bed882577..03d8b925b217 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright %YEAR% %YOUR_NAME% +/* Copyright 2019 SwanMatch * * 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 @@ -25,65 +25,39 @@ #define _CURSOL 1 #define _CALC 2 #define _ADJUST 3 +#define _MOUSE 4 enum custom_keycodes { QWERTY = SAFE_RANGE, - LOWER, - RAISE, ADJUST, RGBRST, KC_00, + ALTAB }; #define _______ KC_TRNS #define XXXXXXX KC_NO -#define CALC LT(_CALC, KC_ESC) -#define CUSL LT(_CURSOL, KC_TAB) -#define REVERSE(kc) \ -case kc: \ - if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { \ - if (record->event.pressed) { \ - unregister_code(KC_LSFT); \ - register_code(kc); \ - unregister_code(kc); \ - register_code(KC_LSFT); \ - } \ -/* } else if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { \ - if (record->event.pressed) { \ - unregister_code(KC_RSFT); \ - register_code(kc); \ - unregister_code(kc); \ - register_code(KC_RSFT); - } */ \ - } else { \ - if (record->event.pressed) { \ - register_code(KC_LSFT); \ - register_code(kc); \ - unregister_code(kc); \ - unregister_code(KC_LSFT); \ - } \ - } \ - return false; \ - break; +#define CALC LT(_CALC, KC_ESC) +#define CUSL LT(_CURSOL, KC_TAB) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* QWERTY * ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | + * |TabMOS| Q | W | E | R | T | | Y | U | I | O | P | = | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | + * |Shift | A | S | D | F | G | | H | J | K | L | ; | ' | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | + * | Ctrl | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | + * | Alt | Bksp | / Shift / Calc / \ Cursol\ Ctrl | Del | App | * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | * `-----------------------------' '---------------------------' */ [_QWERTY] = LAYOUT( \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ - KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ - LALT_T(KC_F5), KC_BSPC, LSFT_T(KC_SPC), CALC, CUSL, LCTL_T(KC_ENT), KC_DEL, GUI_T(KC_F12) \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ + LALT_T(KC_F5), KC_BSPC, LSFT_T(KC_SPC), CALC, CUSL, LCTL_T(KC_ENT), KC_DEL, GUI_T(KC_F12) \ ), /* Cursol @@ -92,55 +66,67 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | * |------+------+------+------+------+------+ +------+------+------+------+------+------| - * | | ` | CLft | F3 | CRgt | ( |-------.-------. ,---------------| ) | OSL | F8 | OSR | | | + * | | ` | CLft | F3 | CRgt |SALTAB|-------.-------. ,---------------|ALTTAB| OSL | F8 | OSR | | | * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | LAlt | LGUI | / / / \ \ \ | | | - * | | |/ LOWER / / \ \ \ | | | + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ \ | | | * `-----------------------------' '-----------------------------' */ [_CURSOL] = LAYOUT( \ - RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RGBRST, \ - _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, \ - _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), KC_LPRN, KC_RPRN, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, _______, \ + RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RESET, \ + _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, \ + _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), S(ALTAB), ALTAB, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, RGBRST, \ _______, _______, C(KC_SPC), ADJUST, _______, _______, _______, _______ \ ), /* Calculater * ,-----------------------------------------. ,-----------------------------------------. - * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | + | | + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | ~ | | + * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | + | | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | /-------/ / \ \-------\ | | | + * | | | / / / \ \ \ | | | * | | |/ / / \ \ 0 \ | 00 | . | * `-----------------------------' '------------------------------' */ [_CALC] = LAYOUT( \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_PPLS, _______, \ - _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_TILD, _______, \ - _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, \ - _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT \ + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, _______, \ + _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, \ + _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT \ ), +/* MOUSE + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | |WhlL | WhlR | Up | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | |WhlUP | Left | Down |Right | | | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | ` | | | | |-------.-------. ,---------------|WhlDW | | | | | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | Left |Right | /Center / / \ \ \ | | | + * |Click |Click |/ Click / / \ \ \ | | | + * `-----------------------------' '-----------------------------' +*/ /* ADJUST * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | SPD+ | SPD+ | VAL+ | SAD+ | HUE+ | | + * | | | |FrqRst| | | | | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | SPD- | MOD- | VAL- | SAD- | HUE- | | + * | | |Music |FrqUp |Sound | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | |-------.-------. ,---------------| | | | | | | + * | | |Scale |FrqDwn| | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | /-------/ / \ \-------\ | | | + * | | | / / / \ \ \ | | | * | | |/ / / \ \ \ | | | * `-----------------------------' '------------------------------' */ [_ADJUST] = LAYOUT( \ - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ + _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ + XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ + XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ) }; @@ -150,7 +136,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //Following line allows macro to read current RGB settings extern rgblight_config_t rgblight_config; #endif + int RGB_current_mode; +bool alt_pressed = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -171,15 +159,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } #endif break; - REVERSE(KC_SCLN) + case KC_SCLN: + if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { + if (record->event.pressed) { + unregister_code(KC_LSFT); + register_code(keycode); + unregister_code(keycode); + register_code(KC_LSFT); + } + /* } else if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { + if (record->event.pressed) { + unregister_code(KC_RSFT); + register_code(kc); + unregister_code(kc); + register_code(KC_RSFT); + } */ + } else { + if (record->event.pressed) { + register_code(KC_LSFT); + register_code(keycode); + unregister_code(keycode); + unregister_code(KC_LSFT); + } + } + return false; \ + break; case KC_00: if (record->event.pressed) { SEND_STRING("00"); } return false; break; -<<<<<<< HEAD -======= case S(ALTAB): case ALTAB: if (record->event.pressed) { @@ -208,15 +218,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } } break; ->>>>>>> 81e9406e6... alt+tab } return true; } void matrix_init_user(void) { - #ifdef RGBLIGHT_ENABLE - RGB_current_mode = rgblight_config.mode; - #endif + #ifdef RGBLIGHT_ENABLE + RGB_current_mode = rgblight_config.mode; + #endif } void matrix_scan_user(void) { diff --git a/keyboards/silverbullet44/keymaps/default/readme.md b/keyboards/silverbullet44/keymaps/default/readme.md index 76893dc66ebc..fc228755dc52 100644 --- a/keyboards/silverbullet44/keymaps/default/readme.md +++ b/keyboards/silverbullet44/keymaps/default/readme.md @@ -1 +1,51 @@ -# The default keymap for silverbullet44 \ No newline at end of file +# The default keymap for silverbullet44 + + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | + * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | + * `-----------------------------' '---------------------------' + * + * Cursol + * ,-----------------------------------------. ,-----------------------------------------. + * | | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | ` | CLft | F3 | CRgt |SALTAB|-------.-------. ,---------------|ALTTAB| OSL | F8 | OSR | | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ \ | | | + * `-----------------------------' '-----------------------------' + * + * Calculater + * ,-----------------------------------------. ,-----------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | + | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ 0 \ | 00 | . | + * `-----------------------------' '------------------------------' + * + * ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ \ | | | + * `-----------------------------' '------------------------------' +*/ diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index 4d7e3e316481..1d3a32761cb5 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -46,7 +46,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # LUFA DFU lufa-dfu # QMK DFU qmk-dfu # atmega32a bootloadHID -BOOTLOADER = atmel-dfu +BOOTLOADER = caterina # If you don't know the bootloader type, then you can specify the @@ -63,7 +63,7 @@ BOOTLOADER = atmel-dfu # change yes to no to disable # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no # Mouse keys(+4700) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = no # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration @@ -73,10 +73,12 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +#RGBLIGHT_ENABLE = no +#RGB_MATRIX_ENABLE = WS2812 MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 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 = yes # Use buzzer to emulate clicky switches +AUDIO_ENABLE = yes # Audio output on port B6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) -SPLIT_KEYBOARD = yes \ No newline at end of file +SPLIT_KEYBOARD = yes diff --git a/keyboards/silverbullet44/silverbullet44.c b/keyboards/silverbullet44/silverbullet44.c index d2e89c750ee6..d10b98156c82 100644 --- a/keyboards/silverbullet44/silverbullet44.c +++ b/keyboards/silverbullet44/silverbullet44.c @@ -47,5 +47,33 @@ void led_set_kb(uint8_t usb_led) { led_set_user(usb_led); } + */ + +#ifdef RGB_MATRIX_ENABLE +led_config_t g_led_config = { { + // Key Matrix to LED Index + { 18, 7, 6, 0, 1, 2}, + { 19, 17, 8, 5, 4, 3}, + { 21, 20, 16, 9, 10, 11}, + { NO_LED, NO_LED, 15, 14, 13, 12}, +}, { + { 139, 16 }, { 174, 13 }, { 208, 20 }, { 208, 38 }, { 174, 48 }, { 139, 52 }, { 129, 63 }, + { 139, 39 }, { 139, 21 }, { 139, 4 }, { 156, 2 }, { 156, 19 }, { 156, 37 }, { 144, 58 }, + { 164, 55 }, { 174, 35 }, { 174, 13 }, { 174, 0 }, { 191, 3 }, { 191, 20 }, { 191, 37 }, + { 208, 42 }, { 208, 24 }, { 208, 7 }, { 224, 7 }, { 224, 24 }, { 224, 41 }, { 85, 16 }, + { 50, 13 }, { 16, 20 }, { 16, 38 }, { 50, 48 }, { 85, 52 }, { 95, 63 }, { 85, 39 }, + { 85, 21 }, { 85, 4 }, { 68, 2 }, { 68, 19 }, { 68, 37 }, { 80, 58 }, { 60, 55 }, + { 50, 35 }, { 50, 13 }, { 50, 0 }, { 33, 3 }, { 33, 20 }, { 33, 37 }, { 16, 42 }, + { 16, 24 }, { 16, 7 }, { 0, 7 } +}, { + 2, 2, 2, 2, 2, 2, 1, + 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 1, 4, + 4, 4, 4, 4, 4, 1, 1, + 4, 4, 4, 4, 4, 4, 4, + 4, 4, 1 +} }; -*/ +#endif \ No newline at end of file From 4eea22731a0cfa222dbe1856b4fcd96ff7adaa3e Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 16:23:23 +0900 Subject: [PATCH 07/41] adjust for pull request --- .../silverbullet44/keymaps/default/keymap.c | 4 +- .../silverbullet44/keymaps/default/readme.md | 96 +++++++++---------- keyboards/silverbullet44/readme.md | 16 ++-- keyboards/silverbullet44/rules.mk | 13 +-- 4 files changed, 67 insertions(+), 62 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 03d8b925b217..c6be9167360d 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -34,8 +34,8 @@ enum custom_keycodes { KC_00, ALTAB }; -#define _______ KC_TRNS -#define XXXXXXX KC_NO +//#define _______ KC_TRNS +//#define XXXXXXX KC_NO #define CALC LT(_CALC, KC_ESC) #define CUSL LT(_CURSOL, KC_TAB) diff --git a/keyboards/silverbullet44/keymaps/default/readme.md b/keyboards/silverbullet44/keymaps/default/readme.md index fc228755dc52..01f4e6d23435 100644 --- a/keyboards/silverbullet44/keymaps/default/readme.md +++ b/keyboards/silverbullet44/keymaps/default/readme.md @@ -1,51 +1,51 @@ # The default keymap for silverbullet44 +``` +QWERTY +,-----------------------------------------. ,-----------------------------------------. +| Tab | Q | W | E | R | T | | Y | U | I | O | P | = | +|------+------+------+------+------+------| |------+------+------+------+------+------| +|LShift| A | S | D | F | G | | H | J | K | L | ; | ' | +|------+------+------+------+------+------| |------+------+------+------+------+------| +|LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | +`-----------------------------------------/ / / \ \ \----------------------------------------' + | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | + | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | + `-----------------------------' '---------------------------' -/* QWERTY - * ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | - * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | - * `-----------------------------' '---------------------------' - * - * Cursol - * ,-----------------------------------------. ,-----------------------------------------. - * | | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | - * |------+------+------+------+------+------+ +------+------+------+------+------+------| - * | | ` | CLft | F3 | CRgt |SALTAB|-------.-------. ,---------------|ALTTAB| OSL | F8 | OSR | | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | / / / \ \ \ | | | - * | | |/ / / \ \ \ | | | - * `-----------------------------' '-----------------------------' - * - * Calculater - * ,-----------------------------------------. ,-----------------------------------------. - * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | + | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | / / / \ \ \ | | | - * | | |/ / / \ \ 0 \ | 00 | . | - * `-----------------------------' '------------------------------' - * - * ADJUST - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | / / / \ \ \ | | | - * | | |/ / / \ \ \ | | | - * `-----------------------------' '------------------------------' -*/ +Cursol +,-----------------------------------------. ,-----------------------------------------. +| | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | +|------+------+------+------+------+------+ +------+------+------+------+------+------| +| | ` | CLft | F3 | CRgt |SALTAB|-------.-------. ,---------------|ALTTAB| OSL | F8 | OSR | | | +`-----------------------------------------/ / / \ \ \----------------------------------------' + | | | / / / \ \ \ | | | + | | |/ / / \ \ \ | | | + `-----------------------------' '-----------------------------' + +Calculater +,-----------------------------------------. ,-----------------------------------------. +| | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | + | | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | +`-----------------------------------------/ / / \ \ \----------------------------------------' + | | | / / / \ \ \ | | | + | | |/ / / \ \ 0 \ | 00 | . | + `-----------------------------' '------------------------------' + +ADJUST +,-----------------------------------------. ,-----------------------------------------. +| | | |FrqRst| | | | | | | | | | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | |Music |FrqUp |Sound | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | |Scale |FrqDwn| | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | +`-----------------------------------------/ / / \ \ \----------------------------------------' + | | | / / / \ \ \ | | | + | | |/ / / \ \ \ | | | + `-----------------------------' '------------------------------' +``` diff --git a/keyboards/silverbullet44/readme.md b/keyboards/silverbullet44/readme.md index a72fa4b6196e..a51fe5696188 100644 --- a/keyboards/silverbullet44/readme.md +++ b/keyboards/silverbullet44/readme.md @@ -1,15 +1,19 @@ # silverbullet44 -![silverbullet44](imgur.com image replace me!) +![silverbullet44](https://cdn-ak.f.st-hatena.com/images/fotolife/s/swan_match/20191017/20191017020317.jpg) -A short description of the keyboard/project +A hard keyboard with a hard keystroke that uses aluminum PCB for the top plate. +Upgradable from sandwich mount to top mount by using optional parts. -Keyboard Maintainer: [swan_match](https://github.com/yourusername) -Hardware Supported: The PCBs, controllers supported -Hardware Availability: links to where you can find this hardware +Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) +Hardware Supported: The PCBs, ProMicro +Hardware Availability: [PCB & Case Data](https://github.com/swanmatch/silverbullet44), [Booth Shop](https://swanmatch.booth.pm/items/1561270) Make example for this keyboard (after setting up your build environment): - make silverbullet44:default + make silverbullet44: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). + +[Build guide](https://swanmatch.github.io/silverbullet44/) + diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index 1d3a32761cb5..ac32719fc1f3 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -1,7 +1,7 @@ # MCU name -#MCU = at90usb1286 MCU = atmega32u4 + # Processor frequency. # This will define a symbol, F_CPU, in all source code files equal to the # processor frequency in Hz. You can then use this symbol in your source code to @@ -45,7 +45,8 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU atmel-dfu # LUFA DFU lufa-dfu # QMK DFU qmk-dfu -# atmega32a bootloadHID +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = caterina @@ -62,10 +63,10 @@ BOOTLOADER = caterina # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no # Mouse keys(+4700) -EXTRAKEY_ENABLE = no # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # 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 From 5ffa5cf8aa18f1b5419dc3e57ca273fa3cdfea40 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 16:46:27 +0900 Subject: [PATCH 08/41] clang-format --- .../silverbullet44/keymaps/default/keymap.c | 163 +++++++++--------- 1 file changed, 81 insertions(+), 82 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index c6be9167360d..bd43f0b6504f 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -131,95 +131,94 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - #ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings +// Following line allows macro to read current RGB settings extern rgblight_config_t rgblight_config; #endif -int RGB_current_mode; +int RGB_current_mode; bool alt_pressed = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; - case RGBRST: - #ifdef RGBLIGHT_ENABLE - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_mode = rgblight_config.mode; - } - #endif - break; - case KC_SCLN: - if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { - if (record->event.pressed) { - unregister_code(KC_LSFT); - register_code(keycode); - unregister_code(keycode); - register_code(KC_LSFT); - } - /* } else if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { - if (record->event.pressed) { - unregister_code(KC_RSFT); - register_code(kc); - unregister_code(kc); - register_code(KC_RSFT); - } */ - } else { - if (record->event.pressed) { - register_code(KC_LSFT); - register_code(keycode); - unregister_code(keycode); - unregister_code(KC_LSFT); - } - } - return false; \ - break; - case KC_00: - if (record->event.pressed) { - SEND_STRING("00"); - } - return false; - break; - case S(ALTAB): - case ALTAB: - if (record->event.pressed) { - if (!alt_pressed) { - alt_pressed = true; - register_code(KC_LALT); - } - if (keycode == S(ALTAB)) { - register_code(KC_LSFT); - } - register_code(KC_TAB); - } else { - unregister_code(KC_TAB); - if (keycode == S(ALTAB)) { - unregister_code(KC_LSFT); - } - } - return false; - break; - default: - if (alt_pressed) { - alt_pressed = false; - unregister_code(KC_LALT); - if (record->event.pressed) { - return false; - } - } - break; - } - return true; + switch (keycode) { + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + case RGBRST: +#ifdef RGBLIGHT_ENABLE + if (record->event.pressed) { + eeconfig_update_rgblight_default(); + rgblight_enable(); + RGB_current_mode = rgblight_config.mode; + } +#endif + break; + case KC_SCLN: + if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { + if (record->event.pressed) { + unregister_code(KC_LSFT); + register_code(keycode); + unregister_code(keycode); + register_code(KC_LSFT); + } + /* } else if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { + if (record->event.pressed) { + unregister_code(KC_RSFT); + register_code(kc); + unregister_code(kc); + register_code(KC_RSFT); + } */ + } else { + if (record->event.pressed) { + register_code(KC_LSFT); + register_code(keycode); + unregister_code(keycode); + unregister_code(KC_LSFT); + } + } + return false; + break; + case KC_00: + if (record->event.pressed) { + SEND_STRING("00"); + } + return false; + break; + case S(ALTAB): + case ALTAB: + if (record->event.pressed) { + if (!alt_pressed) { + alt_pressed = true; + register_code(KC_LALT); + } + if (keycode == S(ALTAB)) { + register_code(KC_LSFT); + } + register_code(KC_TAB); + } else { + unregister_code(KC_TAB); + if (keycode == S(ALTAB)) { + unregister_code(KC_LSFT); + } + } + return false; + break; + default: + if (alt_pressed) { + alt_pressed = false; + unregister_code(KC_LALT); + if (record->event.pressed) { + return false; + } + } + break; + } + return true; } void matrix_init_user(void) { From 3ee60c06ac052cdc8498125d39364d521f0d9978 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 17:33:46 +0900 Subject: [PATCH 09/41] create info.json --- keyboards/silverbullet44/info.json | 64 ++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index e69de29bb2d1..65c54e538fc4 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -0,0 +1,64 @@ +{ + "keyboard_name": "SilverBullet44", + "url": "https://swanmatch.booth.pm/items/1561270", + "maintainer": "swanmatch", + "width": 18, + "height": 4.5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"Tab", "x":0, "y":1.375}, + {"label":"Q", "x":1, "y":0.75}, + {"label":"W", "x":2, "y":0.25}, + {"label":"E", "x":3, "y":0}, + {"label":"R", "x":4, "y":0.25}, + {"label":"T", "x":5, "y":0.5}, + + {"label":"Y", "x":12, "y":0.5}, + {"label":"U", "x":13, "y":0.25}, + {"label":"I", "x":14, "y":0}, + {"label":"O", "x":15, "y":0.25}, + {"label":"P", "x":16, "y":0.75}, + {"label":"=", "x":17, "y":1.375}, + + {"label":"Shift", "x":0, "y":2.375}, + {"label":"A", "x":1, "y":1.75}, + {"label":"S", "x":2, "y":1.25}, + {"label":"D", "x":3, "y":1}, + {"label":"F", "x":4, "y":1.25}, + {"label":"G", "x":5, "y":1.5}, + + {"label":"H", "x":12, "y":1.5}, + {"label":"J", "x":13, "y":1.25}, + {"label":"K", "x":14, "y":1}, + {"label":"L", "x":15, "y":1.25}, + {"label":":", "x":16, "y":1.75}, + {"label":"'", "x":17, "y":2.375}, + + {"label":"N", "x":12, "y":2.5}, + {"label":"M", "x":13, "y":2.25}, + {"label":"<", "x":14, "y":2}, + {"label":">", "x":15, "y":2.25}, + {"label":"?", "x":16, "y":2.75}, + {"label":"-", "x":17, "y":3.375}, + + {"label":"Ctrl", "x":0, "y":3.375}, + {"label":"Z", "x":1, "y":2.75}, + {"label":"X", "x":2, "y":2.25}, + {"label":"C", "x":3, "y":2}, + {"label":"V", "x":4, "y":2.25}, + {"label":"B", "x":5, "y":2.5}, + + {"label":"Alt", "x":4, "y":3.25, "h":1.25}, + {"label":"BS", "x":5, "y":3.5}, + {"label":"Space", "x":-0.5, "y":3.5, "h":1.5}, + {"label":"Num", "x":7, "y":3.25, "h":1.5}, + + {"label":"Cursol", "x":-3.0, "y":3.5, "h":1.5}, + {"label":"Enter", "x":-2, "y":3.5, "h":1.5}, + {"label":"Del", "x":12, "y":3.5}, + {"label":"Win", "x":13, "y":3.25, "w":1.25} + ] + } + } +} \ No newline at end of file From 50b5fc070a55a532bf18eba0e450165ba3f9e2fc Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 17:42:26 +0900 Subject: [PATCH 10/41] Delete new_project.sh --- util/new_project.sh | 66 --------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 util/new_project.sh diff --git a/util/new_project.sh b/util/new_project.sh deleted file mode 100644 index d1d1ed82ca38..000000000000 --- a/util/new_project.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# Script to make a new quantum project -# Jack Humbert 2015 - -KEYBOARD=$1 -KEYBOARD_TYPE=$2 - -if [ -z "$KEYBOARD" ]; then - echo "Usage: $0 " - echo "Example: $0 gh60 avr" - echo "Example: $0 bfake ps2avrgb" - exit 1 -elif [ -z "$KEYBOARD_TYPE" ]; then - KEYBOARD_TYPE=avr -fi - -if [ "$KEYBOARD_TYPE" != "avr" ] && [ "$KEYBOARD_TYPE" != "ps2avrgb" ]; then - echo "Invalid keyboard type target" - exit 1 -fi - -if [ -e "keyboards/$1" ]; then - echo "Error! keyboards/$1 already exists!" - exit 1 -fi - -cd "$(dirname "$0")/.." || exit - -KEYBOARD_NAME=$(basename "$1") -KEYBOARD_NAME_UPPERCASE=$(echo "$KEYBOARD_NAME" | awk '{print toupper($0)}') -NEW_KBD=keyboards/${KEYBOARD} - - -cp -r quantum/template/base "$NEW_KBD" -cp -r "quantum/template/$KEYBOARD_TYPE/." "$NEW_KBD" - -mv "${NEW_KBD}/template.c" "${NEW_KBD}/${KEYBOARD_NAME}.c" -mv "${NEW_KBD}/template.h" "${NEW_KBD}/${KEYBOARD_NAME}.h" -find "${NEW_KBD}" -type f -exec sed -i '' -e "s;%KEYBOARD%;${KEYBOARD_NAME};g" {} \; -find "${NEW_KBD}" -type f -exec sed -i '' -e "s;%KEYBOARD_UPPERCASE%;${KEYBOARD_NAME_UPPERCASE};g" {} \; - -GIT=$(whereis git) -if [ "$GIT" != "" ]; then - IS_GIT_REPO=$($GIT log >>/dev/null 2>&1; echo $?) - if [ "$IS_GIT_REPO" -eq 0 ]; then - ID="'$($GIT config --get user.name)'" - echo "Using $ID as user name" - - for i in "$NEW_KBD/config.h" \ - "$NEW_KBD/$KEYBOARD_NAME.c" \ - "$NEW_KBD/$KEYBOARD_NAME.h" \ - "$NEW_KBD/keymaps/default/config.h" \ - "$NEW_KBD/keymaps/default/keymap.c" - do - awk -v id="$ID" '{sub(/REPLACE_WITH_YOUR_NAME/,id); print}' < "$i" > "$i.$$" - mv "$i.$$" "$i" - done - fi -fi - -cat <<-EOF -###################################################### -# $NEW_KBD project created. To start -# working on things, cd into $NEW_KBD -###################################################### -EOF From bcbc44e414d211d1fb51008031da846bb42d75c6 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 20:56:58 +0900 Subject: [PATCH 11/41] Update keyboards/silverbullet44/keymaps/default/config.h Co-Authored-By: Max Rumpf --- keyboards/silverbullet44/keymaps/default/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/default/config.h b/keyboards/silverbullet44/keymaps/default/config.h index 5b00c8956f9d..4f35826d8b6b 100644 --- a/keyboards/silverbullet44/keymaps/default/config.h +++ b/keyboards/silverbullet44/keymaps/default/config.h @@ -1,4 +1,4 @@ -/* Copyright %YEAR% %YOUR_NAME% +/* Copyright 2019 SwanMatch * * 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 From cf8c6d0f5f1b16689c4dcd9d1a6cef0226111986 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 20:57:21 +0900 Subject: [PATCH 12/41] Update keyboards/silverbullet44/silverbullet44.c Co-Authored-By: Max Rumpf --- keyboards/silverbullet44/silverbullet44.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/silverbullet44/silverbullet44.c b/keyboards/silverbullet44/silverbullet44.c index d10b98156c82..6ca7f8ba27b2 100644 --- a/keyboards/silverbullet44/silverbullet44.c +++ b/keyboards/silverbullet44/silverbullet44.c @@ -1,4 +1,4 @@ -/* Copyright %YEAR% %YOUR_NAME% +/* Copyright 2019 SwanMatch * * 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 @@ -76,4 +76,4 @@ led_config_t g_led_config = { { 4, 4, 1 } }; -#endif \ No newline at end of file +#endif From 01104a196dcb7bcbfeb6281ad441801f4e65ffd6 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Tue, 21 Jan 2020 20:57:44 +0900 Subject: [PATCH 13/41] Update keyboards/silverbullet44/silverbullet44.h Co-Authored-By: Max Rumpf --- keyboards/silverbullet44/silverbullet44.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/silverbullet44.h b/keyboards/silverbullet44/silverbullet44.h index 2455605f1321..7746a554c6a6 100644 --- a/keyboards/silverbullet44/silverbullet44.h +++ b/keyboards/silverbullet44/silverbullet44.h @@ -1,4 +1,4 @@ -/* Copyright %YEAR% %YOUR_NAME% +/* Copyright 2019 SwanMatch * * 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 From d7031e9d2413a3e0bedc1b548de4e5851de1e8fa Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 22 Jan 2020 09:30:45 +0900 Subject: [PATCH 14/41] Apply suggestions from @Maxr1998 --- .../silverbullet44/keymaps/default/config.h | 4 --- keyboards/silverbullet44/rules.mk | 3 -- keyboards/silverbullet44/silverbullet44.c | 34 ------------------- 3 files changed, 41 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/default/config.h b/keyboards/silverbullet44/keymaps/default/config.h index 4f35826d8b6b..92a48891c1ec 100644 --- a/keyboards/silverbullet44/keymaps/default/config.h +++ b/keyboards/silverbullet44/keymaps/default/config.h @@ -13,7 +13,3 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#pragma once - -// place overrides here diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index ac32719fc1f3..5da84b7d283c 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -35,9 +35,6 @@ ARCH = AVR8 # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. F_USB = $(F_CPU) -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - # Bootloader selection # Teensy halfkay diff --git a/keyboards/silverbullet44/silverbullet44.c b/keyboards/silverbullet44/silverbullet44.c index 6ca7f8ba27b2..7ae7a1269ed2 100644 --- a/keyboards/silverbullet44/silverbullet44.c +++ b/keyboards/silverbullet44/silverbullet44.c @@ -15,40 +15,6 @@ */ #include "silverbullet44.h" -// Optional override functions below. -// You can leave any or all of these undefined. -// These are only required if you want to perform custom actions. - -/* - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - led_set_user(usb_led); -} - */ - #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { // Key Matrix to LED Index From d635ab20a638060f37fc2822ffdaeaf3b3760ff1 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 22 Jan 2020 09:48:02 +0900 Subject: [PATCH 15/41] format default keymap --- .../silverbullet44/keymaps/default/keymap.c | 45 +++++-------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index bd43f0b6504f..3e6b482ba082 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -25,19 +25,15 @@ #define _CURSOL 1 #define _CALC 2 #define _ADJUST 3 -#define _MOUSE 4 enum custom_keycodes { - QWERTY = SAFE_RANGE, - ADJUST, + ADJUST = SAFE_RANGE, RGBRST, KC_00, ALTAB }; -//#define _______ KC_TRNS -//#define XXXXXXX KC_NO -#define CALC LT(_CALC, KC_ESC) -#define CUSL LT(_CURSOL, KC_TAB) +#define CALC LT(_CALC, KC_ESC) +#define CUSL LT(_CURSOL, KC_TAB) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -53,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | * `-----------------------------' '---------------------------' */ - [_QWERTY] = LAYOUT( \ + [_QWERTY] = LAYOUT( \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ @@ -72,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | |/ / / \ \ \ | | | * `-----------------------------' '-----------------------------' */ - [_CURSOL] = LAYOUT( \ + [_CURSOL] = LAYOUT( \ RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RESET, \ _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, \ _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), S(ALTAB), ALTAB, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, RGBRST, \ @@ -91,25 +87,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | |/ / / \ \ 0 \ | 00 | . | * `-----------------------------' '------------------------------' */ - [_CALC] = LAYOUT( \ + [_CALC] = LAYOUT( \ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, _______, \ _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, \ _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT \ ), -/* MOUSE - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | |WhlL | WhlR | Up | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | |WhlUP | Left | Down |Right | | | - * |------+------+------+------+------+------+ +------+------+------+------+------+------| - * | | ` | | | | |-------.-------. ,---------------|WhlDW | | | | | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | Left |Right | /Center / / \ \ \ | | | - * |Click |Click |/ Click / / \ \ \ | | | - * `-----------------------------' '-----------------------------' -*/ /* ADJUST * ,-----------------------------------------. ,-----------------------------------------. * | | | |FrqRst| | | | | | | | | | @@ -123,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------' '------------------------------' */ - [_ADJUST] = LAYOUT( \ + [_ADJUST] = LAYOUT( \ _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ @@ -149,15 +133,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case RGBRST: #ifdef RGBLIGHT_ENABLE + case RGBRST: if (record->event.pressed) { eeconfig_update_rgblight_default(); rgblight_enable(); RGB_current_mode = rgblight_config.mode; } -#endif break; +#endif case KC_SCLN: if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { if (record->event.pressed) { @@ -222,15 +206,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } void matrix_init_user(void) { - #ifdef RGBLIGHT_ENABLE +#ifdef RGBLIGHT_ENABLE RGB_current_mode = rgblight_config.mode; - #endif -} - -void matrix_scan_user(void) { - +#endif } -void led_set_user(uint8_t usb_led) { - -} From 2536a5d8c0a63ee7c7d4aad6ef8d1aa2566d4470 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 22 Jan 2020 12:12:12 +0900 Subject: [PATCH 16/41] Apply suggestions from @Maxr1998 (#2) --- keyboards/silverbullet44/config.h | 8 ++- .../silverbullet44/keymaps/default/keymap.c | 11 ++-- keyboards/silverbullet44/readme.md | 4 +- keyboards/silverbullet44/rules.mk | 61 +------------------ 4 files changed, 16 insertions(+), 68 deletions(-) diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index 5bb3b1ed94bf..d0dcfc35528c 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -234,9 +234,11 @@ along with this program. If not, see . /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -#define NO_ACTION_ONESHOT -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION +//#define NO_ACTION_ONESHOT +#ifndef LINK_TIME_OPTIMIZATION_ENABLE +# define NO_ACTION_MACRO +# define NO_ACTION_FUNCTION +#endif /* * MIDI options diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 3e6b482ba082..5e5d66392682 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -20,11 +20,12 @@ // QMKBEST = SAFE_RANGE, // QMKURL //}; - -#define _QWERTY 0 -#define _CURSOL 1 -#define _CALC 2 -#define _ADJUST 3 +enum layer { + _QWERTY, + _CURSOL, + _CALC, + _ADJUST, +}; enum custom_keycodes { ADJUST = SAFE_RANGE, diff --git a/keyboards/silverbullet44/readme.md b/keyboards/silverbullet44/readme.md index a51fe5696188..05f279a831a5 100644 --- a/keyboards/silverbullet44/readme.md +++ b/keyboards/silverbullet44/readme.md @@ -6,8 +6,8 @@ A hard keyboard with a hard keystroke that uses aluminum PCB for the top plate. Upgradable from sandwich mount to top mount by using optional parts. Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) -Hardware Supported: The PCBs, ProMicro -Hardware Availability: [PCB & Case Data](https://github.com/swanmatch/silverbullet44), [Booth Shop](https://swanmatch.booth.pm/items/1561270) +* Hardware Supported: The PCBs, ProMicro +* Hardware Availability: [PCB & Case Data](https://github.com/swanmatch/silverbullet44), [Booth Shop](https://swanmatch.booth.pm/items/1561270) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index 5da84b7d283c..23cbb3a2c3fd 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -1,67 +1,11 @@ # MCU name MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# 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 - - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -# OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration @@ -80,3 +24,4 @@ AUDIO_ENABLE = yes # Audio output on port B6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) SPLIT_KEYBOARD = yes +LTO_ENABLE = yes From 78d8b176d4b2aa70e273471f404edb1f1fa5aa25 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 22 Jan 2020 14:17:58 +0900 Subject: [PATCH 17/41] Apply suggestions from @fauxpark --- keyboards/silverbullet44/config.h | 2 - .../silverbullet44/keymaps/default/config.h | 15 ------ .../silverbullet44/keymaps/default/keymap.c | 51 +++++++++---------- keyboards/silverbullet44/readme.md | 2 +- keyboards/silverbullet44/rules.mk | 5 +- 5 files changed, 26 insertions(+), 49 deletions(-) delete mode 100644 keyboards/silverbullet44/keymaps/default/config.h diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h index d0dcfc35528c..6872f5fb4470 100644 --- a/keyboards/silverbullet44/config.h +++ b/keyboards/silverbullet44/config.h @@ -115,8 +115,6 @@ along with this program. If not, see . #define B6_AUDIO #define STARTUP_SONG SONG(STARTUP_SOUND) #define AUDIO_CLICKY - #define AUDIO_CLUCKY_FREQ_MAX 220.0f - #define AUDIO_CLUCKY_FREQ_MIN 1760.0f #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f #endif diff --git a/keyboards/silverbullet44/keymaps/default/config.h b/keyboards/silverbullet44/keymaps/default/config.h deleted file mode 100644 index 92a48891c1ec..000000000000 --- a/keyboards/silverbullet44/keymaps/default/config.h +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2019 SwanMatch - * - * 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 . - */ diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 5e5d66392682..e8815deb98b3 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -50,11 +50,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | * `-----------------------------' '---------------------------' */ - [_QWERTY] = LAYOUT( \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ - KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ - LALT_T(KC_F5), KC_BSPC, LSFT_T(KC_SPC), CALC, CUSL, LCTL_T(KC_ENT), KC_DEL, GUI_T(KC_F12) \ + [_QWERTY] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, + LALT_T(KC_F5), KC_BSPC, LSFT_T(KC_SPC), CALC, CUSL, LCTL_T(KC_ENT), KC_DEL, GUI_T(KC_F12) ), /* Cursol @@ -69,11 +69,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | |/ / / \ \ \ | | | * `-----------------------------' '-----------------------------' */ - [_CURSOL] = LAYOUT( \ - RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RESET, \ - _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, \ - _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), S(ALTAB), ALTAB, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, RGBRST, \ - _______, _______, C(KC_SPC), ADJUST, _______, _______, _______, _______ \ + [_CURSOL] = LAYOUT( + RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RESET, + _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, + _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), S(ALTAB), ALTAB, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, RGBRST, + _______, _______, C(KC_SPC), ADJUST, _______, _______, _______, _______ ), /* Calculater @@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | |/ / / \ \ 0 \ | 00 | . | * `-----------------------------' '------------------------------' */ - [_CALC] = LAYOUT( \ - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, _______, \ - _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, \ - _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT \ + [_CALC] = LAYOUT( + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, _______, + _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, + _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT ), /* ADJUST @@ -108,11 +108,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------' '------------------------------' */ - [_ADJUST] = LAYOUT( \ - _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ - XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ - XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + [_ADJUST] = LAYOUT( + _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, + XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ) }; @@ -147,23 +147,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (keyboard_report->mods & MOD_BIT(KC_LSFT)) { if (record->event.pressed) { unregister_code(KC_LSFT); - register_code(keycode); - unregister_code(keycode); + tap_code16(keycode); register_code(KC_LSFT); } /* } else if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { if (record->event.pressed) { unregister_code(KC_RSFT); - register_code(kc); - unregister_code(kc); + tap_code16(keycode); register_code(KC_RSFT); } */ } else { if (record->event.pressed) { - register_code(KC_LSFT); - register_code(keycode); - unregister_code(keycode); - unregister_code(KC_LSFT); + tap_code16(S(keycode)); } } return false; diff --git a/keyboards/silverbullet44/readme.md b/keyboards/silverbullet44/readme.md index 05f279a831a5..a13ae541ac2b 100644 --- a/keyboards/silverbullet44/readme.md +++ b/keyboards/silverbullet44/readme.md @@ -11,7 +11,7 @@ Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) Make example for this keyboard (after setting up your build environment): - make silverbullet44:flash + make silverbullet44: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). diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index 23cbb3a2c3fd..4b68634bb319 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -15,13 +15,12 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -#RGBLIGHT_ENABLE = no #RGB_MATRIX_ENABLE = WS2812 -MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = yes # Audio output on port B6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) +HD44780_ENABLE = no # Enable support for HD44780 based LCDs SPLIT_KEYBOARD = yes LTO_ENABLE = yes From b1a87a8b53228f95bce88fe75ccc1ee289dafb99 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 22 Jan 2020 14:41:41 +0900 Subject: [PATCH 18/41] fix readme.md --- keyboards/silverbullet44/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/silverbullet44/readme.md b/keyboards/silverbullet44/readme.md index a13ae541ac2b..57771d428ab1 100644 --- a/keyboards/silverbullet44/readme.md +++ b/keyboards/silverbullet44/readme.md @@ -5,8 +5,8 @@ A hard keyboard with a hard keystroke that uses aluminum PCB for the top plate. Upgradable from sandwich mount to top mount by using optional parts. -Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) -* Hardware Supported: The PCBs, ProMicro +Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) +* Hardware Supported: The PCBs, ProMicro * Hardware Availability: [PCB & Case Data](https://github.com/swanmatch/silverbullet44), [Booth Shop](https://swanmatch.booth.pm/items/1561270) Make example for this keyboard (after setting up your build environment): From e37af9b4b76912a433f09491a19bcae585dae9da Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 22 Jan 2020 15:17:31 +0900 Subject: [PATCH 19/41] Apply suggestion from @Maxr1998. (custom_keycode to MO(_ADJUST)) --- .../silverbullet44/keymaps/default/keymap.c | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index e8815deb98b3..132c17b3e908 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -28,8 +28,7 @@ enum layer { }; enum custom_keycodes { - ADJUST = SAFE_RANGE, - RGBRST, + RGBRST = SAFE_RANGE, KC_00, ALTAB }; @@ -70,10 +69,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------' '-----------------------------' */ [_CURSOL] = LAYOUT( - RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RESET, - _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, - _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), S(ALTAB), ALTAB, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, RGBRST, - _______, _______, C(KC_SPC), ADJUST, _______, _______, _______, _______ + RESET , KC_F1, KC_F2, KC_PGUP, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, RESET, + _______, KC_TILD, KC_HOME, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PIPE, KC_F11, + _______, KC_GRV, C(KC_LEFT), KC_F3, C(KC_RGHT), S(ALTAB), ALTAB, LCA(KC_LEFT), KC_F8, LCA(KC_RGHT), KC_BSLS, RGBRST, + _______, _______, C(KC_SPC), MO(_ADJUST), _______, _______, _______, _______ ), /* Calculater @@ -89,10 +88,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------' '------------------------------' */ [_CALC] = LAYOUT( - _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, _______, - _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, - _______, _______, _______, _______, ADJUST, KC_0, KC_00, KC_PDOT + _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_PPLS, _______, + _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_EXLM, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_PEQL, _______, + _______, _______, _______, _______, MO(_ADJUST), KC_0, KC_00, KC_PDOT ), /* ADJUST @@ -126,14 +125,6 @@ bool alt_pressed = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; #ifdef RGBLIGHT_ENABLE case RGBRST: if (record->event.pressed) { From 0530a9bf8820dfe00382c8d1ec0565e4b0210641 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Fri, 24 Jan 2020 10:48:26 +0900 Subject: [PATCH 20/41] I became a tricky! Hahaha!! --- keyboards/silverbullet44/keymaps/default/keymap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/default/keymap.c b/keyboards/silverbullet44/keymaps/default/keymap.c index 132c17b3e908..af8078608dbc 100644 --- a/keyboards/silverbullet44/keymaps/default/keymap.c +++ b/keyboards/silverbullet44/keymaps/default/keymap.c @@ -156,7 +156,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case KC_00: if (record->event.pressed) { - SEND_STRING("00"); + tap_code(KC_0); + register_code(KC_0); + } else { + unregister_code(KC_0); } return false; break; From 22f8638594528b5d8bacb022ceb4394819026b0c Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 14:32:26 +0900 Subject: [PATCH 21/41] Add original keymap made by FKML --- .../silverbullet44/keymaps/FKML/config.h | 19 ++ .../silverbullet44/keymaps/FKML/keymap.c | 169 ++++++++++++++++++ .../silverbullet44/keymaps/FKML/readme.md | 51 ++++++ 3 files changed, 239 insertions(+) create mode 100644 keyboards/silverbullet44/keymaps/FKML/config.h create mode 100644 keyboards/silverbullet44/keymaps/FKML/keymap.c create mode 100644 keyboards/silverbullet44/keymaps/FKML/readme.md diff --git a/keyboards/silverbullet44/keymaps/FKML/config.h b/keyboards/silverbullet44/keymaps/FKML/config.h new file mode 100644 index 000000000000..5b00c8956f9d --- /dev/null +++ b/keyboards/silverbullet44/keymaps/FKML/config.h @@ -0,0 +1,19 @@ +/* Copyright %YEAR% %YOUR_NAME% + * + * 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 + +// place overrides here diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c new file mode 100644 index 000000000000..035bddcdfd17 --- /dev/null +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -0,0 +1,169 @@ +/* Copyright 2019 SwanMatch + * + * 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 + +// Defines the keycodes used by our macros in process_record_user +//enum custom_keycodes { +// QMKBEST = SAFE_RANGE, +// QMKURL +//}; + +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 +#define _ADJUST 3 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST, +}; +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |Shift | A | S | D | F | G | | H | J | K | L | ; | ' | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | CMD | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | + * `-----------------------------------------/ / / \ \ \-----------------------------------------' + * | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| + * `--------------- -------------' '--------------------------' + */ + [_QWERTY] = LAYOUT( \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LCMD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ + KC_CLCK, LOWER, KC_SPC, KC_BSPC, KC_DOT, KC_ENT, RAISE, RGB_TOG \ + ), + +/* LOWER + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | 1 | 2 | 3 | 4 | 5 | | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | | | | | |-------.-------. ,---------------| 6 | 7 | 8 | 9 | 0 | | + * `-----------------------------------------/ / / \ \ \-----------------------------------------' + * | | | / / \ \ | | | + * `----------------------------' '--------------------------' + */ + [_LOWER] = LAYOUT( \ + KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, \ + _______, _______, _______, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ + _______, _______, _______, ADJUST, _______, _______, _______, _______ \ + ), + +/* RAISE + * ,-----------------------------------------. ,-----------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | | | | | - | + | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | F6 | F7 | F8 | F9 | F10 | | | | | | [ | ] | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | F11 | F12 | | | |-------.-------. ,---------------| | | Left | Up | Down |Right | + * `-----------------------------------------/ / / \ \ \-----------------------------------------' + * | | | / / \ \ | | | + * `---------------------------' '--------------------------' + */ + [_RAISE] = LAYOUT( \ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_MINS, KC_PLUS, \ + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_LBRC, KC_RBRC, \ + _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, \ + _______, _______, _______, _______, ADJUST, _______, _______, _______ \ + ), + +/* ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * | | | |FrqRst| | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | |Music |FrqUp |Sound | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | |Scale |FrqDwn| | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | + * `-----------------------------------------/ / / \ \ \-----------------------------------------' + * | | | / / \ \ | | | + * `---------------------------' '--------------------------' +*/ + + [_ADJUST] = LAYOUT( \ + _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ + XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ + XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ) +}; + + +#ifdef RGBLIGHT_ENABLE +//Following line allows macro to read current RGB settings +extern rgblight_config_t rgblight_config; +#endif + +int RGB_current_mode; +bool alt_pressed = false; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} + +void matrix_init_user(void) { + #ifdef RGBLIGHT_ENABLE + RGB_current_mode = rgblight_config.mode; + #endif +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/silverbullet44/keymaps/FKML/readme.md b/keyboards/silverbullet44/keymaps/FKML/readme.md new file mode 100644 index 000000000000..fc228755dc52 --- /dev/null +++ b/keyboards/silverbullet44/keymaps/FKML/readme.md @@ -0,0 +1,51 @@ +# The default keymap for silverbullet44 + + +/* QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * |LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | + * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | + * `-----------------------------' '---------------------------' + * + * Cursol + * ,-----------------------------------------. ,-----------------------------------------. + * | | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | ` | CLft | F3 | CRgt |SALTAB|-------.-------. ,---------------|ALTTAB| OSL | F8 | OSR | | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ \ | | | + * `-----------------------------' '-----------------------------' + * + * Calculater + * ,-----------------------------------------. ,-----------------------------------------. + * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | + | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ 0 \ | 00 | . | + * `-----------------------------' '------------------------------' + * + * ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | + * `-----------------------------------------/ / / \ \ \----------------------------------------' + * | | | / / / \ \ \ | | | + * | | |/ / / \ \ \ | | | + * `-----------------------------' '------------------------------' +*/ From 3f0c18ffaf4436d0476916743ffee2b87a714cef Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:26:36 +0900 Subject: [PATCH 22/41] deleated at config.h --- .../silverbullet44/keymaps/FKML/config.h | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 keyboards/silverbullet44/keymaps/FKML/config.h diff --git a/keyboards/silverbullet44/keymaps/FKML/config.h b/keyboards/silverbullet44/keymaps/FKML/config.h deleted file mode 100644 index 5b00c8956f9d..000000000000 --- a/keyboards/silverbullet44/keymaps/FKML/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright %YEAR% %YOUR_NAME% - * - * 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 - -// place overrides here From 5020769445d739b353b889b2cf1d52e616428014 Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:31:33 +0900 Subject: [PATCH 23/41] Changed Copyright --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 035bddcdfd17..e1c6072fe672 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 SwanMatch +/* Copyright 2019 FKML * * 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 From aea649bf26f087e89e293070377af1d71ca684de Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:32:44 +0900 Subject: [PATCH 24/41] Delete // Defines the keycodes used by our macros in process_record_user //enum custom_keycodes { // QMKBEST = SAFE_RANGE, // QMKURL //}; --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index e1c6072fe672..239415f5b7f6 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -15,11 +15,7 @@ */ #include QMK_KEYBOARD_H -// Defines the keycodes used by our macros in process_record_user -//enum custom_keycodes { -// QMKBEST = SAFE_RANGE, -// QMKURL -//}; + #define _QWERTY 0 #define _LOWER 1 From a28c84a98909149624b80cf213c84fac40d7cd8b Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:33:34 +0900 Subject: [PATCH 25/41] Delete bool alt_pressed = false; --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 239415f5b7f6..6808345196cb 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -114,7 +114,6 @@ extern rgblight_config_t rgblight_config; #endif int RGB_current_mode; -bool alt_pressed = false; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { From 96ebb3962c7fbc84da9b9e7c35bb98c62bb1d2b6 Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:36:39 +0900 Subject: [PATCH 26/41] Delete ADJUST --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 6808345196cb..0817a8bfd8ed 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -137,14 +137,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; } return true; } From 0996a4f25caf16a30aa3a7b49a151a06cc9aa44f Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:39:53 +0900 Subject: [PATCH 27/41] Delete / --- .../silverbullet44/keymaps/FKML/keymap.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 0817a8bfd8ed..749782246296 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -44,11 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| * `--------------- -------------' '--------------------------' */ - [_QWERTY] = LAYOUT( \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, \ - KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LCMD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, \ - KC_CLCK, LOWER, KC_SPC, KC_BSPC, KC_DOT, KC_ENT, RAISE, RGB_TOG \ + [_QWERTY] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCMD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, + KC_CLCK, LOWER, KC_SPC, KC_BSPC, KC_DOT, KC_ENT, RAISE, RGB_TOG ), /* LOWER @@ -62,11 +62,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | / / \ \ | | | * `----------------------------' '--------------------------' */ - [_LOWER] = LAYOUT( \ - KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ - _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, \ - _______, _______, _______, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ - _______, _______, _______, ADJUST, _______, _______, _______, _______ \ + [_LOWER] = LAYOUT( + KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, + _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, + _______, _______, _______, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, _______, _______, ADJUST, _______, _______, _______, _______ ), /* RAISE @@ -80,11 +80,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | / / \ \ | | | * `---------------------------' '--------------------------' */ - [_RAISE] = LAYOUT( \ - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_MINS, KC_PLUS, \ - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_LBRC, KC_RBRC, \ - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, \ - _______, _______, _______, _______, ADJUST, _______, _______, _______ \ + [_RAISE] = LAYOUT( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_MINS, KC_PLUS, + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_LBRC, KC_RBRC, + _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, + _______, _______, _______, _______, ADJUST, _______, _______, _______ ), /* ADJUST @@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------' '--------------------------' */ - [_ADJUST] = LAYOUT( \ - _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, \ - XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, \ - XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + [_ADJUST] = LAYOUT( + _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, + XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ) }; From f4f6b30b3333916282a8cb2c38ac26d3157f0337 Mon Sep 17 00:00:00 2001 From: FKML Date: Sat, 1 Feb 2020 17:40:42 +0900 Subject: [PATCH 28/41] Delete void matrix_scan_user(void) { } void led_set_user(uint8_t usb_led) { } --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 749782246296..674cda77819f 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -146,11 +146,3 @@ void matrix_init_user(void) { RGB_current_mode = rgblight_config.mode; #endif } - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} From 33c3e0d8f1ab6e18b4bbd6f724179319a495269b Mon Sep 17 00:00:00 2001 From: FKML Date: Sun, 2 Feb 2020 09:03:34 +0900 Subject: [PATCH 29/41] Change Copyright's year. --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 674cda77819f..62fd5b092d20 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 FKML +/* Copyright 2020 FKML * * 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 From 058e3eaf8936a677fa7510b6a6c36adfcba99410 Mon Sep 17 00:00:00 2001 From: FKML Date: Mon, 3 Feb 2020 21:05:11 +0900 Subject: [PATCH 30/41] Delete adjust --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 62fd5b092d20..21b865426f84 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -26,7 +26,6 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, LOWER, RAISE, - ADJUST, }; #define _______ KC_TRNS #define XXXXXXX KC_NO From 828434691e3bd929e499a5aaf2b361ff85a2241c Mon Sep 17 00:00:00 2001 From: FKML Date: Mon, 3 Feb 2020 21:05:55 +0900 Subject: [PATCH 31/41] Delete adjust --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 21b865426f84..83eb24aa9e09 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, _______, _______, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, _______, _______, ADJUST, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______ ), /* RAISE From 8329e70514a9a88b7b9a3da29a81fea44948308a Mon Sep 17 00:00:00 2001 From: FKML Date: Mon, 3 Feb 2020 21:06:58 +0900 Subject: [PATCH 32/41] Delete adjust --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 83eb24aa9e09..bf7828d83114 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_MINS, KC_PLUS, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, - _______, _______, _______, _______, ADJUST, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______ ), /* ADJUST From a66726ebefe0a916c77a1fba148964006f5235a1 Mon Sep 17 00:00:00 2001 From: FKML Date: Mon, 3 Feb 2020 21:08:44 +0900 Subject: [PATCH 33/41] =?UTF-8?q?=E5=88=97=E6=8C=99=E5=9E=8B=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index bf7828d83114..16fee88ec75c 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -17,10 +17,13 @@ -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 -#define _ADJUST 3 +enum layer { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST, +}; + enum custom_keycodes { QWERTY = SAFE_RANGE, From 3effd16c09812ef7356ec93cd4db51a69692fcac Mon Sep 17 00:00:00 2001 From: FKML Date: Tue, 4 Feb 2020 21:02:06 +0900 Subject: [PATCH 34/41] Enclose keymap with ```. --- .../silverbullet44/keymaps/FKML/keymap.c | 7 +- .../silverbullet44/keymaps/FKML/readme.md | 92 +++++++++---------- 2 files changed, 47 insertions(+), 52 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 16fee88ec75c..6235590c649e 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -24,7 +24,6 @@ enum layer { _ADJUST, }; - enum custom_keycodes { QWERTY = SAFE_RANGE, LOWER, @@ -43,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | CMD | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | * `-----------------------------------------/ / / \ \ \-----------------------------------------' - * | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| - * `--------------- -------------' '--------------------------' + | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| + `----------------------------' '--------------------------' */ [_QWERTY] = LAYOUT( KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, @@ -62,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | |-------.-------. ,---------------| 6 | 7 | 8 | 9 | 0 | | * `-----------------------------------------/ / / \ \ \-----------------------------------------' * | | | / / \ \ | | | - * `----------------------------' '--------------------------' + * `---------------------------' '--------------------------' */ [_LOWER] = LAYOUT( KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, diff --git a/keyboards/silverbullet44/keymaps/FKML/readme.md b/keyboards/silverbullet44/keymaps/FKML/readme.md index fc228755dc52..99a8529aea56 100644 --- a/keyboards/silverbullet44/keymaps/FKML/readme.md +++ b/keyboards/silverbullet44/keymaps/FKML/readme.md @@ -1,51 +1,47 @@ # The default keymap for silverbullet44 +``` +QWERTY +,-----------------------------------------. ,-----------------------------------------. +| Tab | Q | W | E | R | T | | Y | U | I | O | P | = | +|------+------+------+------+------+------| |------+------+------+------+------+------| +|Shift | A | S | D | F | G | | H | J | K | L | ; | ' | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| CMD | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | +`-----------------------------------------/ / / \ \ \-----------------------------------------' + | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| + `----------------------------' '--------------------------' -/* QWERTY - * ,-----------------------------------------. ,-----------------------------------------. - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | = | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LShift| A | S | D | F | G | | H | J | K | L | ; | ' | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |LCTRL | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | Alt | Bksp | / Shift / Calc / \ Cursol\ CTRL | Del | App | - * | F5 | |/ Space / Esc / \ Tab \ Enter\ | F12 | - * `-----------------------------' '---------------------------' - * - * Cursol - * ,-----------------------------------------. ,-----------------------------------------. - * | | F1 | F2 | PgUp | F4 | F5 | | F6 | F7 | Up | F9 | F10 |PrtSc | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ~ | Home | PgDw | End | ( | | ) | Left | Down |Right | F8 | F11 | - * |------+------+------+------+------+------+ +------+------+------+------+------+------| - * | | ` | CLft | F3 | CRgt |SALTAB|-------.-------. ,---------------|ALTTAB| OSL | F8 | OSR | | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | / / / \ \ \ | | | - * | | |/ / / \ \ \ | | | - * `-----------------------------' '-----------------------------' - * - * Calculater - * ,-----------------------------------------. ,-----------------------------------------. - * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | @ | # | $ | % | [ | | ] | 4 | 5 | 6 | + | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ^ | & | * | ! | { |-------.-------. ,---------------| } | 1 | 2 | 3 | = | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | / / / \ \ \ | | | - * | | |/ / / \ \ 0 \ | 00 | . | - * `-----------------------------' '------------------------------' - * - * ADJUST - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | - * `-----------------------------------------/ / / \ \ \----------------------------------------' - * | | | / / / \ \ \ | | | - * | | |/ / / \ \ \ | | | - * `-----------------------------' '------------------------------' -*/ +LOWER + ,-----------------------------------------. ,-----------------------------------------. + | ` | ! | @ | # | $ | % | | ^ | & | * | ( | ) | | | + |------+------+------+------+------+------| |------+------+------+------+------+------| + | | | | | | | | 1 | 2 | 3 | 4 | 5 | | + |------+------+------+------+------+------+ +------+------+------+------+------+------| + | | | | | | |-------.-------. ,---------------| 6 | 7 | 8 | 9 | 0 | | + `-----------------------------------------/ / / \ \ \-----------------------------------------' + | | | / / \ \ | | | + `---------------------------' '--------------------------' + + RAISE + ,-----------------------------------------. ,-----------------------------------------. + | | F1 | F2 | F3 | F4 | F5 | | | | | | - | + | + |------+------+------+------+------+------| |------+------+------+------+------+------| + | | F6 | F7 | F8 | F9 | F10 | | | | | | [ | ] | + |------+------+------+------+------+------| |------+------+------+------+------+------| + | | F11 | F12 | | | |-------.-------. ,---------------| | | Left | Up | Down |Right | + `-----------------------------------------/ / / \ \ \-----------------------------------------' + | | | / / \ \ | | | + `---------------------------' '--------------------------' + +ADJUST +,-----------------------------------------. ,-----------------------------------------. +| | | |FrqRst| | | | | | | | | | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | |Music |FrqUp |Sound | | | SPD+ | MOD+ | VAL+ | SAD+ | HUE+ | | +|------+------+------+------+------+------| |------+------+------+------+------+------| +| | |Scale |FrqDwn| | |-------.-------. ,---------------| SPD- | SPD- | VAL- | SAD- | HUE- | | +`-----------------------------------------/ / / \ \ \-----------------------------------------' + | | | / / \ \ | | | + `---------------------------' '--------------------------' +``` \ No newline at end of file From 2628b321d8d1b3f8a71a1850845329c0da5ac8da Mon Sep 17 00:00:00 2001 From: FKML Date: Tue, 4 Feb 2020 21:03:42 +0900 Subject: [PATCH 35/41] Delete #define _______ KC_TRNS #define XXXXXXX KC_NO --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 6235590c649e..261282214c58 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -29,8 +29,6 @@ enum custom_keycodes { LOWER, RAISE, }; -#define _______ KC_TRNS -#define XXXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 3338639be7ead648b0d5bbb413c6b8033884dddf Mon Sep 17 00:00:00 2001 From: FKML Date: Tue, 4 Feb 2020 21:07:11 +0900 Subject: [PATCH 36/41] Fix indentation. --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 261282214c58..7354470ebac8 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -126,7 +126,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case RAISE: + case RAISE: if (record->event.pressed) { layer_on(_RAISE); update_tri_layer(_LOWER, _RAISE, _ADJUST); From 50d1f4d026fd852625ca6a4a3aa4d1ceac4f5120 Mon Sep 17 00:00:00 2001 From: FKML Date: Tue, 4 Feb 2020 21:22:18 +0900 Subject: [PATCH 37/41] Delete some rows. --- keyboards/silverbullet44/keymaps/FKML/keymap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 7354470ebac8..0026fb3b4a25 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -15,8 +15,6 @@ */ #include QMK_KEYBOARD_H - - enum layer { _QWERTY, _LOWER, @@ -106,7 +104,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - #ifdef RGBLIGHT_ENABLE //Following line allows macro to read current RGB settings extern rgblight_config_t rgblight_config; @@ -144,4 +141,4 @@ void matrix_init_user(void) { #ifdef RGBLIGHT_ENABLE RGB_current_mode = rgblight_config.mode; #endif -} +} \ No newline at end of file From 6e11563c525bd8e67efcda3deefeb7c32bc0147d Mon Sep 17 00:00:00 2001 From: FKML Date: Tue, 4 Feb 2020 23:24:50 +0900 Subject: [PATCH 38/41] Aligned columns of ''readme.md''. --- keyboards/silverbullet44/keymaps/FKML/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/readme.md b/keyboards/silverbullet44/keymaps/FKML/readme.md index 99a8529aea56..c9c4c133eb37 100644 --- a/keyboards/silverbullet44/keymaps/FKML/readme.md +++ b/keyboards/silverbullet44/keymaps/FKML/readme.md @@ -9,8 +9,8 @@ QWERTY |------+------+------+------+------+------| |------+------+------+------+------+------| | CMD | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | `-----------------------------------------/ / / \ \ \-----------------------------------------' - | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| - `----------------------------' '--------------------------' + | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| + `---------------------------' '--------------------------' LOWER ,-----------------------------------------. ,-----------------------------------------. From acfc83d0ebbf5c307c7c1d262a0971653b212bc6 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 5 Feb 2020 09:40:34 +0900 Subject: [PATCH 39/41] I got god's keymap...hahaha:) --- .../silverbullet44/keymaps/FKML/keymap.c | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/keyboards/silverbullet44/keymaps/FKML/keymap.c b/keyboards/silverbullet44/keymaps/FKML/keymap.c index 0026fb3b4a25..5b6be1813d8a 100644 --- a/keyboards/silverbullet44/keymaps/FKML/keymap.c +++ b/keyboards/silverbullet44/keymaps/FKML/keymap.c @@ -23,9 +23,9 @@ enum layer { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, + QWERTY = SAFE_RANGE, + LOWER, + RAISE, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -38,14 +38,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | CMD | Z | X | C | V | B |-------.-------. ,---------------| N | M | , | . | / | - | * `-----------------------------------------/ / / \ \ \-----------------------------------------' - | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| - `----------------------------' '--------------------------' + * | CAPS | LOWER| Space/ Bcsp / \ . \ Ent | RAISE|LEDOff| + * `----------------------------' '--------------------------' */ - [_QWERTY] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, - KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LCMD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, - KC_CLCK, LOWER, KC_SPC, KC_BSPC, KC_DOT, KC_ENT, RAISE, RGB_TOG + [_QWERTY] = LAYOUT( + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, + KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCMD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, + KC_CLCK, LOWER, KC_SPC, KC_BSPC, KC_DOT, KC_ENT, RAISE, RGB_TOG ), /* LOWER @@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | / / \ \ | | | * `---------------------------' '--------------------------' */ - [_LOWER] = LAYOUT( - KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, - _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, - _______, _______, _______, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, _______, _______, _______, _______, _______, _______, _______ + [_LOWER] = LAYOUT( + KC_GRV , KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, + _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, _______, + _______, _______, _______, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + _______, _______, _______, _______, _______, _______, _______, _______ ), /* RAISE @@ -74,14 +74,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | | F11 | F12 | | | |-------.-------. ,---------------| | | Left | Up | Down |Right | * `-----------------------------------------/ / / \ \ \-----------------------------------------' - * | | | / / \ \ | | | + * | | | / / \ \ | | | * `---------------------------' '--------------------------' */ - [_RAISE] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_MINS, KC_PLUS, - _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_LBRC, KC_RBRC, - _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, - _______, _______, _______, _______, _______, _______, _______, _______ + [_RAISE] = LAYOUT( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_MINS, KC_PLUS, + _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, KC_LBRC, KC_RBRC, + _______, KC_F11, KC_F12, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, + _______, _______, _______, _______, _______, _______, _______, _______ ), /* ADJUST @@ -94,13 +94,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------/ / / \ \ \-----------------------------------------' * | | | / / \ \ | | | * `---------------------------' '--------------------------' -*/ + */ - [_ADJUST] = LAYOUT( - _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, - XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + [_ADJUST] = LAYOUT( + _______, XXXXXXX, XXXXXXX, CK_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + XXXXXXX, XXXXXXX, MU_TOG, CK_UP, AU_TOG, XXXXXXX, RGB_SPI, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, XXXXXXX, + XXXXXXX, XXXXXXX, MU_MOD, CK_DOWN, XXXXXXX, XXXXXXX, RGB_SPD, RGB_RMOD, RGB_VAD, RGB_SAD, RGB_HUD, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ) }; @@ -112,33 +112,33 @@ extern rgblight_config_t rgblight_config; int RGB_current_mode; bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - } - return true; + switch (keycode) { + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + } + return true; } void matrix_init_user(void) { - #ifdef RGBLIGHT_ENABLE +#ifdef RGBLIGHT_ENABLE RGB_current_mode = rgblight_config.mode; - #endif -} \ No newline at end of file +#endif +} From b01f51f70bd995a9787ef9d96ea7408f86432bbc Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 5 Feb 2020 11:17:36 +0900 Subject: [PATCH 40/41] Update keyboards/silverbullet44/readme.md Co-Authored-By: fauxpark --- keyboards/silverbullet44/readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/silverbullet44/readme.md b/keyboards/silverbullet44/readme.md index 57771d428ab1..3de46ee6825d 100644 --- a/keyboards/silverbullet44/readme.md +++ b/keyboards/silverbullet44/readme.md @@ -5,7 +5,7 @@ A hard keyboard with a hard keystroke that uses aluminum PCB for the top plate. Upgradable from sandwich mount to top mount by using optional parts. -Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) +* Keyboard Maintainer: [swan_match](https://github.com/swanmatch/) * Hardware Supported: The PCBs, ProMicro * Hardware Availability: [PCB & Case Data](https://github.com/swanmatch/silverbullet44), [Booth Shop](https://swanmatch.booth.pm/items/1561270) @@ -16,4 +16,3 @@ Make example for this keyboard (after setting up your build environment): 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). [Build guide](https://swanmatch.github.io/silverbullet44/) - From 432a57ab24e488577fd448fd76f7d13165069493 Mon Sep 17 00:00:00 2001 From: swanmatch Date: Wed, 5 Feb 2020 11:19:59 +0900 Subject: [PATCH 41/41] Update keyboards/silverbullet44/rules.mk Co-Authored-By: fauxpark --- keyboards/silverbullet44/rules.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk index 4b68634bb319..39c5a0451edc 100644 --- a/keyboards/silverbullet44/rules.mk +++ b/keyboards/silverbullet44/rules.mk @@ -1,6 +1,16 @@ # 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 + # Build Options # change yes to no to disable #