]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Fix atom47 keyboard revision naming (#3013)
authorMaarten Dekkers <maartenwut@gmail.com>
Tue, 22 May 2018 02:12:56 +0000 (04:12 +0200)
committerDrashna Jaelre <drashna@live.com>
Tue, 22 May 2018 02:12:56 +0000 (19:12 -0700)
* Fixed Atom47 revisions, rev1 is rev3

* Remove rev1 folder

* Added bootloader to info.json

* Renamed layout

* Change readme for atom47

* Remove bootloader line from info.json

17 files changed:
keyboards/atom47/keymaps/LEdiodes/keymap.c
keyboards/atom47/keymaps/default/keymap.c
keyboards/atom47/keymaps/maartenwut/keymap.c
keyboards/atom47/readme.md
keyboards/atom47/rev1/config.h [deleted file]
keyboards/atom47/rev1/info.json [deleted file]
keyboards/atom47/rev1/rev1.c [deleted file]
keyboards/atom47/rev1/rev1.h [deleted file]
keyboards/atom47/rev1/rules.mk [deleted file]
keyboards/atom47/rev2/info.json
keyboards/atom47/rev2/rev2.h
keyboards/atom47/rev3/config.h [new file with mode: 0644]
keyboards/atom47/rev3/info.json [new file with mode: 0644]
keyboards/atom47/rev3/rev3.c [new file with mode: 0644]
keyboards/atom47/rev3/rev3.h [new file with mode: 0644]
keyboards/atom47/rev3/rules.mk [new file with mode: 0644]
keyboards/atom47/rules.mk

index b987c433fef19770d65d065142419277931f1fb0..56582a906df447e5979a6f7cda756319ff093a0a 100644 (file)
@@ -9,25 +9,25 @@
 #define _______ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_L0] = LAYOUT_ansi(
+[_L0] = LAYOUT(
   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(_L1),        \
   KC_LCTL,             KC_LGUI,        KC_LALT,        TG(_L3),        KC_SPC,                                 KC_SPC,                                 MO(_L2),        KC_RALT,        KC_APP,                                 KC_RCTRL),      \
  
-[_L2] = LAYOUT_ansi(
+[_L2] = LAYOUT(
   _______,             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,         _______,                                _______,        \
   _______,             _______,        _______,        _______,        _______,                                _______,                                _______,        _______,        _______,                                _______),       \
  
-[_L1] = LAYOUT_ansi(
+[_L1] = LAYOUT(
   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,                                _______,        \
   _______,             _______,        _______,        _______,        _______,                                _______,                                _______,        _______,        _______,                                _______),       \
  
-[_L3] = LAYOUT_ansi(
+[_L3] = LAYOUT(
   _______,             _______,        _______,           KC_7,           KC_8,           KC_9,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        \
   _______,             _______,        _______,           KC_4,           KC_5,           KC_6,        _______,        _______,        _______,        _______,        _______,                                _______,        \
   _______,             _______,        _______,           KC_1,           KC_2,           KC_3,        _______,        _______,        _______,        _______,        _______,                                _______,        \
index 945e66ab7b8a34cabb60e83710520ad15772e3be..a66961fba92e9deba956abdf0e5a3aa829aefbfe 100644 (file)
 #define _______ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_MA] = LAYOUT_ansi(
+[_MA] = LAYOUT(
   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] = LAYOUT_ansi(
+[_FN] = LAYOUT(
   _______,             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] = LAYOUT_ansi(
+[_FN1] = LAYOUT(
   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] = LAYOUT_ansi(
+[_PN] = LAYOUT(
   _______,             _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        \
   RGB_TOG,             RGB_HUI,        RGB_SAI,        RGB_VAI,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        \
   RGB_MOD,                                     RGB_HUD,        RGB_SAD,        RGB_VAD,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        _______,        \
index abe63a41e8abcf7c4214de7c73f92330af1e7bc0..33ed0936a0a80af118277a10bcc8becb216236e3 100644 (file)
@@ -19,19 +19,19 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_MA] = LAYOUT_ansi(
+[_MA] = LAYOUT(
   KC_GESC,             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),      \
 
-[_LO] = LAYOUT_ansi(
+[_LO] = LAYOUT(
   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,         \
   _______,                                     CTRLZ,          CTRLX,          CTRLC,          CTRLV,          _______,        _______,        KC_QUOT,        KC_LBRC,        KC_RBRC,        KC_BSLS,        _______,        \
   _______,             _______,        _______,        _______,                                _______,                                _______,                                _______,        _______,        _______,        RESET), \
 
-[_RA] = LAYOUT_ansi(
+[_RA] = LAYOUT(
   _______,             _______,        _______,        _______,        _______,        _______,        _______,        KC_PGUP,        KC_UP,          KC_PGDN,        _______,        _______,        _______,        \
   KC_CAPS,             _______,        _______,        _______,        _______,        _______,        _______,        KC_LEFT,        KC_DOWN,        KC_RIGHT,       _______,                                _______,        \
   _______,                                     _______,        _______,        _______,        _______,        _______,        _______,        _______,        KC_VOLD,        KC_VOLU,        KC_MPLY,        KC_PSCR,        \
index 1e96d42e9d2a8ac20e16832178ac56da5cc25091..66f599c6b38643687e5d51aad7e1b676ba3a6b42 100644 (file)
@@ -4,11 +4,11 @@
 
 ## Support
 Keyboard Maintainer: [Maarten Dekkers](https://github.com/maartenwut)  
-Hardware Supported: Atom47 rev3
+Hardware Supported: Atom47 rev2/rev3
 Hardware Availability: [GeekHack.com Group Buy](https://geekhack.org/index.php?topic=93447.msg2545221)  
 
 
-## Features
+## Features (rev3 and up)
 - QMK Firmware  
 - 6 Underglow RGB leds  
 - In-switch leds  
@@ -19,7 +19,7 @@ Hardware Availability: [GeekHack.com Group Buy](https://geekhack.org/index.php?t
 - CapsLock indicator  
 
 ## Build
-To build the default keymap, simply run `make atom47:default`.
+To build the default keymap for the latest revision, simply run `make atom47:default`. Specifiy the revision like so: `make atom47/rev3:default`.
 
 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/rev1/config.h b/keyboards/atom47/rev1/config.h
deleted file mode 100644 (file)
index d21d8ce..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-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 REV1_CONFIG_H
-#define REV1_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 Rev.1
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#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
-
-/* 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
-
-
-/* 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 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
diff --git a/keyboards/atom47/rev1/info.json b/keyboards/atom47/rev1/info.json
deleted file mode 100644 (file)
index 219e0f2..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "keyboard_name": "Atom47", 
-  "url": "", 
-  "maintainer": "qmk", 
-  "bootloader": "", 
-  "width": 13, 
-  "height": 4, 
-  "layouts": {
-    "LAYOUT_ansi": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":12, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3, "w":1.75}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3, "w":1.25}]
-    }
-  }
-}
diff --git a/keyboards/atom47/rev1/rev1.c b/keyboards/atom47/rev1/rev1.c
deleted file mode 100644 (file)
index 816b43b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "rev1.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
-    DDRE |= (1 << 6);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
diff --git a/keyboards/atom47/rev1/rev1.h b/keyboards/atom47/rev1/rev1.h
deleted file mode 100644 (file)
index f8329a7..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef ATOM47_REV1_H
-#define ATOM47_REV1_H
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_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,      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, 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}  \
-}
-
-
-#endif
diff --git a/keyboards/atom47/rev1/rules.mk b/keyboards/atom47/rev1/rules.mk
deleted file mode 100644 (file)
index 13e553b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-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)
index 219e0f27189c3c05a1c33d55a4861b1110ae720c..0170699906936d623a92aae3dc4661f2b0a0f597 100644 (file)
@@ -1,8 +1,7 @@
 {
   "keyboard_name": "Atom47", 
-  "url": "", 
-  "maintainer": "qmk", 
-  "bootloader": "", 
+  "url": "https://atomkb.eu/atom47", 
+  "maintainer": "Maarten Dekkers", 
   "width": 13, 
   "height": 4, 
   "layouts": {
index f0134511da62b011d1f498f011c0737f03066074..bfea34e062c25797020be452302f23acc24f6f39 100644 (file)
@@ -6,7 +6,7 @@
 // readability
 #define XXX KC_NO
 
-#define LAYOUT_ansi( \
+#define LAYOUT( \
     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, \
diff --git a/keyboards/atom47/rev3/config.h b/keyboards/atom47/rev3/config.h
new file mode 100644 (file)
index 0000000..8a91e29
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+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 REV3_CONFIG_H
+#define REV3_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 Rev.3
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#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
+
+/* 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
+
+
+/* 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 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
diff --git a/keyboards/atom47/rev3/info.json b/keyboards/atom47/rev3/info.json
new file mode 100644 (file)
index 0000000..0170699
--- /dev/null
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Atom47", 
+  "url": "https://atomkb.eu/atom47", 
+  "maintainer": "Maarten Dekkers", 
+  "width": 13, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT_ansi": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":12, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3, "w":1.75}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3, "w":1.25}]
+    }
+  }
+}
diff --git a/keyboards/atom47/rev3/rev3.c b/keyboards/atom47/rev3/rev3.c
new file mode 100644 (file)
index 0000000..2cd04fa
--- /dev/null
@@ -0,0 +1,24 @@
+#include "rev3.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
+    DDRE |= (1 << 6);
+}
+
+void led_set_kb(uint8_t usb_led) {
+    led_set_user(usb_led);
+}
diff --git a/keyboards/atom47/rev3/rev3.h b/keyboards/atom47/rev3/rev3.h
new file mode 100644 (file)
index 0000000..ad875bb
--- /dev/null
@@ -0,0 +1,23 @@
+#ifndef ATOM47_REV3_H
+#define ATOM47_REV3_H
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+#define LAYOUT( \
+    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,      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, 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}  \
+}
+
+
+#endif
diff --git a/keyboards/atom47/rev3/rules.mk b/keyboards/atom47/rev3/rules.mk
new file mode 100644 (file)
index 0000000..13e553b
--- /dev/null
@@ -0,0 +1,2 @@
+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)
index bebdb98d62552c90e3b529c6eb6cc39aff3f66f8..5f3dbb6686c012427afb65c05765588769b4de6b 100644 (file)
@@ -62,5 +62,5 @@ AUDIO_ENABLE = no
 UNICODE_ENABLE = no            # Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
 
-DEFAULT_FOLDER = atom47/rev2
+DEFAULT_FOLDER = atom47/rev3