diff options
| author | Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> | 2018-01-12 18:57:48 +0100 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-01-12 12:57:48 -0500 |
| commit | e2352d4fbf6b11cc70b578abadb322b2401017ef (patch) | |
| tree | 76e072cf49d8c3f77d383a44b3a452eea6a17ab9 | |
| parent | 3a2acd447540cd6db54b9b9d672ac6faf19e1b94 (diff) | |
Updated files to better support sockets version (#2255)
| -rw-r--r-- | keyboards/lets_split/matrix.c | 6 | ||||
| -rw-r--r-- | keyboards/lets_split/sockets/config.h | 6 | ||||
| -rw-r--r-- | keyboards/lets_split/sockets/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/lets_split/sockets/sockets.h | 5 |
4 files changed, 13 insertions, 6 deletions
diff --git a/keyboards/lets_split/matrix.c b/keyboards/lets_split/matrix.c index 47cda6fa80..77def4212b 100644 --- a/keyboards/lets_split/matrix.c +++ b/keyboards/lets_split/matrix.c @@ -124,6 +124,12 @@ uint8_t matrix_cols(void) void matrix_init(void) { +#ifdef DISABLE_JTAG + // JTAG disable for PORT F. write JTD bit twice within four cycles. + MCUCR |= (1<<JTD); + MCUCR |= (1<<JTD); +#endif + debug_enable = true; debug_matrix = true; debug_mouse = true; diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h index 70ebcb8c23..3ce8f2c211 100644 --- a/keyboards/lets_split/sockets/config.h +++ b/keyboards/lets_split/sockets/config.h @@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // wiring of each half #define MATRIX_ROW_PINS { B1, B5, E6, B4 } #define MATRIX_COL_PINS { F4, F7, D7, B3, B2, B6} -// #define MATRIX_COL_PINS { B6, B2, B3, C6, F7, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order +// #define MATRIX_COL_PINS { B6, B2, B3, D7, F7, F4} //uncomment this line and comment line above if you need to reverse left-to-right key order /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST @@ -59,8 +59,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ) /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 -#define RGBLIGHT_TIMER +#define RGB_DI_PIN D1 +#define RGBLIGHT_TIMER #define RGBLED_NUM 12 // Number of LEDs #define ws2812_PORTREG PORTD #define ws2812_DDRREG DDRD diff --git a/keyboards/lets_split/sockets/rules.mk b/keyboards/lets_split/sockets/rules.mk index a975e56f16..e14d18d8de 100644 --- a/keyboards/lets_split/sockets/rules.mk +++ b/keyboards/lets_split/sockets/rules.mk @@ -1,3 +1,3 @@ BACKLIGHT_ENABLE = no AUDIO_ENABLE = yes -RGBLIGHT_ENABLE = no
\ No newline at end of file +RGBLIGHT_ENABLE = yes #Don't enable this along with I2C diff --git a/keyboards/lets_split/sockets/sockets.h b/keyboards/lets_split/sockets/sockets.h index 16b93b3d8a..05cc78f9e8 100644 --- a/keyboards/lets_split/sockets/sockets.h +++ b/keyboards/lets_split/sockets/sockets.h @@ -1,5 +1,6 @@ -#ifndef REV2_H -#define REV2_H +#ifndef SOCKETS_H +#define SOCKETS_H +#define DISABLE_JTAG // The keyboard uses PF4 and PF7, which are used by JTAG. #include "lets_split.h" |