From f30d6dd7858dfa3a0cf214113e8b1d45b30d74ce Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Fri, 13 Jul 2018 02:23:30 +0900 Subject: Helix config refine (#3374) * helix config.h refine --- keyboards/helix/rev1/config.h | 2 -- keyboards/helix/rev1/keymaps/OLED_sample/config.h | 4 ---- keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h | 16 ++++++++++++++++ keyboards/helix/rev1/keymaps/default/config.h | 4 +--- keyboards/helix/rev1/serial_config.h | 16 ++++++++++++++++ 5 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h create mode 100644 keyboards/helix/rev1/serial_config.h (limited to 'keyboards/helix/rev1') diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h index 3420992d83..7fec62fc83 100644 --- a/keyboards/helix/rev1/config.h +++ b/keyboards/helix/rev1/config.h @@ -19,8 +19,6 @@ along with this program. If not, see . #ifndef REV1_CONFIG_H #define REV1_CONFIG_H -#include "../config.h" - /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x3060 diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/config.h b/keyboards/helix/rev1/keymaps/OLED_sample/config.h index 6cd3072b14..0e1b787a5a 100644 --- a/keyboards/helix/rev1/keymaps/OLED_sample/config.h +++ b/keyboards/helix/rev1/keymaps/OLED_sample/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" - /* Use I2C or Serial */ #define USE_I2C @@ -37,8 +35,6 @@ along with this program. If not, see . #define SSD1306OLED -#define USE_SERIAL_PD2 - #define PREVENT_STUCK_MODIFIERS #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h b/keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h new file mode 100644 index 0000000000..be2e7cb8b1 --- /dev/null +++ b/keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h @@ -0,0 +1,16 @@ +#ifndef SOFT_SERIAL_CONFIG_H +#define SOFT_SERIAL_CONFIG_H + +/* Soft Serial defines */ +#define SERIAL_PIN_DDR DDRD +#define SERIAL_PIN_PORT PORTD +#define SERIAL_PIN_INPUT PIND +#define SERIAL_PIN_MASK _BV(PD2) +#define SERIAL_PIN_INTERRUPT INT2_vect + +#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 +#define SERIAL_MASTER_BUFFER_LENGTH 1 + +//// #error rev1/keymaps/OLED_sample serial config + +#endif /* SOFT_SERIAL_CONFIG_H */ diff --git a/keyboards/helix/rev1/keymaps/default/config.h b/keyboards/helix/rev1/keymaps/default/config.h index 7f33a43630..d95925d4e4 100644 --- a/keyboards/helix/rev1/keymaps/default/config.h +++ b/keyboards/helix/rev1/keymaps/default/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" - /* Use I2C or Serial, not both */ #define USE_SERIAL @@ -34,4 +32,4 @@ along with this program. If not, see . // #define _MASTER_RIGHT // #define EE_HANDS -#endif \ No newline at end of file +#endif diff --git a/keyboards/helix/rev1/serial_config.h b/keyboards/helix/rev1/serial_config.h new file mode 100644 index 0000000000..2b668a6afc --- /dev/null +++ b/keyboards/helix/rev1/serial_config.h @@ -0,0 +1,16 @@ +#ifndef SOFT_SERIAL_CONFIG_H +#define SOFT_SERIAL_CONFIG_H + +/* Soft Serial defines */ +#define SERIAL_PIN_DDR DDRD +#define SERIAL_PIN_PORT PORTD +#define SERIAL_PIN_INPUT PIND +#define SERIAL_PIN_MASK _BV(PD0) +#define SERIAL_PIN_INTERRUPT INT0_vect + +#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 +#define SERIAL_MASTER_BUFFER_LENGTH 1 + +/// #error rev1 serial config + +#endif /* SOFT_SERIAL_CONFIG_H */ -- cgit v1.2.3