From bfd85ebf1a86d9d2d0a8f071c74af9b8dbc8b17e Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Thu, 29 Nov 2018 22:58:19 -0500 Subject: [PATCH 1/5] Add maxim keymap --- keyboards/fourier/keymaps/default/rules.mk | 3 -- keyboards/fourier/keymaps/maxim/config.h | 31 +++++++++++++++ keyboards/fourier/keymaps/maxim/keymap.c | 46 ++++++++++++++++++++++ 3 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 keyboards/fourier/keymaps/maxim/config.h create mode 100644 keyboards/fourier/keymaps/maxim/keymap.c diff --git a/keyboards/fourier/keymaps/default/rules.mk b/keyboards/fourier/keymaps/default/rules.mk index 457a3d01d4a4..e69de29bb2d1 100644 --- a/keyboards/fourier/keymaps/default/rules.mk +++ b/keyboards/fourier/keymaps/default/rules.mk @@ -1,3 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/fourier/keymaps/maxim/config.h b/keyboards/fourier/keymaps/maxim/config.h new file mode 100644 index 000000000000..20e49c421956 --- /dev/null +++ b/keyboards/fourier/keymaps/maxim/config.h @@ -0,0 +1,31 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config_common.h" + +/* Use I2C or Serial, not both */ + +#define USE_SERIAL +// #define USE_I2C + +#endif diff --git a/keyboards/fourier/keymaps/maxim/keymap.c b/keyboards/fourier/keymaps/maxim/keymap.c new file mode 100644 index 000000000000..a06cb68fc86f --- /dev/null +++ b/keyboards/fourier/keymaps/maxim/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +extern keymap_config_t keymap_config; + +// 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 _BASE 0 +#define _FN1 1 +#define _FN2 2 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, +}; + +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define FN1 MO(_FN1) +#define FN2 MO(_FN2) +#define SPFN1 LT(_FN1, KC_SPACE) +#define BSFN2 LT(_FN2, KC_BSPC) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_QUOT, 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, + XXXXXXX, KC_LCTL, KC_LALT, XXXXXXX, KC_SPC, FN1, KC_RCTL, KC_RGUI, FN2, XXXXXXX + ), + + [_FN1] = LAYOUT( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, + RESET, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, + RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_FN2] = LAYOUT( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, + _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN, _______, + _______, _______, _______, KC_DEL, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______ + ) + +}; From c0b18e6de74f8b062bdc8e6a453d5a50e09224f1 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Sun, 2 Dec 2018 15:19:07 -0500 Subject: [PATCH 2/5] Add QMK DFU configuration to Fourier --- keyboards/fourier/rev1/config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/fourier/rev1/config.h b/keyboards/fourier/rev1/config.h index 3bd67228c3dd..322c0697e8dd 100644 --- a/keyboards/fourier/rev1/config.h +++ b/keyboards/fourier/rev1/config.h @@ -38,6 +38,11 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F4, D7, E6, B4 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } +#define QMK_ESC_OUTPUT F5 +#define QMK_ESC_INPUT F4 +#define QMK_LED B0 +#define QMK_SPEAKER C6 + /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST From 8e6ec1b617a2f65241c194da61449085ecd9621f Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 25 Jan 2019 13:04:35 -0800 Subject: [PATCH 3/5] Update config.h --- keyboards/fourier/keymaps/maxim/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/fourier/keymaps/maxim/config.h b/keyboards/fourier/keymaps/maxim/config.h index 20e49c421956..fbf81c34682a 100644 --- a/keyboards/fourier/keymaps/maxim/config.h +++ b/keyboards/fourier/keymaps/maxim/config.h @@ -18,8 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#pragma once #include "config_common.h" From 138d3a3cf2ac0e63ab266efacb992f42bae2749e Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 25 Jan 2019 13:04:48 -0800 Subject: [PATCH 4/5] Update keymap.c --- keyboards/fourier/keymaps/maxim/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/fourier/keymaps/maxim/keymap.c b/keyboards/fourier/keymaps/maxim/keymap.c index a06cb68fc86f..68bd649ecc2b 100644 --- a/keyboards/fourier/keymaps/maxim/keymap.c +++ b/keyboards/fourier/keymaps/maxim/keymap.c @@ -14,8 +14,7 @@ enum custom_keycodes { QWERTY = SAFE_RANGE, }; -#define _______ KC_TRNS -#define XXXXXXX KC_NO + #define FN1 MO(_FN1) #define FN2 MO(_FN2) #define SPFN1 LT(_FN1, KC_SPACE) From e2c12bbf558ff70a2f8569af1de2369d97725f29 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 25 Jan 2019 13:09:12 -0800 Subject: [PATCH 5/5] Update config.h --- keyboards/fourier/keymaps/maxim/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/fourier/keymaps/maxim/config.h b/keyboards/fourier/keymaps/maxim/config.h index fbf81c34682a..fb13b56cdc7a 100644 --- a/keyboards/fourier/keymaps/maxim/config.h +++ b/keyboards/fourier/keymaps/maxim/config.h @@ -27,4 +27,3 @@ along with this program. If not, see . #define USE_SERIAL // #define USE_I2C -#endif