summaryrefslogtreecommitdiff
path: root/keyboards/helix/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/helix/rev2')
-rw-r--r--keyboards/helix/rev2/config.h6
-rw-r--r--keyboards/helix/rev2/keymaps/default/keymap.c8
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap.c6
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h5
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows/keymap.c16
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c8
-rw-r--r--keyboards/helix/rev2/keymaps/froggy/keymap.c10
-rw-r--r--keyboards/helix/rev2/keymaps/froggy_106/keymap.c12
-rw-r--r--keyboards/helix/rev2/keymaps/xulkal/rules.mk2
-rw-r--r--keyboards/helix/rev2/keymaps/yshrsmz/keymap.c8
-rw-r--r--keyboards/helix/rev2/serial_config_simpleapi.h1
11 files changed, 34 insertions, 48 deletions
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index c7e9e35db5..f409d039c4 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -25,13 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SPLIT_LAYER_STATE_ENABLE
#define SPLIT_LED_STATE_ENABLE
-/* Use I2C or Serial */
-#define USE_SERIAL
-//#define USE_MATRIX_I2C
-
/* Soft Serial defines */
#define SOFT_SERIAL_PIN D2
-#define SERIAL_USE_MULTI_TRANSACTION
/* Select hand configuration */
#define MASTER_LEFT
@@ -82,7 +77,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h
// Helix keyboard RGB LED support
-//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no
// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
#ifdef RGBLED_BACK
#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
index c7c65acaea..cc61ec4caa 100644
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -425,24 +425,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if (is_mac_mode()) {
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
} else {
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if (is_mac_mode()) {
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
} else {
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
return false;
break;
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
index 80d0392ffb..5cb34887c0 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
@@ -9,14 +9,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
switch (get_highest_layer(state)) {
case L_EDVORAKJP_LOWER:
- rgblight_sethsv_noeeprom_red();
+ rgblight_sethsv_noeeprom(HSV_RED);
break;
case L_EDVORAKJP_RAISE:
- rgblight_sethsv_noeeprom_green();
+ rgblight_sethsv_noeeprom(HSV_GREEN);
break;
default: // for any other layers, or the default layer
rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
- rgblight_sethsv_red();
+ rgblight_sethsv(HSV_RED);
break;
}
return state;
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
index aae83fc7a8..3ff95a3c6e 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
@@ -1,11 +1,6 @@
#pragma once
#include "edvorakjp.h"
-/*
- * enum custom_keycodes {
- * KC_LOCK = NEW_SAFE_RANGE,
- * };
- */
#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index 77d7f1607e..09c7ab127b 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -245,8 +245,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
/* Keypad function layer */
-#define PAUS__SLCK__PSCR KC_PAUS, KC_SLCK, KC_PSCR
-#define PSCR__SLCK__PAUS KC_PSCR, KC_SLCK, KC_PAUS
+#define PAUS__SLCK__PSCR KC_PAUS, KC_SCRL, KC_PSCR
+#define PSCR__SLCK__PAUS KC_PSCR, KC_SCRL, KC_PAUS
#define HOME___UP___PGUP KC_HOME, KC_UP, KC_PGUP
#define PGUP___UP___HOME KC_PGUP, KC_UP, KC_HOME
#define DEL____INS__LEFT__DOWN__RGHT KC_DEL, KC_INS, KC_LEFT, KC_DOWN, KC_RGHT
@@ -273,8 +273,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
/* Lower */
-#define XXXX__PAUS__SLCK___INS XXXX, KC_PAUS, KC_SLCK, KC_INS
-#define XXXX___INS__SLCK__PAUS__XXXX XXXX, KC_INS, KC_SLCK, KC_PAUS, XXXX
+#define XXXX__PAUS__SLCK___INS XXXX, KC_PAUS, KC_SCRL, KC_INS
+#define XXXX___INS__SLCK__PAUS__XXXX XXXX, KC_INS, KC_SCRL, KC_PAUS, XXXX
#define ADJ___ADJ KC_ADJ, KC_ADJ
#define HOME__XXXX___UP____DEL__PGUP KC_HOME, XXXX, KC_UP, KC_DEL, KC_PGUP
#define PGUP___DEL___UP___XXXX__HOME KC_PGUP, KC_DEL, KC_UP, XXXX, KC_HOME
@@ -446,24 +446,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case xEISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
return false;
break;
case xKANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
return false;
break;
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
index e8b3087701..6798a18e25 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
@@ -275,23 +275,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if (keymap_config.swap_lalt_lgui==false) {
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
} else {
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
break;
#endif
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
index eb574f9778..70bd84067c 100644
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, OSL(_FUNC), KC_HOME, KC_END, _______, \
_______, KC_ASTR, KC_P7, KC_P8, KC_P9, KC_MINS, \
KC_PDOT, KC_SLSH, KC_P4, KC_P5, KC_P6, KC_PLUS, \
- KC_NLCK, KC_P0, KC_P1, KC_P2, KC_P3, LCTL(S(KC_F1)), _______, \
+ KC_NUM, KC_P0, KC_P1, KC_P2, KC_P3, LCTL(S(KC_F1)), _______, \
_______, _______, KC_PDOT, KC_COMM, _______, _______, _______ \
)
};
@@ -347,24 +347,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
return false;
break;
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
index a5a82eca98..fe375154f8 100644
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
@@ -200,14 +200,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, OSL(_FUNC), KC_HOME, KC_END, _______, \
_______, KC_ASTR, KC_P7, KC_P8, KC_P9, KC_MINS, \
KC_DOT, KC_SLSH, KC_P4, KC_P5, KC_P6, KC_PLUS, \
- KC_NLCK, KC_P0, KC_P1, KC_P2, KC_P3, LCTL(S(KC_F1)), _______, \
+ KC_NUM, KC_P0, KC_P1, KC_P2, KC_P3, LCTL(S(KC_F1)), _______, \
_______, _______, KC_PDOT, KC_COMM, _______, _______, _______ \
),
[_NUM_106] = LAYOUT_half( \
_______, _______, OSL(_FUNC), KC_HOME, KC_END, _______, \
_______, JP_ASTR, KC_P7, KC_P8, KC_P9, JP_MINS, \
KC_DOT, JP_SLSH, KC_P4, KC_P5, KC_P6, JP_PLUS, \
- KC_NLCK, KC_P0, KC_P1, KC_P2, KC_P3, LCTL(S(KC_F1)), _______, \
+ KC_NUM, KC_P0, KC_P1, KC_P2, KC_P3, LCTL(S(KC_F1)), _______, \
_______, _______, KC_PDOT, JP_COMM, _______, _______, _______ \
),
@@ -466,24 +466,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(IS_MODE_MAC()){
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(IS_MODE_MAC()){
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
return false;
break;
diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index bdf0479a40..5a9c1e2890 100644
--- a/keyboards/helix/rev2/keymaps/xulkal/rules.mk
+++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -1,6 +1,4 @@
RGBLIGHT_ENABLE = yes
-# Enable RGBLIGHT Animations
-OPT_DEFS += -DRGBLIGHT_ANIMATIONS
# Helix specific define for correct RGBLED_NUM
OPT_DEFS += -DRGBLED_BACK
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
index 5fecc2f766..65a2150a30 100644
--- a/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
+++ b/keyboards/helix/rev2/keymaps/yshrsmz/keymap.c
@@ -409,24 +409,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG2);
+ register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG2);
+ unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LANG1);
+ register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
- unregister_code(KC_LANG1);
+ unregister_code(KC_LNG1);
}
return false;
break;
diff --git a/keyboards/helix/rev2/serial_config_simpleapi.h b/keyboards/helix/rev2/serial_config_simpleapi.h
index 0e1dd9e4ac..b51e6f281b 100644
--- a/keyboards/helix/rev2/serial_config_simpleapi.h
+++ b/keyboards/helix/rev2/serial_config_simpleapi.h
@@ -1,5 +1,4 @@
#pragma once
-#undef SERIAL_USE_MULTI_TRANSACTION
#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2