From d777a058642326921785961d6a2e10f2eb826c44 Mon Sep 17 00:00:00 2001 From: Maarten Dekkers Date: Fri, 6 Apr 2018 01:16:35 +0200 Subject: [PATCH] Add support for rev3 of the Atom47 (#2672) * Added support for rev3 of the Atom47 * Updated Atom47 readme's * Fix redefine error on rev2 and add maartenwut's keymap * Fix redefine error on LEdiodes keymap --- keyboards/atom47/atom47.c | 11 +-- keyboards/atom47/atom47.h | 8 +- keyboards/atom47/config.h | 22 +++--- keyboards/atom47/keymaps/default/keymap.c | 35 ++++++--- keyboards/atom47/keymaps/default/readme.md | 11 +-- keyboards/atom47/keymaps/maartenwut/keymap.c | 46 ++++++++++++ keyboards/atom47/keymaps/maartenwut/readme.md | 1 + keyboards/atom47/readme.md | 28 ++++--- .../{keymaps/LEdiodes => rev2}/atom47.c | 0 .../{keymaps/LEdiodes => rev2}/atom47.h | 0 .../{keymaps/LEdiodes => rev2}/config.h | 6 +- .../atom47/rev2/keymaps/LEdiodes/atom47.c | 31 ++++++++ .../atom47/rev2/keymaps/LEdiodes/atom47.h | 25 +++++++ .../atom47/rev2/keymaps/LEdiodes/config.h | 74 +++++++++++++++++++ .../{ => rev2}/keymaps/LEdiodes/keymap.c | 2 +- .../{ => rev2}/keymaps/LEdiodes/rules.mk | 0 .../atom47/rev2/keymaps/default/keymap.c | 39 ++++++++++ .../atom47/rev2/keymaps/default/readme.md | 1 + keyboards/atom47/rev2/readme.md | 23 ++++++ keyboards/atom47/rev2/rules.mk | 65 ++++++++++++++++ keyboards/atom47/rules.mk | 4 +- 21 files changed, 364 insertions(+), 68 deletions(-) create mode 100644 keyboards/atom47/keymaps/maartenwut/keymap.c create mode 100644 keyboards/atom47/keymaps/maartenwut/readme.md rename keyboards/atom47/{keymaps/LEdiodes => rev2}/atom47.c (100%) rename keyboards/atom47/{keymaps/LEdiodes => rev2}/atom47.h (100%) rename keyboards/atom47/{keymaps/LEdiodes => rev2}/config.h (99%) create mode 100644 keyboards/atom47/rev2/keymaps/LEdiodes/atom47.c create mode 100644 keyboards/atom47/rev2/keymaps/LEdiodes/atom47.h create mode 100644 keyboards/atom47/rev2/keymaps/LEdiodes/config.h rename keyboards/atom47/{ => rev2}/keymaps/LEdiodes/keymap.c (98%) rename keyboards/atom47/{ => rev2}/keymaps/LEdiodes/rules.mk (100%) create mode 100644 keyboards/atom47/rev2/keymaps/default/keymap.c create mode 100644 keyboards/atom47/rev2/keymaps/default/readme.md create mode 100644 keyboards/atom47/rev2/readme.md create mode 100644 keyboards/atom47/rev2/rules.mk diff --git a/keyboards/atom47/atom47.c b/keyboards/atom47/atom47.c index 7b839e796..fac22f778 100644 --- a/keyboards/atom47/atom47.c +++ b/keyboards/atom47/atom47.c @@ -16,16 +16,9 @@ void matrix_scan_kb(void) { void led_init_ports(void) { // * Set our LED pins as output - DDRB &= ~(1<<5); + DDRE |= (1 << 6); } void led_set_kb(uint8_t usb_led) { - if (usb_led & (1<. // ROWS: Top to bottom, COLS: Left to right -#define MATRIX_ROW_PINS {B1,B2,B3,B7} -#define MATRIX_COL_PINS {D7,D5,F0,F1,F4,F6,F7,D4,C7,C6,D6,B5,B4} +#define MATRIX_ROW_PINS {B3,B2,B1,B0} +#define MATRIX_COL_PINS {B7,F0,F1,F4,F6,D4,D6,D7,B4,B5,C6,C7,F7} #define UNUSED_PINS #define BACKLIGHT_PIN B6 @@ -49,10 +49,6 @@ along with this program. If not, see . /* Set 0 if debouncing isn't needed */ #define DEBOUNCING_DELAY 5 -/* 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 /* key combination for command */ #define IS_COMMAND() ( \ @@ -63,11 +59,11 @@ along with this program. If not, see . */ #define BACKLIGHT_LEVELS 4 +#define RGB_DI_PIN F5 // The pin the LED strip is connected to +#define RGBLED_NUM 6 // Number of LEDs in your strip + +#define QMK_ESC_OUTPUT B7 // usually COL +#define QMK_ESC_INPUT B3 // usually ROW +#define QMK_LED E6 + #endif - -#define RGB_DI_PIN D0 // The pin the LED strip is connected to -#define RGBLED_NUM 1 // Number of LEDs in your strip - -#define QMK_ESC_OUTPUT D7 // usually COL -#define QMK_ESC_INPUT B1 // usually ROW -#define QMK_LED B6 \ No newline at end of file diff --git a/keyboards/atom47/keymaps/default/keymap.c b/keyboards/atom47/keymaps/default/keymap.c index cd8e622f2..233ff2b8b 100644 --- a/keyboards/atom47/keymaps/default/keymap.c +++ b/keyboards/atom47/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "atom47.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. @@ -16,24 +16,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MA] = KEYMAP_ANSI( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \ - KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \ + KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \ [_FN] = KEYMAP_ANSI( _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \ KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \ - _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ + _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ [_FN1] = KEYMAP_ANSI( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \ - _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ + _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ [_PN] = KEYMAP_ANSI( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), -}; \ No newline at end of file + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, \ + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), +}; + +void led_set_user(uint8_t usb_led) { + if (usb_led & (1<. */ #define BACKLIGHT_LEVELS 4 -#endif - #define RGB_DI_PIN D0 // The pin the LED strip is connected to #define RGBLED_NUM 1 // Number of LEDs in your strip #define QMK_ESC_OUTPUT D7 // usually COL #define QMK_ESC_INPUT B1 // usually ROW -#define QMK_LED B6 \ No newline at end of file +#define QMK_LED B6 + +#endif diff --git a/keyboards/atom47/rev2/keymaps/LEdiodes/atom47.c b/keyboards/atom47/rev2/keymaps/LEdiodes/atom47.c new file mode 100644 index 000000000..7b839e796 --- /dev/null +++ b/keyboards/atom47/rev2/keymaps/LEdiodes/atom47.c @@ -0,0 +1,31 @@ +#include "atom47.h" +#include "led.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + matrix_init_user(); + led_init_ports(); +}; + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + matrix_scan_user(); +}; + +void led_init_ports(void) { + // * Set our LED pins as output + DDRB &= ~(1<<5); +} + +void led_set_kb(uint8_t usb_led) { + if (usb_led & (1<. +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0003 +#define MANUFACTURER Vortex +#define PRODUCT Core +#define DESCRIPTION Atom47 PCB for the Vortex Core + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 13 + +// ROWS: Top to bottom, COLS: Left to right + +#define MATRIX_ROW_PINS {B1,B2,B3,B7} +#define MATRIX_COL_PINS {D7,D5,F0,F1,F4,F6,F7,D4,C7,C6,D6,B5,B4} +#define UNUSED_PINS + +#define BACKLIGHT_PIN B6 + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 5 + +/* 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 + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* Backlight configuration + */ +#define BACKLIGHT_LEVELS 4 + +#define RGB_DI_PIN D0 // The pin the LED strip is connected to +#define RGBLED_NUM 1 // Number of LEDs in your strip + +#define QMK_ESC_OUTPUT D7 // usually COL +#define QMK_ESC_INPUT B1 // usually ROW +#define QMK_LED B6 + +#endif + diff --git a/keyboards/atom47/keymaps/LEdiodes/keymap.c b/keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c similarity index 98% rename from keyboards/atom47/keymaps/LEdiodes/keymap.c rename to keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c index 3ea8609b6..75c8654ba 100644 --- a/keyboards/atom47/keymaps/LEdiodes/keymap.c +++ b/keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "atom47.h" // These are all aliases for the function layers. #define _L0 0 diff --git a/keyboards/atom47/keymaps/LEdiodes/rules.mk b/keyboards/atom47/rev2/keymaps/LEdiodes/rules.mk similarity index 100% rename from keyboards/atom47/keymaps/LEdiodes/rules.mk rename to keyboards/atom47/rev2/keymaps/LEdiodes/rules.mk diff --git a/keyboards/atom47/rev2/keymaps/default/keymap.c b/keyboards/atom47/rev2/keymaps/default/keymap.c new file mode 100644 index 000000000..1473863c4 --- /dev/null +++ b/keyboards/atom47/rev2/keymaps/default/keymap.c @@ -0,0 +1,39 @@ +#include "atom47.h" + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +#define _MA 0 //Main layer +#define _FN 1 //Fn +#define _FN1 2 //Fn1 +#define _PN 3 //Pn + +#define _______ KC_TRNS + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_MA] = KEYMAP_ANSI( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC, \ + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(_FN1), \ + KC_LCTL, KC_LGUI, KC_LALT, MO(_PN), KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_APP, KC_RCTRL), \ + +[_FN] = KEYMAP_ANSI( + _______, KC_VOLD, KC_VOLU, KC_MUTE, RESET, _______, KC_CALC, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, \ + KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_INS, _______, \ + _______, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DEC, BL_INC, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ + +[_FN1] = KEYMAP_ANSI( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, \ + _______, _______, _______, _______, _______, KC_QUOT, KC_SLSH, KC_LBRC, KC_RBRC, KC_BSLS, KC_RSFT, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \ + +[_PN] = KEYMAP_ANSI( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), +}; diff --git a/keyboards/atom47/rev2/keymaps/default/readme.md b/keyboards/atom47/rev2/keymaps/default/readme.md new file mode 100644 index 000000000..ab86b4f12 --- /dev/null +++ b/keyboards/atom47/rev2/keymaps/default/readme.md @@ -0,0 +1 @@ +This is the default keymap as found on the Vortex Core, with some added buttons for backlight control. diff --git a/keyboards/atom47/rev2/readme.md b/keyboards/atom47/rev2/readme.md new file mode 100644 index 000000000..18ee85d54 --- /dev/null +++ b/keyboards/atom47/rev2/readme.md @@ -0,0 +1,23 @@ +# Atom47 rev2 + +This is the keymap for rev2 of the Atom47. Only 9 of those have been sold for testing purposes. It had a slightly misaligned usb port and the pcb was too thick (should've been 1.2mm instead of 1.6mm). The pcb only supports the default hardware layout, although /u/ChrisSwires has [modified his](https://www.reddit.com/r/MechanicalKeyboards/comments/7n2dua/not_your_average_core_with_honeywell/) and put a big spacebar in it. + +## Support +Keyboard Maintainer: [Matthew Kerfoot(https://github.com/mkerfoot) +Hardware Supported: Atom47 rev2 +Hardware Availability: None + + +## Features +- QMK Firmware +- In-switch leds +- Through-hole micro usb connector (less likely to break off!) +- Easily reachable reset button under the spacebar +- In-switch CapsLock indicator + +## Build +To build the default keymap, simply run `make atom47/rev2:default`. + +For an alternative, heavily modified layout you would just need to run `make atom47/rev2:LEdiodes`. + +See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/atom47/rev2/rules.mk b/keyboards/atom47/rev2/rules.mk new file mode 100644 index 000000000..d446d3a69 --- /dev/null +++ b/keyboards/atom47/rev2/rules.mk @@ -0,0 +1,65 @@ +# MCU name +#MCU = at90usb1287 +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 + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = no # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality (+4870) +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality (+1150) +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID diff --git a/keyboards/atom47/rules.mk b/keyboards/atom47/rules.mk index d446d3a69..9b3263afd 100644 --- a/keyboards/atom47/rules.mk +++ b/keyboards/atom47/rules.mk @@ -56,8 +56,8 @@ MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality (+4870) +NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality (+4870) BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality (+1150) MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no