summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split')
-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
10 files changed, 7 insertions, 177 deletions
diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile
index 6ce6e43731..4e2a6f00fd 100644
--- a/keyboards/lets_split/Makefile
+++ b/keyboards/lets_split/Makefile
@@ -1,82 +1,3 @@
-<<<<<<< HEAD
ifndef MAKEFILE_INCLUDED
-=======
-SRC += matrix.c \
- i2c.c \
- split_util.c \
- serial.c
-
-# MCU name
-#MCU = at90usb1287
-MCU = atmega32u4
-
-# Processor frequency.
-# This will define a symbol, F_CPU, in all source code files equal to the
-# processor frequency in Hz. You can then use this symbol in your source code to
-# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-# automatically to create a 32-bit value in your source code.
-#
-# This will be an integer division of F_USB below, as it is sourced by
-# F_USB after it has run through any CPU prescalers. Note that this value
-# does not *change* the processor frequency - it should merely be updated to
-# reflect the processor speed set externally so that the code can use accurate
-# software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-# This will define a symbol, F_USB, in all source code files equal to the
-# input clock frequency (before any prescaling is performed) in Hz. This value may
-# differ from F_CPU if prescaling is used on the latter, and is required as the
-# raw input clock is fed directly to the PLL sections of the AVR for high speed
-# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-# at the end, this will be done automatically to create a 32-bit value in your
-# source code.
-#
-# If no clock division is performed on the input clock inside the AVR (via the
-# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-
-# Boot Section Size in *bytes*
-# Teensy halfKay 512
-# Teensy++ halfKay 1024
-# Atmel DFU loader 4096
-# LUFA bootloader 4096
-# USBaspLoader 2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-# Build Options
-# change to "no" to disable the options, or define them in the Makefile in
-# the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE ?= no # Console for debug(+400)
-COMMAND_ENABLE ?= yes # Commands for debug and configuration
-NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality
-MIDI_ENABLE ?= no # MIDI controls
-AUDIO_ENABLE ?= yes # Audio output on port C6
-UNICODE_ENABLE ?= no # Unicode
-BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-USE_I2C ?= yes
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
-
-CUSTOM_MATRIX = yes
-SUBPROJECT_DEFAULT = rev2
-ifndef QUANTUM_DIR
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
include ../../Makefile
endif \ No newline at end of file
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 91b11f03fd..1b7bbcbbb9 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/>.
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+
#ifdef SUBPROJECT_rev1
#include "rev1/config.h"
#endif
#ifdef SUBPROJECT_rev2
#include "rev2/config.h"
#endif
-#endif
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+#endif \ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c
index 41b9b8d8ff..6f1f71f5f8 100644
--- a/keyboards/lets_split/keymaps/default/keymap.c
+++ b/keyboards/lets_split/keymaps/default/keymap.c
@@ -29,7 +29,6 @@ enum custom_keycodes {
#define XXXXXXX KC_NO
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-<<<<<<< HEAD
/* Qwerty
* ,-----------------------------------------------------------------------------------.
@@ -83,29 +82,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \
ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
-=======
-[0] = KEYMAP( \
- 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_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
- KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
),
[3] = KEYMAP( \
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
-<<<<<<< HEAD
_______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-=======
- _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
),
[4] = KEYMAP( \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \
-<<<<<<< HEAD
_______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
),
@@ -126,12 +113,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
)
-
-
-=======
- _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-),
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
};
#ifdef AUDIO_ENABLE
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index 8bb33f9514..117b727a85 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,6 +1 @@
-#include "lets_split.h"
-
-<<<<<<< HEAD
-=======
-
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+#include "lets_split.h" \ No newline at end of file
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index da5b476733..825e5ec245 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/>.
#define PRODUCT_ID 0x3060
#define DEVICE_VER 0x0001
#define MANUFACTURER Wootpatoot
-<<<<<<< HEAD
#define PRODUCT Lets Split
-=======
#define PRODUCT Lets Split v1
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
#define DESCRIPTION A split keyboard for the cheap makers
/* key matrix size */
@@ -44,15 +41,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define CATERINA_BOOTLOADER
// #define USE_I2C
-
-<<<<<<< HEAD
// Use serial if not using I2C
#ifndef USE_I2C
# define USE_SERIAL
#endif
-=======
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
// #define EE_HANDS
#define I2C_MASTER_LEFT
@@ -80,21 +73,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
-/* ws2812 RGB LED */
-<<<<<<< HEAD
-#define RGB_DI_PIN D4
-#define RGBLIGHT_TIMER
-#define RGBLED_NUM 8 // Number of LEDs
-=======
-#define ws2812_PORTREG PORTD
-#define ws2812_DDRREG DDRD
-#define ws2812_pin PD1
-#define RGBLED_NUM 28 // Number of LEDs
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
/*
* Feature disable options
* 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/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-<<<<<<< HEAD
-#endif
-=======
#endif
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index 41dd1e3535..c505d3a6e3 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -24,15 +24,9 @@ void matrix_init_kb(void) {
};
void shutdown_user(void) {
-<<<<<<< HEAD
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
#endif
-=======
- PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
- _delay_ms(150);
- stop_all_notes();
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
}
diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h
index 998b2be7c7..4667c9fb09 100644
--- a/keyboards/lets_split/rev1/rev1.h
+++ b/keyboards/lets_split/rev1/rev1.h
@@ -1,15 +1,12 @@
#ifndef REV1_H
#define REV1_H
-<<<<<<< HEAD
#include "../lets_split.h"
//void promicro_bootloader_jmp(bool program);
-=======
#include "quantum.h"
-void promicro_bootloader_jmp(bool program);
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+//void promicro_bootloader_jmp(bool program);
#define KEYMAP( \
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 19c137e56c..e9689d773d 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/>.
// #define USE_I2C
-<<<<<<< HEAD
// Use serial if not using I2C
#ifndef USE_I2C
# define USE_SERIAL
#endif
-=======
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
// #define EE_HANDS
#define I2C_MASTER_LEFT
@@ -77,19 +74,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
)
/* ws2812 RGB LED */
-<<<<<<< HEAD
#define RGB_DI_PIN D3
#define RGBLIGHT_TIMER
#define RGBLED_NUM 12 // Number of LEDs
-=======
#define ws2812_PORTREG PORTD
#define ws2812_DDRREG DDRD
-#define ws2812_pin PD1
-#define RGBLED_NUM 28 // Number of LEDs
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
/*
* Feature disable options
@@ -109,8 +98,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-<<<<<<< HEAD
-#endif
-=======
-#endif
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+
+#endif \ No newline at end of file
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index 41dd1e3535..c505d3a6e3 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -24,15 +24,9 @@ void matrix_init_kb(void) {
};
void shutdown_user(void) {
-<<<<<<< HEAD
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
#endif
-=======
- PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
- _delay_ms(150);
- stop_all_notes();
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
}
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 9e251ca57d..990976de2b 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,15 +1,12 @@
#ifndef REV2_H
#define REV2_H
-<<<<<<< HEAD
#include "../lets_split.h"
//void promicro_bootloader_jmp(bool program);
-=======
#include "quantum.h"
-void promicro_bootloader_jmp(bool program);
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+//void promicro_bootloader_jmp(bool program);
#define KEYMAP( \
k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 04:19:14 +0000