summaryrefslogtreecommitdiff
path: root/keyboards/satt/comet46
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/satt/comet46')
-rw-r--r--keyboards/satt/comet46/config.h4
-rw-r--r--keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c2
-rw-r--r--keyboards/satt/comet46/keymaps/satt/keymap.c2
-rw-r--r--keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/satt/comet46/config.h b/keyboards/satt/comet46/config.h
index f14a389382..f67dcc1761 100644
--- a/keyboards/satt/comet46/config.h
+++ b/keyboards/satt/comet46/config.h
@@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
// Define masks for modifiers
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT))
+#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTL))
#define MODS_ALT_MASK (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
#define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
diff --git a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
index 4a7cb3a3a2..392baa0961 100644
--- a/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
+++ b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
@@ -83,7 +83,7 @@ uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shi
uint16_t pseudo_keycode;
switch (keycode) {
- case KC_A ... KC_CAPSLOCK:
+ case KC_A ... KC_CAPS_LOCK:
#if defined(__AVR__)
if (shift_modded) {
pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
index 0f5c6876e7..f57e97724c 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap.c
+++ b/keyboards/satt/comet46/keymaps/satt/keymap.c
@@ -38,7 +38,7 @@ enum custom_keycodes {
#define KC_JHEN JP_HENK // henkan
#define KC_JKAN JP_KANA // katakana/hiragana|ro-mazi
#define KC_JMKA JP_LANG1 //kana on MacOSX
-#define KC_JMEI KC_LANG2 //eisu on MacOSX
+#define KC_JMEI KC_LNG2 //eisu on MacOSX
#define KC_JAMP JP_AMPR // &
#define KC_JQUO JP_QUOT // '
#define KC_JLPR JP_LPRN // (
diff --git a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
index e32a0579aa..a99af7770e 100644
--- a/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
+++ b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
@@ -15,11 +15,11 @@ const uint16_t PROGMEM keymap_jis2us[][2] = {
[KC_8] = { KC_8, KC_DQT }, /* 8 and ( -> 8 and * */
[KC_9] = { KC_9, KC_ASTR }, /* 9 and ) -> 9 and ( */
[KC_0] = { KC_0, KC_LPRN }, /* 0 and (no assign) -> 0 and ) */
- [KC_MINS] = { KC_MINS, S(KC_RO) }, /* - and = -> - and _ */
+ [KC_MINS] = { KC_MINS, S(KC_INT1) }, /* - and = -> - and _ */
[KC_EQL] = { KC_UNDS, KC_COLN }, /* ^ and ~ -> = and + */
[KC_LBRC] = { KC_RBRC, KC_RCBR }, /* @ and ` -> [ and { */
[KC_RBRC] = { KC_BSLS, KC_PIPE }, /* [ and { -> ] and } */
- [KC_BSLS] = { KC_JYEN, S(KC_JYEN) }, /* ] and } -> / and | */
+ [KC_BSLS] = { KC_INT3, S(KC_INT3) }, /* ] and } -> / and | */
[KC_NUHS] = { KC_NUHS, S(KC_NUHS) }, /* (no assign) */
[KC_SCLN] = { KC_SCLN, KC_QUOT }, /* ; and + -> ; and : */
[KC_QUOT] = { KC_AMPR, KC_AT }, /* : and * -> ' and " */