summaryrefslogtreecommitdiffstats
path: root/keyboards/atom47
diff options
context:
space:
mode:
authorMaarten Dekkers <maartenwut@gmail.com>2018-04-06 01:16:35 +0200
committerJack Humbert <jack.humb@gmail.com>2018-04-05 19:16:35 -0400
commitd777a058642326921785961d6a2e10f2eb826c44 (patch)
treeb8577b08659a3318204296f0dd6cae6866cb0ac5 /keyboards/atom47
parent7bbc9ccc31b2bc4dda8dc4c000df48a024f072a9 (diff)
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
Diffstat (limited to 'keyboards/atom47')
-rw-r--r--keyboards/atom47/atom47.c11
-rw-r--r--keyboards/atom47/atom47.h8
-rw-r--r--keyboards/atom47/config.h20
-rw-r--r--keyboards/atom47/keymaps/default/keymap.c35
-rw-r--r--keyboards/atom47/keymaps/default/readme.md11
-rw-r--r--keyboards/atom47/keymaps/maartenwut/keymap.c46
-rw-r--r--keyboards/atom47/keymaps/maartenwut/readme.md1
-rw-r--r--keyboards/atom47/readme.md28
-rw-r--r--keyboards/atom47/rev2/atom47.c (renamed from keyboards/atom47/keymaps/LEdiodes/atom47.c)0
-rw-r--r--keyboards/atom47/rev2/atom47.h (renamed from keyboards/atom47/keymaps/LEdiodes/atom47.h)0
-rw-r--r--keyboards/atom47/rev2/config.h (renamed from keyboards/atom47/keymaps/LEdiodes/config.h)6
-rw-r--r--keyboards/atom47/rev2/keymaps/LEdiodes/atom47.c31
-rw-r--r--keyboards/atom47/rev2/keymaps/LEdiodes/atom47.h25
-rw-r--r--keyboards/atom47/rev2/keymaps/LEdiodes/config.h74
-rw-r--r--keyboards/atom47/rev2/keymaps/LEdiodes/keymap.c (renamed from keyboards/atom47/keymaps/LEdiodes/keymap.c)2
-rw-r--r--keyboards/atom47/rev2/keymaps/LEdiodes/rules.mk (renamed from keyboards/atom47/keymaps/LEdiodes/rules.mk)0
-rw-r--r--keyboards/atom47/rev2/keymaps/default/keymap.c39
-rw-r--r--keyboards/atom47/rev2/keymaps/default/readme.md1
-rw-r--r--keyboards/atom47/rev2/readme.md23
-rw-r--r--keyboards/atom47/rev2/rules.mk65
-rw-r--r--keyboards/atom47/rules.mk4
21 files changed, 363 insertions, 67 deletions
diff --git a/keyboards/atom47/atom47.c b/keyboards/atom47/atom47.c
index 7b839e7967..fac22f7786 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<<USB_LED_CAPS_LOCK)) {
- // Turn capslock on
- PORTF |= (1<<5);
- } else {
- // Turn capslock off
- PORTF &= ~(1<<5);
- }
- led_set_user(usb_led);
+ led_set_user(usb_led);
}
diff --git a/keyboards/atom47/atom47.h b/keyboards/atom47/atom47.h
index 2c19a20cc5..eddc5c8f87 100644
--- a/keyboards/atom47/atom47.h
+++ b/keyboards/atom47/atom47.h
@@ -9,14 +9,14 @@
#define KEYMAP_ANSI( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
- k30, k31, k32, k33, k34, k36, k38, k39, k3a, k3c \
+ k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
+ k30, k31, k32, k33, k35, k37, k39, k3a, k3b, k3c \
) \
{ \
{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c}, \
- {k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3a, XXX, k3c} \
+ {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
+ {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c} \
}
void matrix_init_user(void);
diff --git a/keyboards/atom47/config.h b/keyboards/atom47/config.h
index 410650f719..5743a9eb53 100644
--- a/keyboards/atom47/config.h
+++ b/keyboards/atom47/config.h
@@ -34,8 +34,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// 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 <http://www.gnu.org/licenses/>.
/* 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 <http://www.gnu.org/licenses/>.
*/
#define BACKLIGHT_LEVELS 4
-#endif
+#define RGB_DI_PIN F5 // The pin the LED strip is connected to
+#define RGBLED_NUM 6 // Number of LEDs in your strip
-#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 B7 // usually COL
+#define QMK_ESC_INPUT B3 // usually ROW
+#define QMK_LED E6
-#define QMK_ESC_OUTPUT D7 // usually COL
-#define QMK_ESC_INPUT B1 // usually ROW
-#define QMK_LED B6 \ No newline at end of file
+#endif
diff --git a/keyboards/atom47/keymaps/default/keymap.c b/keyboards/atom47/keymaps/default/keymap.c
index cd8e622f20..233ff2b8b7 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<<USB_LED_CAPS_LOCK)) {
+ // Turn capslock on
+ PORTE &= ~(1 << 6);
+
+
+ } else {
+ // Turn capslock off
+ PORTE |= (1 << 6);
+ }
+}
+
diff --git a/keyboards/atom47/keymaps/default/readme.md b/keyboards/atom47/keymaps/default/readme.md
index 02422eb976..6795953857 100644
--- a/keyboards/atom47/keymaps/default/readme.md
+++ b/keyboards/atom47/keymaps/default/readme.md
@@ -1,10 +1 @@
-To be updated...
-
-
-// This layer is just a blank template to be copied for easy layer creation. please don not edit it.
-
- [_LX] = KEYMAP_ANSI(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET),
+This is the default keymap as found on the Vortex Core, with some added buttons for RGB and backlight control.
diff --git a/keyboards/atom47/keymaps/maartenwut/keymap.c b/keyboards/atom47/keymaps/maartenwut/keymap.c
new file mode 100644
index 0000000000..7de75e10ec
--- /dev/null
+++ b/keyboards/atom47/keymaps/maartenwut/keymap.c
@@ -0,0 +1,46 @@
+#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 _LO 1 //FN1
+#define _RA 2 //FN
+
+#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_SLSH, KC_RSFT, \
+ KC_LCTL, KC_LGUI, KC_LALT, MO(_LO), KC_SPC, KC_SPC, MO(_RA), KC_RALT, KC_APP, KC_RCTRL), \
+
+[_RA] = KEYMAP_ANSI(
+ _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, _______, _______, _______, \
+ KC_CAPS, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, KC_PSCR, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), \
+
+[_LO] = 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_LBRC, KC_RBRC, KC_BSLS, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET), \
+
+};
+
+void led_set_user(uint8_t usb_led) {
+ if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+ // Turn capslock on
+ PORTE &= ~(1 << 6);
+
+
+ } else {
+ // Turn capslock off
+ PORTE |= (1 << 6);
+ }
+}
+
diff --git a/keyboards/atom47/keymaps/maartenwut/readme.md b/keyboards/atom47/keymaps/maartenwut/readme.md
new file mode 100644
index 0000000000..6795953857
--- /dev/null
+++ b/keyboards/atom47/keymaps/maartenwut/readme.md
@@ -0,0 +1 @@
+This is the default keymap as found on the Vortex Core, with some added buttons for RGB and backlight control.
diff --git a/keyboards/atom47/readme.md b/keyboards/atom47/readme.md
index fec7843ae4..f2ec08500e 100644
--- a/keyboards/atom47/readme.md
+++ b/keyboards/atom47/readme.md
@@ -1,28 +1,26 @@
-# ATOM47
+# Atom47
-![ATOM47](https://i.imgur.com/rjrFTKT.png)
+![Atom47](https://i.imgur.com/Wwflqvt.png)
## Support
-Keyboard Maintainer: [Matthew Kerfoot(https://github.com/mkerfoot)
-Hardware Supported: ATOM47
+Keyboard Maintainer: [Maarten Dekkers(https://github.com/maartenwut)
+Hardware Supported: Atom47 rev3
Hardware Availability: [GeekHack.com Group Buy](https://geekhack.org/index.php?topic=93447.msg2545221)
## Features
-QMK Firmware
-6 Underglow RGB leds
-In-switch leds
-Through-hole micro usb connector (less likely to break off!)
-South facing leds for the QMX/Zealencio users
-Multiple layouts
-Easily reachable reset button under the spacebar
-CapsLock indicator
+- QMK Firmware
+- 6 Underglow RGB leds
+- In-switch leds
+- Through-hole micro usb connector (less likely to break off!)
+- South facing leds for the QMX/Zealencio users
+- Multiple layouts
+- Easily reachable reset button under the spacebar
+- CapsLock indicator
## Build
To build the default keymap, simply run `make atom47:default`.
-For an alternative, heavily modified layout you would just need to run `make atom47: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.
-![ATOM47](https://i.imgur.com/WebeUOF.png)
+![Atom47](https://i.imgur.com/JfYnOba.jpg)
diff --git a/keyboards/atom47/keymaps/LEdiodes/atom47.c b/keyboards/atom47/rev2/atom47.c
index 7b839e7967..7b839e7967 100644
--- a/keyboards/atom47/keymaps/LEdiodes/atom47.c
+++ b/keyboards/atom47/rev2/atom47.c
diff --git a/keyboards/atom47/keymaps/LEdiodes/atom47.h b/keyboards/atom47/rev2/atom47.h
index 2c19a20cc5..2c19a20cc5 100644
--- a/keyboards/atom47/keymaps/LEdiodes/atom47.h
+++ b/keyboards/atom47/rev2/atom47.h
diff --git a/keyboards/atom47/keymaps/LEdiodes/config.h b/keyboards/atom47/rev2/config.h
index 410650f719..82e8baaefb 100644
--- a/keyboards/atom47/keymaps/LEdiodes/config.h
+++ b/keyboards/atom47/rev2/config.h
@@ -63,11 +63,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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 0000000000..7b839e7967
--- /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<<USB_LED_CAPS_LOCK)) {
+ // Turn capslock on
+ PORTF |= (1<<5);
+ } else {
+ // Turn capslock off
+ PORTF &= ~(1<<5);
+ }
+ led_set_user(usb_led);
+}
diff --git a/keyboards/atom47/rev2/keymaps/LEdiodes/atom47.h b/keyboards/atom47/rev2/keymaps/LEdiodes/atom47.h
new file mode 100644
index 0000000000..2c19a20cc5
--- /dev/null
+++ b/keyboards/atom47/rev2/keymaps/LEdiodes/atom47.h
@@ -0,0 +1,25 @@
+#ifndef ATOM47_H
+#define ATOM47_H
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+#define KEYMAP_ANSI( \
+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, \
+ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c, \
+ k30, k31, k32, k33, k34, k36, k38, k39, k3a, k3c \
+) \
+{ \
+ {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
+ {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
+ {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c}, \
+ {k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3a, XXX, k3c} \
+}
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
+
+#endif
diff --git a/keyboards/atom47/rev2/keymaps/LEdiodes/config.h b/keyboards/atom47/rev2/keymaps/LEdiodes/config.h
new file mode 100644
index 0000000000..e054f27759
--- /dev/null
+++ b/keyboards/atom47/rev2/keymaps/LEdiodes/config.h
@@ -0,0 +1,74 @@
+/*
+Copyright 2012 Maarten Dekkers <atomkeeb@gmail.com
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#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
index 3ea8609b61..75c8654ba6 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
index d446d3a699..d446d3a699 100644
--- a/keyboards/atom47/keymaps/LEdiodes/rules.mk
+++ b/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 0000000000..1473863c4e
--- /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 0000000000..ab86b4f128
--- /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 0000000000..18ee85d54f
--- /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 0000000000..d446d3a699
--- /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 d446d3a699..9b3263afd6 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