From ca82e3b5baf6810bd4fba58ae26c9786d8e5900d Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Mon, 2 Mar 2020 15:30:01 +1000 Subject: [PATCH 01/24] added abacus keyboard --- .../abacus/.vscode/c_cpp_properties.json | 20 ++ keyboards/abacus/abacus.c | 17 ++ keyboards/abacus/abacus.h | 41 +++ keyboards/abacus/config.h | 243 ++++++++++++++++++ keyboards/abacus/info.json | 18 ++ keyboards/abacus/keymaps/default/config.h | 19 ++ keyboards/abacus/keymaps/default/keymap.c | 154 +++++++++++ keyboards/abacus/keymaps/default/readme.md | 1 + keyboards/abacus/readme.md | 15 ++ keyboards/abacus/rules.mk | 47 ++++ 10 files changed, 575 insertions(+) create mode 100644 keyboards/abacus/.vscode/c_cpp_properties.json create mode 100644 keyboards/abacus/abacus.c create mode 100644 keyboards/abacus/abacus.h create mode 100644 keyboards/abacus/config.h create mode 100644 keyboards/abacus/info.json create mode 100644 keyboards/abacus/keymaps/default/config.h create mode 100644 keyboards/abacus/keymaps/default/keymap.c create mode 100644 keyboards/abacus/keymaps/default/readme.md create mode 100644 keyboards/abacus/readme.md create mode 100644 keyboards/abacus/rules.mk diff --git a/keyboards/abacus/.vscode/c_cpp_properties.json b/keyboards/abacus/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..f23a6adefcfa --- /dev/null +++ b/keyboards/abacus/.vscode/c_cpp_properties.json @@ -0,0 +1,20 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "C:/Users/nijon/Documents/Git/qmk_firmware/quantum/**" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE" + ], + "compilerPath": "C:\\msys64\\mingw64\\bin\\gcc.exe", + "cStandard": "c11", + "cppStandard": "c++17", + "intelliSenseMode": "clang-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/keyboards/abacus/abacus.c b/keyboards/abacus/abacus.c new file mode 100644 index 000000000000..aef62aa921c7 --- /dev/null +++ b/keyboards/abacus/abacus.c @@ -0,0 +1,17 @@ +/* Copyright 2020 nickolaij + * + * 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 "abacus.h" diff --git a/keyboards/abacus/abacus.h b/keyboards/abacus/abacus.h new file mode 100644 index 000000000000..bdd2e51adef1 --- /dev/null +++ b/keyboards/abacus/abacus.h @@ -0,0 +1,41 @@ +/* Copyright 2020 nickolaij + * + * 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 +#define XXX KC_NO +#include "quantum.h" + + +/* This is 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( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38 \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, k33, XXX, XXX, k34, XXX, k35, k36, k37, k38} \ +} diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h new file mode 100644 index 000000000000..1b2c9f2f73f2 --- /dev/null +++ b/keyboards/abacus/config.h @@ -0,0 +1,243 @@ +/* +Copyright 2020 nickolaij + +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 nickolaij +#define PRODUCT abacus +#define DESCRIPTION A first attempt at a custom keyboard + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 12 + +/* memory saving defines */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* + * 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 { D3, D2, D4, C6 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5} +#define UNUSED_PINS {B0} + +#define DIP_SWITCH_PINS { D0 } + +#define ENCODERS_PAD_A { F1 } +#define ENCODERS_PAD_B { F0 } +#define ENCODER_RESOLUTION 4 + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW +#define RGB_DI_PIN D1 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 17 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== 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_STATIC_GRADIENT +/*== customize breathing effect ==*/ + /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ + #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 + /*==== use exp() and sin() ====*/ + #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 + #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* 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 + + +/* + * 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_MASK_SHIFT) + +/* 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 + +/* disable these deprecated features by default */ +#ifndef LINK_TIME_OPTIMIZATION_ENABLE + #define NO_ACTION_MACRO + #define NO_ACTION_FUNCTION +#endif +/* + * 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/abacus/info.json b/keyboards/abacus/info.json new file mode 100644 index 000000000000..a6c82f67ee4e --- /dev/null +++ b/keyboards/abacus/info.json @@ -0,0 +1,18 @@ +{ + "keyboard_name": "Abacus", + "url": "https://www.github.com/nickolaij", + "maintainer": "nickolaij", + "width": 12, + "height": 4, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"k00", "x":0, "y":0}, + {"label":"k01", "x":1, "y":0}, + {"label":"k02", "x":2, "y":0}, + {"label":"k10", "x":0, "y":1, "w":1.5}, + {"label":"k12", "x":1.5, "y":1, "w":1.5} + ] + } + } +} diff --git a/keyboards/abacus/keymaps/default/config.h b/keyboards/abacus/keymaps/default/config.h new file mode 100644 index 000000000000..1dca3456d6eb --- /dev/null +++ b/keyboards/abacus/keymaps/default/config.h @@ -0,0 +1,19 @@ +/* Copyright 2020 nickolaij + * + * 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/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c new file mode 100644 index 000000000000..2ed684a14c6e --- /dev/null +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -0,0 +1,154 @@ +/* Copyright 2020 nickolaij + * + * 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 + +// wait DELAY ms before unregistering media keys +#define MEDIA_KEY_DELAY 10 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _UPPER, + _LOWER +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + NICKURL = SAFE_RANGE, + QMKURL +}; + +enum unicode_names { + LOVEEYES, + THINK, + UPSIDEDOWN, + NOMOUTH, + PARTY, + HEART, + EGGPLANT, + PEACH, + EMOJI100, + EMOJIB +}; + +const uint32_t PROGMEM unicode_map[] = { + [LOVEEYES] = 0x1f60d, + [THINK] = 0x1f914, + [UPSIDEDOWN] = 0x1f643, + [NOMOUTH] = 0x1f636, + [PARTY] = 0x1f973, + [HEART] = 0x1f495, + [EMOJI100] = 0x1f4af, + [PEACH] = 0x1f351, + [EGGPLANT] = 0x1f346, + [EMOJIB] = 0x1f171 +}; + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_BSLASH, + KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE, + KC_LCTRL, KC_LGUI, MO(_LOWER), KC_SPACE, KC_ENTER, MO(_UPPER), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [_LOWER] = LAYOUT( + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRACKET, KC_RBRACKET, KC_QUOTE, KC_SLASH, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______, + _______, KC_LALT, _______, _______, _______, _______, KC_HOME, _______, KC_END + ), + [_UPPER] = LAYOUT( + NICKURL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), RGB_TOG, + _______, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, + _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD + ) + + +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case NICKURL: + if (record->event.pressed) { + // when keycode QMKBEST is pressed + SEND_STRING("https://www.github.com/nickolaij"); + } else { + tap_code(KC_ENTER); + } + return true; + break; + + case KC_LALT: + // allow for it to be windows key if layer not pressed in right order + if ( ((record->event.pressed) && (biton32(layer_state) == _LOWER)) ) { + // need to change as above is only considered once, not updated + register_code(KC_LGUI); + } else { + unregister_code(KC_LGUI); + } + return false; + + default: + return true; + + } +} + + +void dip_switch_update_user(uint8_t index, bool active) { + switch (index) { + case 0: + if(active) { + switch(biton32(layer_state)) { + case _BASE: + register_code(KC_LCTRL); + tap_code(KC_F); + unregister_code(KC_LCTRL); + break; + case _LOWER: + tap_code(KC_MUTE); + break; + case _UPPER: + tap_code(KC_MEDIA_PLAY_PAUSE); + break; + } + } + } +} + + +void matrix_init_user(void) { + set_unicode_input_mode(UC_WINC); +} + +void encoder_update_user(uint8_t index, bool clockwise) { + + switch(biton32(layer_state)) { + case _BASE: + clockwise ? tap_code(KC_PGUP) : tap_code(KC_PGDN); + break; + case _LOWER: + clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU); + break; + case _UPPER: + clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK); + break; + } +} \ No newline at end of file diff --git a/keyboards/abacus/keymaps/default/readme.md b/keyboards/abacus/keymaps/default/readme.md new file mode 100644 index 000000000000..80665853b85f --- /dev/null +++ b/keyboards/abacus/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for abacus diff --git a/keyboards/abacus/readme.md b/keyboards/abacus/readme.md new file mode 100644 index 000000000000..e160167cbd75 --- /dev/null +++ b/keyboards/abacus/readme.md @@ -0,0 +1,15 @@ +# abacus + +![abacus](imgur.com image replace me!) + +A short description of the keyboard/project + +* Keyboard Maintainer: [nickolaij](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 abacus: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/abacus/rules.mk b/keyboards/abacus/rules.mk new file mode 100644 index 000000000000..7e1d6db45bdc --- /dev/null +++ b/keyboards/abacus/rules.mk @@ -0,0 +1,47 @@ +# 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 = 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 +# Otherwise, delete this section +# 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 +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODEMAP_ENABLE = yes +ENCODER_ENABLE = yes +DIP_SWITCH_ENABLE = yes + +EXTRAFLAGS += -flto From 17b148a29a8ba97d121d54ba3236145a35463685 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:21:08 +1000 Subject: [PATCH 02/24] keymap updates --- keyboards/abacus/keymaps/default/keymap.c | 38 +++++++++-------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index 2ed684a14c6e..ba306956334e 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -21,8 +21,8 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _UPPER, - _LOWER + _UP_1, + _UP_2 }; // Defines the keycodes used by our macros in process_record_user @@ -65,19 +65,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_BSLASH, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE, - KC_LCTRL, KC_LGUI, MO(_LOWER), KC_SPACE, KC_ENTER, MO(_UPPER), KC_LEFT, KC_DOWN, KC_RIGHT + KC_LCTRL, KC_LGUI, MO(_UP_1), KC_SPACE, KC_ENTER, KC_LALT, KC_LEFT, KC_DOWN, KC_RIGHT ), - [_LOWER] = LAYOUT( + [_UP_1] = LAYOUT( KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRACKET, KC_RBRACKET, KC_QUOTE, KC_SLASH, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______, - _______, KC_LALT, _______, _______, _______, _______, KC_HOME, _______, KC_END + _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, MO(_UP_2), _______, + _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END ), - [_UPPER] = LAYOUT( + [_UP_2] = LAYOUT( NICKURL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), RGB_TOG, - _______, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, - _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD + _______, KC_F11, KC_F12, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_TOG, + _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), _______, + _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI ) @@ -95,16 +95,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; break; - case KC_LALT: - // allow for it to be windows key if layer not pressed in right order - if ( ((record->event.pressed) && (biton32(layer_state) == _LOWER)) ) { - // need to change as above is only considered once, not updated - register_code(KC_LGUI); - } else { - unregister_code(KC_LGUI); - } - return false; - default: return true; @@ -122,10 +112,10 @@ void dip_switch_update_user(uint8_t index, bool active) { tap_code(KC_F); unregister_code(KC_LCTRL); break; - case _LOWER: + case _UP_1: tap_code(KC_MUTE); break; - case _UPPER: + case _UP_2: tap_code(KC_MEDIA_PLAY_PAUSE); break; } @@ -144,10 +134,10 @@ void encoder_update_user(uint8_t index, bool clockwise) { case _BASE: clockwise ? tap_code(KC_PGUP) : tap_code(KC_PGDN); break; - case _LOWER: + case _UP_1: clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU); break; - case _UPPER: + case _UP_2: clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK); break; } From 2b5a495fa9013a9b6a8a0b9f58d6b5c6c13e7bd2 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 10:52:18 +1000 Subject: [PATCH 03/24] Update keyboards/abacus/config.h Co-Authored-By: Ryan --- keyboards/abacus/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index 1b2c9f2f73f2..7840c1d1f54e 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -58,6 +58,7 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN D1 + #ifdef RGB_DI_PIN #define RGBLED_NUM 17 #define RGBLIGHT_HUE_STEP 8 From 1acb839fc6c1396db0362661a2685a3c6bbfb2d8 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 11:15:56 +1000 Subject: [PATCH 04/24] Update keyboards/abacus/config.h Co-Authored-By: Ryan --- keyboards/abacus/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index 7840c1d1f54e..5762dfdb9f01 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROWS 4 #define MATRIX_COLS 12 -/* memory saving defines */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - /* * Keyboard Matrix Assignments * From e883a1a683aa8656ee8fe2770cf42d5eb7d2a230 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 11:16:40 +1000 Subject: [PATCH 05/24] Update keyboards/abacus/keymaps/default/keymap.c Co-Authored-By: Ryan --- keyboards/abacus/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index ba306956334e..6d75a2bc16cb 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -87,7 +87,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case NICKURL: if (record->event.pressed) { - // when keycode QMKBEST is pressed SEND_STRING("https://www.github.com/nickolaij"); } else { tap_code(KC_ENTER); @@ -141,4 +140,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK); break; } -} \ No newline at end of file +} From a6a4990fef756b626e389ebcd798312a66a08043 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 11:17:01 +1000 Subject: [PATCH 06/24] Update keyboards/abacus/keymaps/default/keymap.c Co-Authored-By: Ryan --- keyboards/abacus/keymaps/default/keymap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index 6d75a2bc16cb..c1fe0f5f9a8e 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -107,9 +107,7 @@ void dip_switch_update_user(uint8_t index, bool active) { if(active) { switch(biton32(layer_state)) { case _BASE: - register_code(KC_LCTRL); - tap_code(KC_F); - unregister_code(KC_LCTRL); + tap_code16(C(KC_F)); break; case _UP_1: tap_code(KC_MUTE); From 3a5744eb98700cf12ec2527bdd5cfdf2cff8d008 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 11:17:31 +1000 Subject: [PATCH 07/24] Update keyboards/abacus/keymaps/default/keymap.c Co-Authored-By: Ryan --- keyboards/abacus/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index c1fe0f5f9a8e..9943f637a108 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -91,8 +91,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { tap_code(KC_ENTER); } - return true; - break; + return false; default: return true; From 6808db78511ecde4c6473388ad4e13c28249657c Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 20:37:14 +1000 Subject: [PATCH 08/24] start cleaning up for merge --- .../abacus/.vscode/c_cpp_properties.json | 20 --- keyboards/abacus/config.h | 141 +++--------------- keyboards/abacus/info.json | 55 ++++++- keyboards/abacus/keymaps/default/config.h | 19 --- keyboards/abacus/keymaps/default/keymap.c | 28 ++-- keyboards/abacus/readme.md | 11 +- keyboards/abacus/rules.mk | 13 +- 7 files changed, 93 insertions(+), 194 deletions(-) delete mode 100644 keyboards/abacus/.vscode/c_cpp_properties.json delete mode 100644 keyboards/abacus/keymaps/default/config.h diff --git a/keyboards/abacus/.vscode/c_cpp_properties.json b/keyboards/abacus/.vscode/c_cpp_properties.json deleted file mode 100644 index f23a6adefcfa..000000000000 --- a/keyboards/abacus/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "configurations": [ - { - "name": "Win32", - "includePath": [ - "C:/Users/nijon/Documents/Git/qmk_firmware/quantum/**" - ], - "defines": [ - "_DEBUG", - "UNICODE", - "_UNICODE" - ], - "compilerPath": "C:\\msys64\\mingw64\\bin\\gcc.exe", - "cStandard": "c11", - "cppStandard": "c++17", - "intelliSenseMode": "clang-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index 5762dfdb9f01..7fa98985392a 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -56,25 +56,25 @@ along with this program. If not, see . #define RGB_DI_PIN D1 #ifdef RGB_DI_PIN - #define RGBLED_NUM 17 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +# define RGBLED_NUM 17 +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== 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_STATIC_GRADIENT +# 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_STATIC_GRADIENT /*== 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 +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ @@ -88,81 +88,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* - * 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_MASK_SHIFT) - -/* 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. @@ -206,35 +131,3 @@ along with this program. If not, see . /* 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/abacus/info.json b/keyboards/abacus/info.json index a6c82f67ee4e..ec6afcf19bab 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -6,12 +6,57 @@ "height": 4, "layouts": { "LAYOUT": { + "key_count": 45, "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1, "w":1.5} + {"label":"k00", "x":0, "y":0, "w":1}, + {"label":"k01", "x":1, "y":0, "w":1}, + {"label":"k02", "x":2, "y":0, "w":1}, + {"label":"k03", "x":3, "y":0, "w":1}, + {"label":"k04", "x":4, "y":0, "w":1}, + {"label":"k05", "x":5, "y":0, "w":1}, + {"label":"k06", "x":6, "y":0, "w":1}, + {"label":"k07", "x":7, "y":0, "w":1}, + {"label":"k08", "x":8, "y":0, "w":1}, + {"label":"k09", "x":9, "y":0, "w":1}, + {"label":"k0a", "x":10, "y":0, "w":1}, + {"label":"k0b", "x":11, "y":0, "w":1.75}, + + {"label":"k10", "x":0, "y":1, "w":1.25}, + {"label":"k11", "x":1, "y":1, "w":1}, + {"label":"k12", "x":2, "y":1, "w":1}, + {"label":"k13", "x":3, "y":1, "w":1}, + {"label":"k14", "x":4, "y":1, "w":1}, + {"label":"k15", "x":5, "y":1, "w":1}, + {"label":"k16", "x":6, "y":1, "w":1}, + {"label":"k17", "x":7, "y":1, "w":1}, + {"label":"k18", "x":8, "y":1, "w":1}, + {"label":"k19", "x":9, "y":1, "w":1}, + {"label":"k1a", "x":10, "y":1, "w":1}, + {"label":"k1b", "x":11, "y":1, "w":1.5}, + + {"label":"k20", "x":0, "y":2, "w":1.75}, + {"label":"k21", "x":1, "y":2, "w":1}, + {"label":"k22", "x":2, "y":2, "w":1}, + {"label":"k23", "x":3, "y":2, "w":1}, + {"label":"k24", "x":4, "y":2, "w":1}, + {"label":"k25", "x":5, "y":2, "w":1}, + {"label":"k26", "x":6, "y":2, "w":1}, + {"label":"k27", "x":7, "y":2, "w":1}, + {"label":"k28", "x":8, "y":2, "w":1}, + {"label":"k29", "x":9, "y":2, "w":1}, + {"label":"k2a", "x":10, "y":2, "w":1}, + {"label":"k2b", "x":11, "y":2, "w":1.25}, + + {"label":"k30", "x":0, "y":3, "w":1.25}, + {"label":"k31", "x":1, "y":3, "w":1}, + {"label":"k32", "x":2, "y":3, "w":1}, + {"label":"k33", "x":3, "y":3, "w":2.75}, + {"label":"k34", "x":4, "y":3, "w":2.75}, + {"label":"k35", "x":5, "y":3, "w":1}, + {"label":"k36", "x":6, "y":3, "w":1}, + {"label":"k37", "x":7, "y":3, "w":1}, + {"label":"k38", "x":8, "y":3, "w":1} + ] } } diff --git a/keyboards/abacus/keymaps/default/config.h b/keyboards/abacus/keymaps/default/config.h deleted file mode 100644 index 1dca3456d6eb..000000000000 --- a/keyboards/abacus/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 nickolaij - * - * 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/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index 9943f637a108..39ecf7a477f3 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -28,7 +28,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { NICKURL = SAFE_RANGE, - QMKURL + ALTTAB }; enum unicode_names { @@ -65,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_BSLASH, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE, - KC_LCTRL, KC_LGUI, MO(_UP_1), KC_SPACE, KC_ENTER, KC_LALT, KC_LEFT, KC_DOWN, KC_RIGHT + KC_LCTRL, KC_LGUI, MO(_UP_1), KC_SPACE, KC_ENTER, MO(_UP_2), KC_LEFT, KC_DOWN, KC_RIGHT ), [_UP_1] = LAYOUT( KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRACKET, KC_RBRACKET, KC_QUOTE, KC_SLASH, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, MO(_UP_2), _______, - _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END + ALTTAB, _______, _______, _______, _______, _______, _______, _______, KC_LBRACKET, KC_RBRACKET, KC_QUOTE, KC_SLASH, + KC_LALT, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END ), [_UP_2] = LAYOUT( NICKURL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, @@ -91,7 +91,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } else { tap_code(KC_ENTER); } - return false; + return true; + break; + + case ALTTAB: + if (record->event.pressed) { + register_key(KC_LALT); + tap_code(KC_TAB); + unregister_key(KC_LALT); + } + return true; + break; default: return true; @@ -104,9 +114,9 @@ void dip_switch_update_user(uint8_t index, bool active) { switch (index) { case 0: if(active) { - switch(biton32(layer_state)) { + switch(get_highest_layer(layer_state)) { case _BASE: - tap_code16(C(KC_F)); + tap_code(C(KC_F)); break; case _UP_1: tap_code(KC_MUTE); @@ -137,4 +147,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK); break; } -} +} \ No newline at end of file diff --git a/keyboards/abacus/readme.md b/keyboards/abacus/readme.md index e160167cbd75..31282a299d35 100644 --- a/keyboards/abacus/readme.md +++ b/keyboards/abacus/readme.md @@ -1,12 +1,13 @@ # abacus -![abacus](imgur.com image replace me!) +![abacus](https://i.imgur.com/IFtuWaK.jpg) -A short description of the keyboard/project +A first attempt at a PCB design for a mechanical keyboard. Includes encoder and RGB -* Keyboard Maintainer: [nickolaij](https://github.com/yourusername) -* Hardware Supported: The PCBs, controllers supported -* Hardware Availability: Links to where you can find this hardware +* PCB Files: [Abacus PCB Github](https://github.com/nickolaij/Abacus_Rev2) +* Keyboard Maintainer: [nickolaij](https://github.com/nickolaij) +* Hardware Supported: [Elite C Microcontroller](https://keeb.io/products/elite-c-usb-c-pro-micro-replacement-arduino-compatible-atmega32u4) or Pro Micro Microcontroller (Elite C has additional pins for encoder) +* Hardware Availability: https://github.com/nickolaij Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/abacus/rules.mk b/keyboards/abacus/rules.mk index 7e1d6db45bdc..580947658d6d 100644 --- a/keyboards/abacus/rules.mk +++ b/keyboards/abacus/rules.mk @@ -11,16 +11,6 @@ MCU = atmega32u4 # ATmega328P USBasp 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 -# Otherwise, delete this section -# 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 # @@ -43,5 +33,4 @@ HD44780_ENABLE = no # Enable support for HD44780 based LCDs UNICODEMAP_ENABLE = yes ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = yes - -EXTRAFLAGS += -flto +LTO_ENABLE = yes \ No newline at end of file From 2842f12aa046f9540159b137190356ba56392430 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 20:41:57 +1000 Subject: [PATCH 09/24] cleaned for merge --- keyboards/abacus/keymaps/default/keymap.c | 4 ++-- keyboards/abacus/keymaps/default/readme.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index 39ecf7a477f3..feb9a5e6af94 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -76,8 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_UP_2] = LAYOUT( NICKURL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_F11, KC_F12, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_TOG, - _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), _______, - _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI + _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), RGB_HUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/abacus/keymaps/default/readme.md b/keyboards/abacus/keymaps/default/readme.md index 80665853b85f..218a7e05b9d4 100644 --- a/keyboards/abacus/keymaps/default/readme.md +++ b/keyboards/abacus/keymaps/default/readme.md @@ -1 +1,4 @@ # The default keymap for abacus + +This is made based on my first few days of playing with it and honing in on what feels right. +I've repurposed the DIP switch function for the encoder switches and added some functionality for multiple layers also effecting the encoders output. \ No newline at end of file From c0dd407690b0515cdcee891806b009603788d4f6 Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Wed, 4 Mar 2020 21:45:02 +1000 Subject: [PATCH 10/24] cleaned --- keyboards/abacus/keymaps/default/keymap.c | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index feb9a5e6af94..8d5f106f321f 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -21,8 +21,8 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _UP_1, - _UP_2 + _UPPER, + _LOWER }; // Defines the keycodes used by our macros in process_record_user @@ -65,19 +65,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESCAPE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_BSLASH, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_UP, KC_DELETE, - KC_LCTRL, KC_LGUI, MO(_UP_1), KC_SPACE, KC_ENTER, MO(_UP_2), KC_LEFT, KC_DOWN, KC_RIGHT + KC_LCTRL, KC_LGUI, MO(_UPPER), KC_SPACE, KC_ENTER, MO(_LOWER), KC_LEFT, KC_DOWN, KC_RIGHT ), - [_UP_1] = LAYOUT( + [_UPPER] = LAYOUT( KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, ALTTAB, _______, _______, _______, _______, _______, _______, _______, KC_LBRACKET, KC_RBRACKET, KC_QUOTE, KC_SLASH, - KC_LALT, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______, - KC_CAPS, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END + _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_EQUAL, _______, _______, + KC_LALT, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END ), - [_UP_2] = LAYOUT( + [_LOWER] = LAYOUT( NICKURL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, KC_F11, KC_F12, RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW, RGB_MODE_SWIRL, RGB_MODE_SNAKE, RGB_MODE_KNIGHT, RGB_MODE_GRADIENT, XXXXXXX, RGB_TOG, _______, X(LOVEEYES), X(THINK), X(UPSIDEDOWN), X(NOMOUTH), X(PARTY), X(PEACH), X(HEART), X(EGGPLANT), X(EMOJI100), X(EMOJIB), RGB_HUI, - _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______ ) @@ -96,9 +96,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case ALTTAB: if (record->event.pressed) { - register_key(KC_LALT); - tap_code(KC_TAB); - unregister_key(KC_LALT); + tap_code16(LALT(KC_TAB)); } return true; break; @@ -116,12 +114,12 @@ void dip_switch_update_user(uint8_t index, bool active) { if(active) { switch(get_highest_layer(layer_state)) { case _BASE: - tap_code(C(KC_F)); + tap_code16(LCTL(KC_F)); break; - case _UP_1: + case _UPPER: tap_code(KC_MUTE); break; - case _UP_2: + case _LOWER: tap_code(KC_MEDIA_PLAY_PAUSE); break; } @@ -138,12 +136,12 @@ void encoder_update_user(uint8_t index, bool clockwise) { switch(biton32(layer_state)) { case _BASE: - clockwise ? tap_code(KC_PGUP) : tap_code(KC_PGDN); + clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP); break; - case _UP_1: - clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU); + case _UPPER: + clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD); break; - case _UP_2: + case _LOWER: clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK); break; } From db025a468422b56a4f62a5d38f18ef9802263f2d Mon Sep 17 00:00:00 2001 From: nickolaij <43221066+nickolaij@users.noreply.github.com> Date: Thu, 5 Mar 2020 08:36:18 +1000 Subject: [PATCH 11/24] cleaned --- keyboards/abacus/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index 8d5f106f321f..be3aaa592f26 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -96,7 +96,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case ALTTAB: if (record->event.pressed) { - tap_code16(LALT(KC_TAB)); + tap_code16(A(KC_TAB)); } return true; break; From 52f0b21f0f724040156810a7dd0ef6f3e8bf41df Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:14:54 +1000 Subject: [PATCH 12/24] Update keyboards/abacus/abacus.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/abacus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/abacus.h b/keyboards/abacus/abacus.h index bdd2e51adef1..7f221c3c3473 100644 --- a/keyboards/abacus/abacus.h +++ b/keyboards/abacus/abacus.h @@ -15,8 +15,8 @@ */ #pragma once -#define XXX KC_NO #include "quantum.h" +#define XXX KC_NO /* This is a shortcut to help you visually see your layout. From 793cdd6309be2a648b4d3e46c20dca26154814b0 Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:15:04 +1000 Subject: [PATCH 13/24] Update keyboards/abacus/keymaps/default/keymap.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/abacus/keymaps/default/keymap.c b/keyboards/abacus/keymaps/default/keymap.c index be3aaa592f26..c1d5bd882787 100644 --- a/keyboards/abacus/keymaps/default/keymap.c +++ b/keyboards/abacus/keymaps/default/keymap.c @@ -134,7 +134,7 @@ void matrix_init_user(void) { void encoder_update_user(uint8_t index, bool clockwise) { - switch(biton32(layer_state)) { + switch(get_highest_layer(layer_state)) { case _BASE: clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP); break; @@ -145,4 +145,4 @@ void encoder_update_user(uint8_t index, bool clockwise) { clockwise ? tap_code(KC_MEDIA_NEXT_TRACK) : tap_code(KC_MEDIA_PREV_TRACK); break; } -} \ No newline at end of file +} From 46fe32a3dde8f8daf3d6cc947bb9ad36947bb965 Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:15:13 +1000 Subject: [PATCH 14/24] Update keyboards/abacus/keymaps/default/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/keymaps/default/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/abacus/keymaps/default/readme.md b/keyboards/abacus/keymaps/default/readme.md index 218a7e05b9d4..0c6098f0e980 100644 --- a/keyboards/abacus/keymaps/default/readme.md +++ b/keyboards/abacus/keymaps/default/readme.md @@ -1,4 +1,4 @@ -# The default keymap for abacus +# The default keymap for Abacus This is made based on my first few days of playing with it and honing in on what feels right. -I've repurposed the DIP switch function for the encoder switches and added some functionality for multiple layers also effecting the encoders output. \ No newline at end of file +I've repurposed the DIP switch function for the encoder switches and added some functionality for multiple layers also effecting the encoders output. From 78e6f284c15564aaf615b3fa856256fe7d1c3a0f Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:15:21 +1000 Subject: [PATCH 15/24] Update keyboards/abacus/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/readme.md b/keyboards/abacus/readme.md index 31282a299d35..274dcbd8a596 100644 --- a/keyboards/abacus/readme.md +++ b/keyboards/abacus/readme.md @@ -1,4 +1,4 @@ -# abacus +# Abacus ![abacus](https://i.imgur.com/IFtuWaK.jpg) From 253371edfc1a64b9626efbd6ba047504e552747e Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:15:31 +1000 Subject: [PATCH 16/24] Update keyboards/abacus/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/readme.md b/keyboards/abacus/readme.md index 274dcbd8a596..3c1fc5c2e7a7 100644 --- a/keyboards/abacus/readme.md +++ b/keyboards/abacus/readme.md @@ -2,7 +2,7 @@ ![abacus](https://i.imgur.com/IFtuWaK.jpg) -A first attempt at a PCB design for a mechanical keyboard. Includes encoder and RGB +A first attempt at a PCB design for a mechanical keyboard. Includes rotary encoder and RGB underglow. * PCB Files: [Abacus PCB Github](https://github.com/nickolaij/Abacus_Rev2) * Keyboard Maintainer: [nickolaij](https://github.com/nickolaij) From 66cf4fdcb92b1673e672fdd46787399dcdb2d847 Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:15:41 +1000 Subject: [PATCH 17/24] Update keyboards/abacus/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/abacus/rules.mk b/keyboards/abacus/rules.mk index 580947658d6d..d31121669617 100644 --- a/keyboards/abacus/rules.mk +++ b/keyboards/abacus/rules.mk @@ -15,7 +15,7 @@ BOOTLOADER = atmel-dfu # change yes to no to disable # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration @@ -33,4 +33,4 @@ HD44780_ENABLE = no # Enable support for HD44780 based LCDs UNICODEMAP_ENABLE = yes ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file +LTO_ENABLE = yes From 69ec9adf6e4f55f782173c2cda4f0eeefc664d3d Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:15:51 +1000 Subject: [PATCH 18/24] Update keyboards/abacus/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index ec6afcf19bab..9ba6da04d95b 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Abacus", "url": "https://www.github.com/nickolaij", "maintainer": "nickolaij", - "width": 12, + "width": 12.75, "height": 4, "layouts": { "LAYOUT": { From 0a35ff1332fddf518bb38bd47be36201641d39b3 Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:16:04 +1000 Subject: [PATCH 19/24] Update keyboards/abacus/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/info.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 9ba6da04d95b..f4b002a3ddd5 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -22,17 +22,17 @@ {"label":"k0b", "x":11, "y":0, "w":1.75}, {"label":"k10", "x":0, "y":1, "w":1.25}, - {"label":"k11", "x":1, "y":1, "w":1}, - {"label":"k12", "x":2, "y":1, "w":1}, - {"label":"k13", "x":3, "y":1, "w":1}, - {"label":"k14", "x":4, "y":1, "w":1}, - {"label":"k15", "x":5, "y":1, "w":1}, - {"label":"k16", "x":6, "y":1, "w":1}, - {"label":"k17", "x":7, "y":1, "w":1}, - {"label":"k18", "x":8, "y":1, "w":1}, - {"label":"k19", "x":9, "y":1, "w":1}, - {"label":"k1a", "x":10, "y":1, "w":1}, - {"label":"k1b", "x":11, "y":1, "w":1.5}, + {"label":"k11", "x":1.25, "y":1, "w":1}, + {"label":"k12", "x":2.25, "y":1, "w":1}, + {"label":"k13", "x":3.25, "y":1, "w":1}, + {"label":"k14", "x":4.25, "y":1, "w":1}, + {"label":"k15", "x":5.25, "y":1, "w":1}, + {"label":"k16", "x":6.25, "y":1, "w":1}, + {"label":"k17", "x":7.25, "y":1, "w":1}, + {"label":"k18", "x":8.25, "y":1, "w":1}, + {"label":"k19", "x":9.25, "y":1, "w":1}, + {"label":"k1a", "x":10.25, "y":1, "w":1}, + {"label":"k1b", "x":11.25, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.75}, {"label":"k21", "x":1, "y":2, "w":1}, From aa766206f88184588d864556a7abbe5c213b0161 Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 07:16:12 +1000 Subject: [PATCH 20/24] Update keyboards/abacus/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/info.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index f4b002a3ddd5..4a4a5ae1559f 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -35,17 +35,17 @@ {"label":"k1b", "x":11.25, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k21", "x":1, "y":2, "w":1}, - {"label":"k22", "x":2, "y":2, "w":1}, - {"label":"k23", "x":3, "y":2, "w":1}, - {"label":"k24", "x":4, "y":2, "w":1}, - {"label":"k25", "x":5, "y":2, "w":1}, - {"label":"k26", "x":6, "y":2, "w":1}, - {"label":"k27", "x":7, "y":2, "w":1}, - {"label":"k28", "x":8, "y":2, "w":1}, - {"label":"k29", "x":9, "y":2, "w":1}, - {"label":"k2a", "x":10, "y":2, "w":1}, - {"label":"k2b", "x":11, "y":2, "w":1.25}, + {"label":"k21", "x":1.75, "y":2, "w":1}, + {"label":"k22", "x":2.75, "y":2, "w":1}, + {"label":"k23", "x":3.75, "y":2, "w":1}, + {"label":"k24", "x":4.75, "y":2, "w":1}, + {"label":"k25", "x":5.75, "y":2, "w":1}, + {"label":"k26", "x":6.75, "y":2, "w":1}, + {"label":"k27", "x":7.75, "y":2, "w":1}, + {"label":"k28", "x":8.75, "y":2, "w":1}, + {"label":"k29", "x":9.75, "y":2, "w":1}, + {"label":"k2a", "x":10.75, "y":2, "w":1}, + {"label":"k2b", "x":11.75, "y":2, "w":1}, {"label":"k30", "x":0, "y":3, "w":1.25}, {"label":"k31", "x":1, "y":3, "w":1}, From c84be311790c2188c2ea4cc7c698648ae08c0a6d Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 14:57:59 +1000 Subject: [PATCH 21/24] Update keyboards/abacus/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/abacus/readme.md b/keyboards/abacus/readme.md index 3c1fc5c2e7a7..1f58a25a4ac3 100644 --- a/keyboards/abacus/readme.md +++ b/keyboards/abacus/readme.md @@ -4,10 +4,9 @@ A first attempt at a PCB design for a mechanical keyboard. Includes rotary encoder and RGB underglow. -* PCB Files: [Abacus PCB Github](https://github.com/nickolaij/Abacus_Rev2) * Keyboard Maintainer: [nickolaij](https://github.com/nickolaij) -* Hardware Supported: [Elite C Microcontroller](https://keeb.io/products/elite-c-usb-c-pro-micro-replacement-arduino-compatible-atmega32u4) or Pro Micro Microcontroller (Elite C has additional pins for encoder) -* Hardware Availability: https://github.com/nickolaij +* Hardware Supported: Abacus PCB, [Elite C Microcontroller](https://keeb.io/products/elite-c-usb-c-pro-micro-replacement-arduino-compatible-atmega32u4) or Pro Micro Microcontroller (Elite C has additional pins for encoder) +* Hardware Availability: [Abacus PCB Github](https://github.com/nickolaij/Abacus_Rev2) Make example for this keyboard (after setting up your build environment): From b9ee1c989da257d8b5e4525f2db7635a8c0ef138 Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 6 Mar 2020 14:58:22 +1000 Subject: [PATCH 22/24] Update keyboards/abacus/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/abacus/info.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 4a4a5ae1559f..dd4d15cd5212 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -48,15 +48,14 @@ {"label":"k2b", "x":11.75, "y":2, "w":1}, {"label":"k30", "x":0, "y":3, "w":1.25}, - {"label":"k31", "x":1, "y":3, "w":1}, - {"label":"k32", "x":2, "y":3, "w":1}, - {"label":"k33", "x":3, "y":3, "w":2.75}, - {"label":"k34", "x":4, "y":3, "w":2.75}, - {"label":"k35", "x":5, "y":3, "w":1}, - {"label":"k36", "x":6, "y":3, "w":1}, - {"label":"k37", "x":7, "y":3, "w":1}, - {"label":"k38", "x":8, "y":3, "w":1} - + {"label":"k31", "x":1.25, "y":3, "w":1}, + {"label":"k32", "x":2.25, "y":3, "w":1}, + {"label":"k33", "x":3.25, "y":3, "w":2.75}, + {"label":"k34", "x":6, "y":3, "w":2.75}, + {"label":"k35", "x":8.75, "y":3, "w":1}, + {"label":"k36", "x":9.75, "y":3, "w":1}, + {"label":"k37", "x":10.75, "y":3, "w":1}, + {"label":"k38", "x":11.75, "y":3, "w":1} ] } } From d7a2b3e887e34335918104324e81bc80ea51fe6c Mon Sep 17 00:00:00 2001 From: nickolaij Date: Sat, 7 Mar 2020 11:09:37 +1000 Subject: [PATCH 23/24] Update keyboards/abacus/rules.mk Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> --- keyboards/abacus/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/rules.mk b/keyboards/abacus/rules.mk index d31121669617..2060aa29ce5d 100644 --- a/keyboards/abacus/rules.mk +++ b/keyboards/abacus/rules.mk @@ -9,7 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = atmel-dfu +BOOTLOADER = qmk-dfu # Build Options # change yes to no to disable From 87f0ef558d57e0873dc9aa86161e63f427a405cf Mon Sep 17 00:00:00 2001 From: nickolaij Date: Fri, 13 Mar 2020 08:32:17 +1000 Subject: [PATCH 24/24] Update keyboards/abacus/rules.mk Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> --- keyboards/abacus/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/abacus/rules.mk b/keyboards/abacus/rules.mk index 2060aa29ce5d..d31121669617 100644 --- a/keyboards/abacus/rules.mk +++ b/keyboards/abacus/rules.mk @@ -9,7 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = qmk-dfu +BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable