diff options
| author | MakotoKurauchi <pluis@me.com> | 2018-07-13 02:23:30 +0900 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-07-12 10:23:30 -0700 |
| commit | f30d6dd7858dfa3a0cf214113e8b1d45b30d74ce (patch) | |
| tree | f37014dcb6efcc4cebf48300271fb7236d9fbb5e /keyboards/helix/rev2 | |
| parent | e3299db9e33304589d75a5dc332a6c5c484a82be (diff) | |
| download | qmk_firmware-f30d6dd7858dfa3a0cf214113e8b1d45b30d74ce.tar.gz qmk_firmware-f30d6dd7858dfa3a0cf214113e8b1d45b30d74ce.zip | |
Helix config refine (#3374)
* helix config.h refine
Diffstat (limited to 'keyboards/helix/rev2')
| -rw-r--r-- | keyboards/helix/rev2/config.h | 3 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/default/config.h | 2 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/edvorakjp/config.h | 2 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows/config.h | 2 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows_jis/config.h | 4 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/froggy/config.h | 2 | ||||
| -rw-r--r-- | keyboards/helix/rev2/keymaps/led_test/config.h | 2 | ||||
| -rw-r--r-- | keyboards/helix/rev2/matrix.c | 1 | ||||
| -rw-r--r-- | keyboards/helix/rev2/serial_config.h | 16 | ||||
| -rw-r--r-- | keyboards/helix/rev2/split_util.c | 1 |
10 files changed, 16 insertions, 19 deletions
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h index 530757883..058236122 100644 --- a/keyboards/helix/rev2/config.h +++ b/keyboards/helix/rev2/config.h | |||
| @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | #ifndef REV2_CONFIG_H | 19 | #ifndef REV2_CONFIG_H |
| 20 | #define REV2_CONFIG_H | 20 | #define REV2_CONFIG_H |
| 21 | 21 | ||
| 22 | #include "../config.h" | ||
| 23 | |||
| 24 | /* USB Device descriptor parameter */ | 22 | /* USB Device descriptor parameter */ |
| 25 | #define VENDOR_ID 0xFEED | 23 | #define VENDOR_ID 0xFEED |
| 26 | #define PRODUCT_ID 0x3060 | 24 | #define PRODUCT_ID 0x3060 |
| @@ -37,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 37 | /* Use I2C or Serial */ | 35 | /* Use I2C or Serial */ |
| 38 | #define USE_I2C | 36 | #define USE_I2C |
| 39 | #define USE_SERIAL | 37 | #define USE_SERIAL |
| 40 | #define USE_SERIAL_PD2 | ||
| 41 | //#define USE_MATRIX_I2C | 38 | //#define USE_MATRIX_I2C |
| 42 | 39 | ||
| 43 | /* Select hand configuration */ | 40 | /* Select hand configuration */ |
diff --git a/keyboards/helix/rev2/keymaps/default/config.h b/keyboards/helix/rev2/keymaps/default/config.h index 0e7967c73..6da6849a1 100644 --- a/keyboards/helix/rev2/keymaps/default/config.h +++ b/keyboards/helix/rev2/keymaps/default/config.h | |||
| @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | ||
| 25 | |||
| 26 | // place overrides here | 24 | // place overrides here |
| 27 | 25 | ||
| 28 | #endif /* CONFIG_USER_H */ | 26 | #endif /* CONFIG_USER_H */ |
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h index bb569ca5d..a7a5f8360 100644 --- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h +++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef CONFIG_USER_H | 1 | #ifndef CONFIG_USER_H |
| 2 | #define CONFIG_USER_H | 2 | #define CONFIG_USER_H |
| 3 | 3 | ||
| 4 | #include "../../config.h" | ||
| 5 | |||
| 6 | #undef TAPPING_FORCE_HOLD | 4 | #undef TAPPING_FORCE_HOLD |
| 7 | #undef TAPPING_TERM | 5 | #undef TAPPING_TERM |
| 8 | #define TAPPING_TERM 120 | 6 | #define TAPPING_TERM 120 |
diff --git a/keyboards/helix/rev2/keymaps/five_rows/config.h b/keyboards/helix/rev2/keymaps/five_rows/config.h index 0e7967c73..6da6849a1 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/config.h +++ b/keyboards/helix/rev2/keymaps/five_rows/config.h | |||
| @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | ||
| 25 | |||
| 26 | // place overrides here | 24 | // place overrides here |
| 27 | 25 | ||
| 28 | #endif /* CONFIG_USER_H */ | 26 | #endif /* CONFIG_USER_H */ |
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/config.h b/keyboards/helix/rev2/keymaps/five_rows_jis/config.h index 17c4a30b3..b4390551e 100644 --- a/keyboards/helix/rev2/keymaps/five_rows_jis/config.h +++ b/keyboards/helix/rev2/keymaps/five_rows_jis/config.h | |||
| @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | ||
| 25 | |||
| 26 | /* Use I2C or Serial */ | 24 | /* Use I2C or Serial */ |
| 27 | 25 | ||
| 28 | #define USE_I2C | 26 | #define USE_I2C |
| @@ -59,8 +57,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 59 | #error "expected HELIX_ROWS 4 or 5" | 57 | #error "expected HELIX_ROWS 4 or 5" |
| 60 | #endif | 58 | #endif |
| 61 | 59 | ||
| 62 | #define USE_SERIAL_PD2 | ||
| 63 | |||
| 64 | #define PREVENT_STUCK_MODIFIERS | 60 | #define PREVENT_STUCK_MODIFIERS |
| 65 | #define TAPPING_FORCE_HOLD | 61 | #define TAPPING_FORCE_HOLD |
| 66 | #define TAPPING_TERM 100 | 62 | #define TAPPING_TERM 100 |
diff --git a/keyboards/helix/rev2/keymaps/froggy/config.h b/keyboards/helix/rev2/keymaps/froggy/config.h index 8161d4a25..df72aef12 100644 --- a/keyboards/helix/rev2/keymaps/froggy/config.h +++ b/keyboards/helix/rev2/keymaps/froggy/config.h | |||
| @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | ||
| 25 | |||
| 26 | #undef TAPPING_TERM | 24 | #undef TAPPING_TERM |
| 27 | #define TAPPING_TERM 200 | 25 | #define TAPPING_TERM 200 |
| 28 | #define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped this number of times again. */ | 26 | #define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped this number of times again. */ |
diff --git a/keyboards/helix/rev2/keymaps/led_test/config.h b/keyboards/helix/rev2/keymaps/led_test/config.h index 0e7967c73..6da6849a1 100644 --- a/keyboards/helix/rev2/keymaps/led_test/config.h +++ b/keyboards/helix/rev2/keymaps/led_test/config.h | |||
| @@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | ||
| 25 | |||
| 26 | // place overrides here | 24 | // place overrides here |
| 27 | 25 | ||
| 28 | #endif /* CONFIG_USER_H */ | 26 | #endif /* CONFIG_USER_H */ |
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c index a908360c5..8a1ce3af1 100644 --- a/keyboards/helix/rev2/matrix.c +++ b/keyboards/helix/rev2/matrix.c | |||
| @@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 30 | #include "matrix.h" | 30 | #include "matrix.h" |
| 31 | #include "split_util.h" | 31 | #include "split_util.h" |
| 32 | #include "pro_micro.h" | 32 | #include "pro_micro.h" |
| 33 | #include "config.h" | ||
| 34 | 33 | ||
| 35 | #ifdef USE_MATRIX_I2C | 34 | #ifdef USE_MATRIX_I2C |
| 36 | # include "i2c.h" | 35 | # include "i2c.h" |
diff --git a/keyboards/helix/rev2/serial_config.h b/keyboards/helix/rev2/serial_config.h new file mode 100644 index 000000000..82c6e4e83 --- /dev/null +++ b/keyboards/helix/rev2/serial_config.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | #ifndef SOFT_SERIAL_CONFIG_H | ||
| 2 | #define SOFT_SERIAL_CONFIG_H | ||
| 3 | |||
| 4 | /* Soft Serial defines */ | ||
| 5 | #define SERIAL_PIN_DDR DDRD | ||
| 6 | #define SERIAL_PIN_PORT PORTD | ||
| 7 | #define SERIAL_PIN_INPUT PIND | ||
| 8 | #define SERIAL_PIN_MASK _BV(PD2) | ||
| 9 | #define SERIAL_PIN_INTERRUPT INT2_vect | ||
| 10 | |||
| 11 | #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 | ||
| 12 | #define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2 | ||
| 13 | |||
| 14 | //// #error rev2 serial config | ||
| 15 | |||
| 16 | #endif /* SOFT_SERIAL_CONFIG_H */ | ||
diff --git a/keyboards/helix/rev2/split_util.c b/keyboards/helix/rev2/split_util.c index 8bc064174..beb39fa00 100644 --- a/keyboards/helix/rev2/split_util.c +++ b/keyboards/helix/rev2/split_util.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include "split_util.h" | 7 | #include "split_util.h" |
| 8 | #include "matrix.h" | 8 | #include "matrix.h" |
| 9 | #include "keyboard.h" | 9 | #include "keyboard.h" |
| 10 | #include "config.h" | ||
| 11 | 10 | ||
| 12 | #ifdef USE_MATRIX_I2C | 11 | #ifdef USE_MATRIX_I2C |
| 13 | # include "i2c.h" | 12 | # include "i2c.h" |
