summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/atom47/keymaps/LEdiodes/keymap.c8
-rw-r--r--keyboards/atom47/keymaps/default/keymap.c8
-rw-r--r--keyboards/atom47/keymaps/maartenwut/keymap.c6
-rw-r--r--keyboards/atom47/readme.md6
-rw-r--r--keyboards/atom47/rev2/info.json5
-rw-r--r--keyboards/atom47/rev2/rev2.h2
-rw-r--r--keyboards/atom47/rev3/config.h (renamed from keyboards/atom47/rev1/config.h)6
-rw-r--r--keyboards/atom47/rev3/info.json (renamed from keyboards/atom47/rev1/info.json)5
-rw-r--r--keyboards/atom47/rev3/rev3.c (renamed from keyboards/atom47/rev1/rev1.c)2
-rw-r--r--keyboards/atom47/rev3/rev3.h (renamed from keyboards/atom47/rev1/rev1.h)6
-rw-r--r--keyboards/atom47/rev3/rules.mk (renamed from keyboards/atom47/rev1/rules.mk)0
-rw-r--r--keyboards/atom47/rules.mk2
12 files changed, 27 insertions, 29 deletions
diff --git a/keyboards/atom47/keymaps/LEdiodes/keymap.c b/keyboards/atom47/keymaps/LEdiodes/keymap.c
index b987c433fe..56582a906d 100644
--- a/keyboards/atom47/keymaps/LEdiodes/keymap.c
+++ b/keyboards/atom47/keymaps/LEdiodes/keymap.c
@@ -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, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/atom47/keymaps/default/keymap.c b/keyboards/atom47/keymaps/default/keymap.c
index 945e66ab7b..a66961fba9 100644
--- a/keyboards/atom47/keymaps/default/keymap.c
+++ b/keyboards/atom47/keymaps/default/keymap.c
@@ -13,25 +13,25 @@
#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, _______, _______, _______, _______, _______, _______, _______, _______, \
diff --git a/keyboards/atom47/keymaps/maartenwut/keymap.c b/keyboards/atom47/keymaps/maartenwut/keymap.c
index abe63a41e8..33ed0936a0 100644
--- a/keyboards/atom47/keymaps/maartenwut/keymap.c
+++ b/keyboards/atom47/keymaps/maartenwut/keymap.c
@@ -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, \
diff --git a/keyboards/atom47/readme.md b/keyboards/atom47/readme.md
index 1e96d42e9d..66f599c6b3 100644
--- a/keyboards/atom47/readme.md
+++ b/keyboards/atom47/readme.md
@@ -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/rev2/info.json b/keyboards/atom47/rev2/info.json
index 219e0f2718..0170699906 100644
--- a/keyboards/atom47/rev2/info.json
+++ b/keyboards/atom47/rev2/info.json
@@ -1,8 +1,7 @@
{
"keyboard_name": "Atom47",
- "url": "",
- "maintainer": "qmk",
- "bootloader": "",
+ "url": "https://atomkb.eu/atom47",
+ "maintainer": "Maarten Dekkers",
"width": 13,
"height": 4,
"layouts": {
diff --git a/keyboards/atom47/rev2/rev2.h b/keyboards/atom47/rev2/rev2.h
index f0134511da..bfea34e062 100644
--- a/keyboards/atom47/rev2/rev2.h
+++ b/keyboards/atom47/rev2/rev2.h
@@ -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/rev1/config.h b/keyboards/atom47/rev3/config.h
index d21d8ce34d..8a91e29903 100644
--- a/keyboards/atom47/rev1/config.h
+++ b/keyboards/atom47/rev3/config.h
@@ -15,8 +15,8 @@ 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
+#ifndef REV3_CONFIG_H
+#define REV3_CONFIG_H
#include "config_common.h"
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEVICE_VER 0x0003
#define MANUFACTURER Vortex
#define PRODUCT Core
-#define DESCRIPTION Atom47 PCB for the Vortex Core Rev.1
+#define DESCRIPTION Atom47 PCB for the Vortex Core Rev.3
/* key matrix size */
#define MATRIX_ROWS 4
diff --git a/keyboards/atom47/rev1/info.json b/keyboards/atom47/rev3/info.json
index 219e0f2718..0170699906 100644
--- a/keyboards/atom47/rev1/info.json
+++ b/keyboards/atom47/rev3/info.json
@@ -1,8 +1,7 @@
{
"keyboard_name": "Atom47",
- "url": "",
- "maintainer": "qmk",
- "bootloader": "",
+ "url": "https://atomkb.eu/atom47",
+ "maintainer": "Maarten Dekkers",
"width": 13,
"height": 4,
"layouts": {
diff --git a/keyboards/atom47/rev1/rev1.c b/keyboards/atom47/rev3/rev3.c
index 816b43b9ab..2cd04fa767 100644
--- a/keyboards/atom47/rev1/rev1.c
+++ b/keyboards/atom47/rev3/rev3.c
@@ -1,4 +1,4 @@
-#include "rev1.h"
+#include "rev3.h"
#include "led.h"
void matrix_init_kb(void) {
diff --git a/keyboards/atom47/rev1/rev1.h b/keyboards/atom47/rev3/rev3.h
index f8329a7842..ad875bb404 100644
--- a/keyboards/atom47/rev1/rev1.h
+++ b/keyboards/atom47/rev3/rev3.h
@@ -1,12 +1,12 @@
-#ifndef ATOM47_REV1_H
-#define ATOM47_REV1_H
+#ifndef ATOM47_REV3_H
+#define ATOM47_REV3_H
#include "quantum.h"
// 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, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
diff --git a/keyboards/atom47/rev1/rules.mk b/keyboards/atom47/rev3/rules.mk
index 13e553b562..13e553b562 100644
--- a/keyboards/atom47/rev1/rules.mk
+++ b/keyboards/atom47/rev3/rules.mk
diff --git a/keyboards/atom47/rules.mk b/keyboards/atom47/rules.mk
index bebdb98d62..5f3dbb6686 100644
--- a/keyboards/atom47/rules.mk
+++ b/keyboards/atom47/rules.mk
@@ -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