aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-11-16 19:49:38 -0500
committerclimbalima <climbalima@gmail.com>2016-11-16 19:49:38 -0500
commit21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch)
tree4d51176d38e38de3aed6e69d45ce1f742be279ba
parent668c7397023ad5c9d338b2165699af453f84af0a (diff)
downloadqmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.gz
qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.zip
should have fixed conflixed
Diffstat
-rw-r--r--keyboards/lets_split/Makefile79
-rw-r--r--keyboards/lets_split/config.h13
-rw-r--r--keyboards/lets_split/keymaps/default/keymap.c19
-rw-r--r--keyboards/lets_split/lets_split.c7
-rw-r--r--keyboards/lets_split/rev1/config.h26
-rw-r--r--keyboards/lets_split/rev1/rev1.c6
-rw-r--r--keyboards/lets_split/rev1/rev1.h5
-rw-r--r--keyboards/lets_split/rev2/config.h18
-rw-r--r--keyboards/lets_split/rev2/rev2.c6
-rw-r--r--keyboards/lets_split/rev2/rev2.h5
-rw-r--r--keyboards/maxipad/Makefile78
-rw-r--r--keyboards/maxipad/config.h9
-rw-r--r--keyboards/maxipad/keymaps/default/keymap.c7
13 files changed, 10 insertions, 268 deletions
diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile
index 6ce6e4373..4e2a6f00f 100644
--- a/keyboards/lets_split/Makefile
+++ b/keyboards/lets_split/Makefile
@@ -1,82 +1,3 @@
1<<<<<<< HEAD
2ifndef MAKEFILE_INCLUDED 1ifndef MAKEFILE_INCLUDED
3=======
4SRC += matrix.c \
5 i2c.c \
6 split_util.c \
7 serial.c
8
9# MCU name
10#MCU = at90usb1287
11MCU = atmega32u4
12
13# Processor frequency.
14# This will define a symbol, F_CPU, in all source code files equal to the
15# processor frequency in Hz. You can then use this symbol in your source code to
16# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
17# automatically to create a 32-bit value in your source code.
18#
19# This will be an integer division of F_USB below, as it is sourced by
20# F_USB after it has run through any CPU prescalers. Note that this value
21# does not *change* the processor frequency - it should merely be updated to
22# reflect the processor speed set externally so that the code can use accurate
23# software delays.
24F_CPU = 16000000
25
26#
27# LUFA specific
28#
29# Target architecture (see library "Board Types" documentation).
30ARCH = AVR8
31
32# Input clock frequency.
33# This will define a symbol, F_USB, in all source code files equal to the
34# input clock frequency (before any prescaling is performed) in Hz. This value may
35# differ from F_CPU if prescaling is used on the latter, and is required as the
36# raw input clock is fed directly to the PLL sections of the AVR for high speed
37# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
38# at the end, this will be done automatically to create a 32-bit value in your
39# source code.
40#
41# If no clock division is performed on the input clock inside the AVR (via the
42# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
43F_USB = $(F_CPU)
44
45# Interrupt driven control endpoint task(+60)
46OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
47
48
49# Boot Section Size in *bytes*
50# Teensy halfKay 512
51# Teensy++ halfKay 1024
52# Atmel DFU loader 4096
53# LUFA bootloader 4096
54# USBaspLoader 2048
55OPT_DEFS += -DBOOTLOADER_SIZE=4096
56
57# Build Options
58# change to "no" to disable the options, or define them in the Makefile in
59# the appropriate keymap folder that will get included automatically
60#
61BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
62MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
63EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
64CONSOLE_ENABLE ?= no # Console for debug(+400)
65COMMAND_ENABLE ?= yes # Commands for debug and configuration
66NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
67BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality
68MIDI_ENABLE ?= no # MIDI controls
69AUDIO_ENABLE ?= yes # Audio output on port C6
70UNICODE_ENABLE ?= no # Unicode
71BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
72RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
73USE_I2C ?= yes
74# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
75SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
76
77CUSTOM_MATRIX = yes
78SUBPROJECT_DEFAULT = rev2
79ifndef QUANTUM_DIR
80>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
81 include ../../Makefile 2 include ../../Makefile
82endif \ No newline at end of file 3endif \ No newline at end of file
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 91b11f03f..1b7bbcbbb 100644
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -61,20 +61,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
61//#define NO_ACTION_ONESHOT 61//#define NO_ACTION_ONESHOT
62//#define NO_ACTION_MACRO 62//#define NO_ACTION_MACRO
63//#define NO_ACTION_FUNCTION 63//#define NO_ACTION_FUNCTION
64<<<<<<< HEAD 64
65=======
66<<<<<<< HEAD
67>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
68#ifdef SUBPROJECT_rev1 65#ifdef SUBPROJECT_rev1
69 #include "rev1/config.h" 66 #include "rev1/config.h"
70#endif 67#endif
71#ifdef SUBPROJECT_rev2 68#ifdef SUBPROJECT_rev2
72 #include "rev2/config.h" 69 #include "rev2/config.h"
73#endif 70#endif
74#endif 71#endif \ No newline at end of file
75<<<<<<< HEAD
76=======
77
78
79
80>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c
index 41b9b8d8f..6f1f71f5f 100644
--- a/keyboards/lets_split/keymaps/default/keymap.c
+++ b/keyboards/lets_split/keymaps/default/keymap.c
@@ -29,7 +29,6 @@ enum custom_keycodes {
29#define XXXXXXX KC_NO 29#define XXXXXXX KC_NO
30 30
31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32<<<<<<< HEAD
33 32
34/* Qwerty 33/* Qwerty
35 * ,-----------------------------------------------------------------------------------. 34 * ,-----------------------------------------------------------------------------------.
@@ -83,29 +82,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
83 KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ 82 KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \
84 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \ 83 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \
85 ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ 84 ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
86=======
87[0] = KEYMAP( \
88 KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \
89 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
90 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
91 KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
92>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
93), 85),
94[3] = KEYMAP( \ 86[3] = KEYMAP( \
95 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \ 87 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
96 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ 88 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
97 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ 89 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
98<<<<<<< HEAD
99 _______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 90 _______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
100=======
101 _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
102>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
103), 91),
104[4] = KEYMAP( \ 92[4] = KEYMAP( \
105 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \ 93 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
106 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ 94 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
107 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ 95 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \
108<<<<<<< HEAD
109 _______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ 96 _______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
110), 97),
111 98
@@ -126,12 +113,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
126 _______, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______, _______, _______, \ 113 _______, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______, _______, _______, \
127 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ 114 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
128) 115)
129
130
131=======
132 _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
133),
134>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
135}; 116};
136 117
137#ifdef AUDIO_ENABLE 118#ifdef AUDIO_ENABLE
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index 8bb33f951..117b727a8 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,6 +1 @@
1#include "lets_split.h" #include "lets_split.h" \ No newline at end of file
2
3<<<<<<< HEAD
4=======
5
6>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index da5b47673..825e5ec24 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -25,11 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25#define PRODUCT_ID 0x3060 25#define PRODUCT_ID 0x3060
26#define DEVICE_VER 0x0001 26#define DEVICE_VER 0x0001
27#define MANUFACTURER Wootpatoot 27#define MANUFACTURER Wootpatoot
28<<<<<<< HEAD
29#define PRODUCT Lets Split 28#define PRODUCT Lets Split
30=======
31#define PRODUCT Lets Split v1 29#define PRODUCT Lets Split v1
32>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
33#define DESCRIPTION A split keyboard for the cheap makers 30#define DESCRIPTION A split keyboard for the cheap makers
34 31
35/* key matrix size */ 32/* key matrix size */
@@ -44,15 +41,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
44#define CATERINA_BOOTLOADER 41#define CATERINA_BOOTLOADER
45 42
46// #define USE_I2C 43// #define USE_I2C
47
48<<<<<<< HEAD
49// Use serial if not using I2C 44// Use serial if not using I2C
50#ifndef USE_I2C 45#ifndef USE_I2C
51# define USE_SERIAL 46# define USE_SERIAL
52#endif 47#endif
53 48
54=======
55>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
56// #define EE_HANDS 49// #define EE_HANDS
57 50
58#define I2C_MASTER_LEFT 51#define I2C_MASTER_LEFT
@@ -80,21 +73,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
80 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 73 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
81) 74)
82 75
83/* ws2812 RGB LED */
84<<<<<<< HEAD
85#define RGB_DI_PIN D4
86#define RGBLIGHT_TIMER
87#define RGBLED_NUM 8 // Number of LEDs
88=======
89#define ws2812_PORTREG PORTD
90#define ws2812_DDRREG DDRD
91#define ws2812_pin PD1
92#define RGBLED_NUM 28 // Number of LEDs
93>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
94#define RGBLIGHT_HUE_STEP 10
95#define RGBLIGHT_SAT_STEP 17
96#define RGBLIGHT_VAL_STEP 17
97
98/* 76/*
99 * Feature disable options 77 * Feature disable options
100 * These options are also useful to firmware size reduction. 78 * These options are also useful to firmware size reduction.
@@ -113,8 +91,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
113//#define NO_ACTION_MACRO 91//#define NO_ACTION_MACRO
114//#define NO_ACTION_FUNCTION 92//#define NO_ACTION_FUNCTION
115 93
116<<<<<<< HEAD
117#endif
118=======
119#endif 94#endif
120>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index 41dd1e353..c505d3a6e 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -24,15 +24,9 @@ void matrix_init_kb(void) {
24}; 24};
25 25
26void shutdown_user(void) { 26void shutdown_user(void) {
27<<<<<<< HEAD
28 #ifdef AUDIO_ENABLE 27 #ifdef AUDIO_ENABLE
29 PLAY_NOTE_ARRAY(tone_goodbye, false, 0); 28 PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
30 _delay_ms(150); 29 _delay_ms(150);
31 stop_all_notes(); 30 stop_all_notes();
32 #endif 31 #endif
33=======
34 PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
35 _delay_ms(150);
36 stop_all_notes();
37>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
38} 32}
diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h
index 998b2be7c..4667c9fb0 100644
--- a/keyboards/lets_split/rev1/rev1.h
+++ b/keyboards/lets_split/rev1/rev1.h
@@ -1,15 +1,12 @@
1#ifndef REV1_H 1#ifndef REV1_H
2#define REV1_H 2#define REV1_H
3 3
4<<<<<<< HEAD
5#include "../lets_split.h" 4#include "../lets_split.h"
6 5
7//void promicro_bootloader_jmp(bool program); 6//void promicro_bootloader_jmp(bool program);
8=======
9#include "quantum.h" 7#include "quantum.h"
10 8
11void promicro_bootloader_jmp(bool program); 9//void promicro_bootloader_jmp(bool program);
12>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
13 10
14#define KEYMAP( \ 11#define KEYMAP( \
15 k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ 12 k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index 19c137e56..e9689d773 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -41,14 +41,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41 41
42// #define USE_I2C 42// #define USE_I2C
43 43
44<<<<<<< HEAD
45// Use serial if not using I2C 44// Use serial if not using I2C
46#ifndef USE_I2C 45#ifndef USE_I2C
47# define USE_SERIAL 46# define USE_SERIAL
48#endif 47#endif
49 48
50=======
51>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
52// #define EE_HANDS 49// #define EE_HANDS
53 50
54#define I2C_MASTER_LEFT 51#define I2C_MASTER_LEFT
@@ -77,19 +74,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
77) 74)
78 75
79/* ws2812 RGB LED */ 76/* ws2812 RGB LED */
80<<<<<<< HEAD
81#define RGB_DI_PIN D3 77#define RGB_DI_PIN D3
82#define RGBLIGHT_TIMER 78#define RGBLIGHT_TIMER
83#define RGBLED_NUM 12 // Number of LEDs 79#define RGBLED_NUM 12 // Number of LEDs
84=======
85#define ws2812_PORTREG PORTD 80#define ws2812_PORTREG PORTD
86#define ws2812_DDRREG DDRD 81#define ws2812_DDRREG DDRD
87#define ws2812_pin PD1
88#define RGBLED_NUM 28 // Number of LEDs
89>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
90#define RGBLIGHT_HUE_STEP 10
91#define RGBLIGHT_SAT_STEP 17
92#define RGBLIGHT_VAL_STEP 17
93 82
94/* 83/*
95 * Feature disable options 84 * Feature disable options
@@ -109,8 +98,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
109//#define NO_ACTION_MACRO 98//#define NO_ACTION_MACRO
110//#define NO_ACTION_FUNCTION 99//#define NO_ACTION_FUNCTION
111 100
112<<<<<<< HEAD 101
113#endif 102#endif \ No newline at end of file
114=======
115#endif
116>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index 41dd1e353..c505d3a6e 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -24,15 +24,9 @@ void matrix_init_kb(void) {
24}; 24};
25 25
26void shutdown_user(void) { 26void shutdown_user(void) {
27<<<<<<< HEAD
28 #ifdef AUDIO_ENABLE 27 #ifdef AUDIO_ENABLE
29 PLAY_NOTE_ARRAY(tone_goodbye, false, 0); 28 PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
30 _delay_ms(150); 29 _delay_ms(150);
31 stop_all_notes(); 30 stop_all_notes();
32 #endif 31 #endif
33=======
34 PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
35 _delay_ms(150);
36 stop_all_notes();
37>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
38} 32}
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 9e251ca57..990976de2 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,15 +1,12 @@
1#ifndef REV2_H 1#ifndef REV2_H
2#define REV2_H 2#define REV2_H
3 3
4<<<<<<< HEAD
5#include "../lets_split.h" 4#include "../lets_split.h"
6 5
7//void promicro_bootloader_jmp(bool program); 6//void promicro_bootloader_jmp(bool program);
8=======
9#include "quantum.h" 7#include "quantum.h"
10 8
11void promicro_bootloader_jmp(bool program); 9//void promicro_bootloader_jmp(bool program);
12>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
13 10
14#define KEYMAP( \ 11#define KEYMAP( \
15 k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ 12 k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
diff --git a/keyboards/maxipad/Makefile b/keyboards/maxipad/Makefile
index c65665142..57b2ef62e 100644
--- a/keyboards/maxipad/Makefile
+++ b/keyboards/maxipad/Makefile
@@ -1,81 +1,3 @@
1<<<<<<< HEAD
2ifndef MAKEFILE_INCLUDED 1ifndef MAKEFILE_INCLUDED
3 include ../../Makefile 2 include ../../Makefile
4endif 3endif
5=======
6
7
8# MCU name
9#MCU = at90usb1287
10MCU = atmega32u4
11
12# Processor frequency.
13# This will define a symbol, F_CPU, in all source code files equal to the
14# processor frequency in Hz. You can then use this symbol in your source code to
15# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
16# automatically to create a 32-bit value in your source code.
17#
18# This will be an integer division of F_USB below, as it is sourced by
19# F_USB after it has run through any CPU prescalers. Note that this value
20# does not *change* the processor frequency - it should merely be updated to
21# reflect the processor speed set externally so that the code can use accurate
22# software delays.
23F_CPU = 16000000
24
25
26#
27# LUFA specific
28#
29# Target architecture (see library "Board Types" documentation).
30ARCH = AVR8
31
32# Input clock frequency.
33# This will define a symbol, F_USB, in all source code files equal to the
34# input clock frequency (before any prescaling is performed) in Hz. This value may
35# differ from F_CPU if prescaling is used on the latter, and is required as the
36# raw input clock is fed directly to the PLL sections of the AVR for high speed
37# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
38# at the end, this will be done automatically to create a 32-bit value in your
39# source code.
40#
41# If no clock division is performed on the input clock inside the AVR (via the
42# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
43F_USB = $(F_CPU)
44
45# Interrupt driven control endpoint task(+60)
46OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
47
48
49# Boot Section Size in *bytes*
50# Teensy halfKay 512
51# Teensy++ halfKay 1024
52# Atmel DFU loader 4096
53# LUFA bootloader 4096
54# USBaspLoader 2048
55OPT_DEFS += -DBOOTLOADER_SIZE=512
56
57
58# Build Options
59# change yes to no to disable
60#
61BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
62MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
63EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
64CONSOLE_ENABLE ?= yes # Console for debug(+400)
65COMMAND_ENABLE ?= yes # Commands for debug and configuration
66# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
67SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
68# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
69NKRO_ENABLE ?= no # USB Nkey Rollover
70BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default
71MIDI_ENABLE ?= no # MIDI controls
72UNICODE_ENABLE ?= no # Unicode
73BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
74AUDIO_ENABLE ?= no # Audio output on port C6
75
76ifndef QUANTUM_DIR
77 include ../../Makefile
78endif
79
80
81>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index 4a942aae9..fbe64a5b0 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -24,15 +24,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
24#define VENDOR_ID 0xFEED 24#define VENDOR_ID 0xFEED
25#define PRODUCT_ID 0x6060 25#define PRODUCT_ID 0x6060
26#define DEVICE_VER 0x0001 26#define DEVICE_VER 0x0001
27<<<<<<< HEAD
28#define MANUFACTURER You
29#define PRODUCT maxipad
30#define DESCRIPTION A custom keyboard
31=======
32#define MANUFACTURER Wootpatoot 27#define MANUFACTURER Wootpatoot
33#define PRODUCT maxipad 28#define PRODUCT maxipad
34#define DESCRIPTION g8ming keeb 29#define DESCRIPTION A custom keyboard
35>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df 30
36 31
37/* key matrix size */ 32/* key matrix size */
38#define MATRIX_ROWS 5 33#define MATRIX_ROWS 5
diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c
index 5e3a594cc..43ace3241 100644
--- a/keyboards/maxipad/keymaps/default/keymap.c
+++ b/keyboards/maxipad/keymaps/default/keymap.c
@@ -10,15 +10,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
10), 10),
11[1] = KEYMAP( 11[1] = KEYMAP(
12 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \ 12 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \
13<<<<<<< HEAD
14 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \ 13 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \
15 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \ 14 KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \
16=======
17 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 15 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
18 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ 16 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \
19>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
20 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
21 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \
22), 17),
23}; 18};
24 19
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 11:30:12 +0000