Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor fourier to use split common code #4582

Merged
merged 3 commits into from
Dec 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions keyboards/fourier/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ 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
#pragma once

#include "config_common.h"

#ifdef SUBPROJECT_rev1
#include "rev1/config.h"
#endif

#endif
8 changes: 3 additions & 5 deletions keyboards/fourier/fourier.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#ifndef FOURIER_H
#define FOURIER_H

#include "quantum.h"
#pragma once

#ifdef KEYBOARD_fourier_rev1
#include "rev1.h"
#endif

#include "quantum.h"

// Used to create a keymap using only KC_ prefixed keys
#define LAYOUT_kc( \
LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
Expand All @@ -20,4 +19,3 @@
KC_##LC1, KC_##LC2, KC_##LC3, KC_##LC4, KC_##LC5, KC_##LC6, KC_##RC1, KC_##RC3, KC_##RC4, KC_##RC5, KC_##RC6, KC_##RC7, \
KC_##LD1, KC_##LD2, KC_##LD3, KC_##LD4, KC_##LD5, KC_##RD1, KC_##RD4, KC_##RD5, KC_##RD6, KC_##RD7 \
)
#endif
162 changes: 0 additions & 162 deletions keyboards/fourier/i2c.c

This file was deleted.

49 changes: 0 additions & 49 deletions keyboards/fourier/i2c.h

This file was deleted.

8 changes: 1 addition & 7 deletions keyboards/fourier/keymaps/default/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,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 CONFIG_USER_H
#define CONFIG_USER_H

#include "config_common.h"
#pragma once

/* Use I2C or Serial, not both */

#define USE_SERIAL
// #define USE_I2C

#endif
4 changes: 0 additions & 4 deletions keyboards/fourier/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#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
Expand All @@ -14,8 +12,6 @@ enum custom_keycodes {
QWERTY = SAFE_RANGE,
};

#define _______ KC_TRNS
#define XXXXXXX KC_NO
#define KC_FN1 MO(_FN1)
#define KC_FN2 MO(_FN2)
#define KC_SPFN1 LT(_FN1, KC_SPACE)
Expand Down
3 changes: 0 additions & 3 deletions keyboards/fourier/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
ifndef QUANTUM_DIR
include ../../../../Makefile
endif
Loading