summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split
diff options
context:
space:
mode:
authorJosh Colbeck <skrymir@gmail.com>2017-02-21 20:31:16 -0600
committerJosh Colbeck <skrymir@gmail.com>2017-02-21 20:31:16 -0600
commite51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch)
treebdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /keyboards/lets_split
parentc56693f858cb3409e4a68a8e65a1370c022a51ed (diff)
parent7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff)
Merge remote-tracking branch 'qmk/master'
Diffstat (limited to 'keyboards/lets_split')
-rw-r--r--keyboards/lets_split/Makefile79
-rw-r--r--keyboards/lets_split/config.h85
-rw-r--r--keyboards/lets_split/eeprom-lefthand.eep2
-rw-r--r--keyboards/lets_split/eeprom-righthand.eep2
-rw-r--r--keyboards/lets_split/i2c.c3
-rw-r--r--keyboards/lets_split/imgs/left.stlbin0 -> 106984 bytes
-rw-r--r--keyboards/lets_split/imgs/lets split rev2 case.iges17931
-rw-r--r--keyboards/lets_split/imgs/letssplitv2.svg4077
-rw-r--r--keyboards/lets_split/imgs/plate.stlbin0 -> 102484 bytes
-rw-r--r--keyboards/lets_split/imgs/right.stlbin0 -> 135384 bytes
-rw-r--r--keyboards/lets_split/keymaps/i2c/config.h31
-rw-r--r--keyboards/lets_split/keymaps/i2c/keymap.c (renamed from keyboards/lets_split/keymaps/default/keymap.c)0
-rw-r--r--keyboards/lets_split/keymaps/serial/config.h34
-rw-r--r--keyboards/lets_split/keymaps/serial/keymap.c214
-rw-r--r--keyboards/lets_split/lets_split.c31
-rw-r--r--keyboards/lets_split/lets_split.h29
-rw-r--r--keyboards/lets_split/matrix.c23
-rw-r--r--keyboards/lets_split/pro_micro.h64
-rw-r--r--keyboards/lets_split/readme.md99
-rw-r--r--keyboards/lets_split/rev1/Makefile3
-rw-r--r--keyboards/lets_split/rev1/config.h84
-rw-r--r--keyboards/lets_split/rev1/rev1.c32
-rw-r--r--keyboards/lets_split/rev1/rev1.h28
-rw-r--r--keyboards/lets_split/rev1/rules.mk5
-rw-r--r--keyboards/lets_split/rev2/Makefile3
-rw-r--r--keyboards/lets_split/rev2/config.h91
-rw-r--r--keyboards/lets_split/rev2/rev2.c32
-rw-r--r--keyboards/lets_split/rev2/rev2.h28
-rw-r--r--keyboards/lets_split/rev2/rules.mk5
-rw-r--r--keyboards/lets_split/rev2fliphalf/Makefile3
-rw-r--r--keyboards/lets_split/rev2fliphalf/config.h91
-rw-r--r--keyboards/lets_split/rev2fliphalf/rev2fliphalf.c32
-rw-r--r--keyboards/lets_split/rev2fliphalf/rev2fliphalf.h28
-rw-r--r--keyboards/lets_split/rev2fliphalf/rules.mk5
-rw-r--r--keyboards/lets_split/rules.mk87
-rw-r--r--keyboards/lets_split/serial.c5
-rw-r--r--keyboards/lets_split/split_util.c11
37 files changed, 23019 insertions, 258 deletions
diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile
index b9f07636be..f5c87d4d65 100644
--- a/keyboards/lets_split/Makefile
+++ b/keyboards/lets_split/Makefile
@@ -1,78 +1,5 @@
-SRC += matrix.c \
- i2c.c \
- split_util.c \
- serial.c
+SUBPROJECT_DEFAULT = rev2
-# 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.
-
-# 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
-
-ifndef QUANTUM_DIR
+ifndef MAKEFILE_INCLUDED
include ../../Makefile
-endif \ No newline at end of file
+endif
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 833818ce60..008fb09789 100644
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -20,78 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x3060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Wootpatoot
-#define PRODUCT Lets Split
-#define DESCRIPTION A split keyboard for the cheap makers
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-// wiring of each half
-#define MATRIX_ROW_PINS { B5, B4, E6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-#define CATERINA_BOOTLOADER
-
-// #define USE_I2C
-
-// #define EE_HANDS
-
-#define I2C_MASTER_LEFT
-// #define I2C_MASTER_RIGHT
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D2
-#define RGBLIGHT_TIMER
-#define RGBLED_NUM 28 // Number of LEDs
-#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.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#endif \ No newline at end of file
+#ifdef SUBPROJECT_rev1
+ #include "rev1/config.h"
+#endif
+#ifdef SUBPROJECT_rev2
+ #include "rev2/config.h"
+#endif
+#ifdef SUBPROJECT_rev2fliphalf
+ #include "../../rev2fliphalf/config.h"
+#endif
+#endif
diff --git a/keyboards/lets_split/eeprom-lefthand.eep b/keyboards/lets_split/eeprom-lefthand.eep
index a92200b124..b9666a74c0 100644
--- a/keyboards/lets_split/eeprom-lefthand.eep
+++ b/keyboards/lets_split/eeprom-lefthand.eep
@@ -1,2 +1,2 @@
-:080000000000000000000001F7
+:0B0000000000000000000000000001F4
:00000001FF
diff --git a/keyboards/lets_split/eeprom-righthand.eep b/keyboards/lets_split/eeprom-righthand.eep
index 91a6831704..94cc5be7fc 100644
--- a/keyboards/lets_split/eeprom-righthand.eep
+++ b/keyboards/lets_split/eeprom-righthand.eep
@@ -1,2 +1,2 @@
-:080000000000000000000000F8
+:0B0000000000000000000000000000F5
:00000001FF
diff --git a/keyboards/lets_split/i2c.c b/keyboards/lets_split/i2c.c
index c72789403e..084c890c40 100644
--- a/keyboards/lets_split/i2c.c
+++ b/keyboards/lets_split/i2c.c
@@ -6,6 +6,8 @@
#include <stdbool.h>
#include "i2c.h"
+#ifdef USE_I2C
+
// Limits the amount of we wait for any one i2c transaction.
// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
// 9 bits, a single transaction will take around 90μs to complete.
@@ -157,3 +159,4 @@ ISR(TWI_vect) {
// Reset everything, so we are ready for the next TWI interrupt
TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
}
+#endif
diff --git a/keyboards/lets_split/imgs/left.stl b/keyboards/lets_split/imgs/left.stl
new file mode 100644
index 0000000000..ea738d6260
--- /dev/null
+++ b/keyboards/lets_split/imgs/left.stl
Binary files differ
diff --git a/keyboards/lets_split/imgs/lets split rev2 case.iges b/keyboards/lets_split/imgs/lets split rev2 case.iges
new file mode 100644
index 0000000000..5677d09704
--- /dev/null
+++ b/keyboards/lets_split/imgs/lets split rev2 case.iges
@@ -0,0 +1,17931 @@
+ S 1
+,,20Hlets split rev2 case,20Hlets split rev2 case,7Hunknown,7Hunknown, G 1
+32,38,7,99,15,,1.,2,2HMM,1,0.08,15H20161218.141108,0.01,10000.,7HunknownG 2
+,7Hunknown,11,0,; G 3
+ 186 1 00000000D 1
+ 186 -5703 1 0 0D 2
+ 186 2 00000000D 3
+ 186 -5705 1 0 0D 4
+ 186 3 00000000D 5
+ 186 -5705 1 0 0D 6
+ 514 4 00010000D 7
+ 514 29 1 0D 8
+ 514 33 00010000D 9
+ 514 7 1 0D 10
+ 514 40 00010000D 11
+ 514 9 1 0D 12
+ 510 49 00010000D 13
+ 510 -5703 1 1 0D 14
+ 510 50 00010000D 15
+ 510 -5703 1 1 0D 16
+ 510 51 00010000D 17
+ 510 -5703 1 1 0D 18
+ 510 52 00010000D 19
+ 510 -5703 1 1 0D 20
+ 510 53 00010000D 21
+ 510 -5703 1 1 0D 22
+ 510 54 00010000D 23
+ 510 -5703 1 1 0D 24
+ 510 55 00010000D 25
+ 510 -5703 1 1 0D 26
+ 510 56 00010000D 27
+ 510 -5703 1 1 0D 28
+ 510 57 00010000D 29
+ 510 -5703 1 1 0D 30
+ 510 58 00010000D 31
+ 510 -5703 1 1 0D 32
+ 510 59 00010000D 33
+ 510 -5703 1 1 0D 34
+ 510 60 00010000D 35
+ 510 -5703 1 1 0D 36
+ 510 61 00010000D 37
+ 510 -5703 1 1 0D 38
+ 510 62 00010000D 39
+ 510 -5703 1 1 0D 40
+ 510 63 00010000D 41
+ 510 -5703 1 1 0D 42
+ 510 64 00010000D 43
+ 510 -5703 1 1 0D 44
+ 510 65 00010000D 45
+ 510 -5703 1 1 0D 46
+ 510 66 00010000D 47
+ 510 -5703 1 1 0D 48
+ 510 67 00010000D 49
+ 510 -5703 1 1 0D 50
+ 510 68 00010000D 51
+ 510 -5703 1 1 0D 52
+ 510 69 00010000D 53
+ 510 -5703 1 1 0D 54
+ 510 70 00010000D 55
+ 510 -5703 1 1 0D 56
+ 510 71 00010000D 57
+ 510 -5703 1 1 0D 58
+ 510 72 00010000D 59
+ 510 -5703 1 1 0D 60
+ 510 73 00010000D 61
+ 510 -5703 1 1 0D 62
+ 510 74 00010000D 63
+ 510 -5703 1 1 0D 64
+ 510 75 00010000D 65
+ 510 -5703 1 1 0D 66
+ 510 76 00010000D 67
+ 510 -5703 1 1 0D 68
+ 510 77 00010000D 69
+ 510 -5703 1 1 0D 70
+ 510 78 00010000D 71
+ 510 -5703 1 1 0D 72
+ 510 79 00010000D 73
+ 510 -5703 1 1 0D 74
+ 510 80 00010000D 75
+ 510 -5703 1 1 0D 76
+ 510 81 00010000D 77
+ 510 -5703 1 1 0D 78
+ 510 82 00010000D 79
+ 510 -5703 1 1 0D 80
+ 510 83 00010000D 81
+ 510 -5703 1 1 0D 82
+ 510 84 00010000D 83
+ 510 -5703 1 1 0D 84
+ 510 85 00010000D 85
+ 510 -5703 1 1 0D 86
+ 510 86 00010000D 87
+ 510 -5703 1 1 0D 88
+ 510 87 00010000D 89
+ 510 -5703 1 1 0D 90
+ 510 88 00010000D 91
+ 510 -5703 1 1 0D 92
+ 510 89 00010000D 93
+ 510 -5703 1 1 0D 94
+ 510 90 00010000D 95
+ 510 -5703 1 1 0D 96
+ 510 91 00010000D 97
+ 510 -5703 1 1 0D 98
+ 510 92 00010000D 99
+ 510 -5703 1 1 0D 100
+ 510 93 00010000D 101
+ 510 -5703 1 1 0D 102
+ 510 94 00010000D 103
+ 510 -5703 1 1 0D 104
+ 510 95 00010000D 105
+ 510 -5703 1 1 0D 106
+ 510 96 00010000D 107
+ 510 -5703 1 1 0D 108
+ 510 97 00010000D 109
+ 510 -5703 1 1 0D 110
+ 510 98 00010000D 111
+ 510 -5703 1 1 0D 112
+ 510 99 00010000D 113
+ 510 -5703 1 1 0D 114
+ 510 100 00010000D 115
+ 510 -5703 1 1 0D 116
+ 510 101 00010000D 117
+ 510 -5703 1 1 0D 118
+ 510 102 00010000D 119
+ 510 -5703 1 1 0D 120
+ 510 103 00010000D 121
+ 510 -5703 1 1 0D 122
+ 510 104 00010000D 123
+ 510 -5703 1 1 0D 124
+ 510 105 00010000D 125
+ 510 -5703 1 1 0D 126
+ 510 106 00010000D 127
+ 510 -5703 1 1 0D 128
+ 510 107 00010000D 129
+ 510 -5703 1 1 0D 130
+ 510 108 00010000D 131
+ 510 -5703 1 1 0D 132
+ 510 109 00010000D 133
+ 510 -5703 1 1 0D 134
+ 510 110 00010000D 135
+ 510 -5703 1 1 0D 136
+ 510 111 00010000D 137
+ 510 -5703 1 1 0D 138
+ 510 112 00010000D 139
+ 510 -5703 1 1 0D 140
+ 510 113 00010000D 141
+ 510 -5703 1 1 0D 142
+ 510 114 00010000D 143
+ 510 -5703 1 1 0D 144
+ 510 115 00010000D 145
+ 510 -5703 1 1 0D 146
+ 510 116 00010000D 147
+ 510 -5703 1 1 0D 148
+ 510 117 00010000D 149
+ 510 -5703 1 1 0D 150
+ 510 118 00010000D 151
+ 510 -5703 1 1 0D 152
+ 510 119 00010000D 153
+ 510 -5703 1 1 0D 154
+ 510 120 00010000D 155
+ 510 -5703 1 1 0D 156
+ 510 121 00010000D 157
+ 510 -5703 1 1 0D 158
+ 510 122 00010000D 159
+ 510 -5703 1 1 0D 160
+ 510 123 00010000D 161
+ 510 -5703 1 1 0D 162
+ 510 124 00010000D 163
+ 510 -5703 1 1 0D 164
+ 510 125 00010000D 165
+ 510 -5703 1 1 0D 166
+ 510 126 00010000D 167
+ 510 -5703 1 1 0D 168
+ 510 127 00010000D 169
+ 510 -5703 1 1 0D 170
+ 510 128 00010000D 171
+ 510 -5703 1 1 0D 172
+ 510 129 00010000D 173
+ 510 -5703 1 1 0D 174
+ 510 130 00010000D 175
+ 510 -5703 1 1 0D 176
+ 510 131 00010000D 177
+ 510 -5703 1 1 0D 178
+ 510 132 00010000D 179
+ 510 -5703 1 1 0D 180
+ 510 133 00010000D 181
+ 510 -5703 1 1 0D 182
+ 510 134 00010000D 183
+ 510 -5703 1 1 0D 184
+ 510 135 00010000D 185
+ 510 -5703 1 1 0D 186
+ 510 136 00010000D 187
+ 510 -5703 1 1 0D 188
+ 510 137 00010000D 189
+ 510 -5703 1 1 0D 190
+ 510 138 00010000D 191
+ 510 -5703 1 1 0D 192
+ 510 139 00010000D 193
+ 510 -5703 1 1 0D 194
+ 510 140 00010000D 195
+ 510 -5703 1 1 0D 196
+ 510 141 00010000D 197
+ 510 -5703 1 1 0D 198
+ 510 142 00010000D 199
+ 510 -5703 1 1 0D 200
+ 510 143 00010000D 201
+ 510 -5703 1 1 0D 202
+ 510 144 00010000D 203
+ 510 -5703 1 1 0D 204
+ 510 145 00010000D 205
+ 510 -5703 1 1 0D 206
+ 510 146 00010000D 207
+ 510 -5703 1 1 0D 208
+ 510 147 00010000D 209
+ 510 -5703 1 1 0D 210
+ 510 148 00010000D 211
+ 510 -5703 1 1 0D 212
+ 510 149 00010000D 213
+ 510 -5703 1 1 0D 214
+ 510 150 00010000D 215
+ 510 -5703 1 1 0D 216
+ 510 151 00010000D 217
+ 510 -5703 1 1 0D 218
+ 510 152 00010000D 219
+ 510 -5703 1 1 0D 220
+ 510 153 00010000D 221
+ 510 -5703 1 1 0D 222
+ 510 154 00010000D 223
+ 510 -5703 1 1 0D 224
+ 510 155 00010000D 225
+ 510 -5703 1 1 0D 226
+ 510 156 00010000D 227
+ 510 -5703 1 1 0D 228
+ 510 157 00010000D 229
+ 510 -5703 1 1 0D 230
+ 510 158 00010000D 231
+ 510 -5703 1 1 0D 232
+ 510 159 00010000D 233
+ 510 -5703 1 1 0D 234
+ 510 160 00010000D 235
+ 510 -5703 1 1 0D 236
+ 510 161 00010000D 237
+ 510 -5703 1 1 0D 238
+ 510 162 00010000D 239
+ 510 -5703 1 1 0D 240
+ 510 163 00010000D 241
+ 510 -5703 1 1 0D 242
+ 510 164 00010000D 243
+ 510 -5703 1 1 0D 244
+ 510 165 00010000D 245
+ 510 -5703 1 1 0D 246
+ 510 166 00010000D 247
+ 510 -5703 1 1 0D 248
+ 510 167 00010000D 249
+ 510 -5703 1 1 0D 250
+ 510 168 00010000D 251
+ 510 -5703 1 1 0D 252
+ 510 169 00010000D 253
+ 510 -5703 1 1 0D 254
+ 510 170 00010000D 255
+ 510 -5703 1 1 0D 256
+ 510 171 00010000D 257
+ 510 -5703 1 1 0D 258
+ 510 172 00010000D 259
+ 510 -5703 1 1 0D 260
+ 510 173 00010000D 261
+ 510 -5703 1 1 0D 262
+ 510 174 00010000D 263
+ 510 -5703 1 1 0D 264
+ 510 175 00010000D 265
+ 510 -5703 1 1 0D 266
+ 510 176 00010000D 267
+ 510 -5703 1 1 0D 268
+ 510 177 00010000D 269
+ 510 -5703 1 1 0D 270
+ 510 178 00010000D 271
+ 510 -5703 1 1 0D 272
+ 510 179 00010000D 273
+ 510 -5703 1 1 0D 274
+ 510 180 00010000D 275
+ 510 -5703 1 1 0D 276
+ 510 181 00010000D 277
+ 510 -57