Updated files to better support sockets version (#2255)

pull/2253/merge 0.5.209
Mikkel Jeppesen 7 years ago committed by Jack Humbert
parent 3a2acd4475
commit e2352d4fbf

@ -124,6 +124,12 @@ uint8_t matrix_cols(void)
void matrix_init(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_enable = true;
debug_matrix = true; debug_matrix = true;
debug_mouse = true; debug_mouse = true;

@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// wiring of each half // wiring of each half
#define MATRIX_ROW_PINS { B1, B5, E6, B4 } #define MATRIX_ROW_PINS { B1, B5, E6, B4 }
#define MATRIX_COL_PINS { F4, F7, D7, B3, B2, B6} #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 if matrix has ghost */
//#define MATRIX_HAS_GHOST //#define MATRIX_HAS_GHOST
@ -59,7 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
) )
/* ws2812 RGB LED */ /* ws2812 RGB LED */
#define RGB_DI_PIN D4 #define RGB_DI_PIN D1
#define RGBLIGHT_TIMER #define RGBLIGHT_TIMER
#define RGBLED_NUM 12 // Number of LEDs #define RGBLED_NUM 12 // Number of LEDs
#define ws2812_PORTREG PORTD #define ws2812_PORTREG PORTD

@ -1,3 +1,3 @@
BACKLIGHT_ENABLE = no BACKLIGHT_ENABLE = no
AUDIO_ENABLE = yes AUDIO_ENABLE = yes
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = yes #Don't enable this along with I2C

@ -1,5 +1,6 @@
#ifndef REV2_H #ifndef SOCKETS_H
#define REV2_H #define SOCKETS_H
#define DISABLE_JTAG // The keyboard uses PF4 and PF7, which are used by JTAG.
#include "lets_split.h" #include "lets_split.h"

Loading…
Cancel
Save