Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
@kissetfall
kissetfall committed Feb 19, 2024
1 parent b4fcbd5 commit 659331c
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 99 deletions.
4 changes: 2 additions & 2 deletions keyboards/ergohaven/hpd/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MCU = RP2040
BOARD = GENERIC_RP_RP2040
BOOTLOADER = rp2040
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no
# ALLOW_WARNINGS = yes
# PICO_INTRINSICS_ENABLED = no

# Build options
SLEEP_LED_ENABLE = no
Expand Down
4 changes: 2 additions & 2 deletions keyboards/ergohaven/k02/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MCU = RP2040
BOARD = GENERIC_RP_RP2040
BOOTLOADER = rp2040
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no
# ALLOW_WARNINGS = yes
# PICO_INTRINSICS_ENABLED = no

# Build options
SLEEP_LED_ENABLE = no
Expand Down
22 changes: 11 additions & 11 deletions keyboards/ergohaven/k03/keymaps/kissetfall/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV,
KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_ESC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_MPLY,
LANG2, LANG1, KC_LCTL, LOWER, KC_SPC, KC_MUTE, KC_HOME, KC_BSPC, RAISE, KC_RSFT, KC_PGDN, KC_PGUP
KC_VOLD, KC_VOLU, KC_LCTL, LOWER, KC_SPC, PREVWRD, NEXTWRD, KC_BSPC, RAISE, KC_RSFT, KC_PGDN, KC_PGUP

),

[_LOWER] = LAYOUT(

_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_3, KC_2, KC_1, KC_0, KC_4, KC_7, KC_6, KC_5, KC_9, KC_8, _______,
KC_ENT, KC_LSFT, APP_S, KC_DEL, ALT_TAB, APP_G, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______,
_______, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, _______, _______, KC_HOME, _______, _______, KC_END, _______,
KC_ENT, APP_A, ALT_TAB, KC_DEL, KC_LSFT, LANG, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______,
_______, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, APP_B, _______, KC_HOME, CTRLDN, CTRLUP, KC_END, _______,
KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______

),
Expand All @@ -27,18 +27,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, KC_TILD, KC_EQL, KC_PLUS, _______, _______, KC_LPRN, KC_UNDS, KC_RPRN, _______, _______,
_______, KC_BSLS, KC_DLR, KC_MINS, KC_HASH, KC_EXLM, KC_QUES, KC_LBRC, KC_PERC, KC_RBRC, KC_AMPR, _______,
_______, _______, KC_ASTR, KC_COLN, KC_SLSH, _______, _______, KC_LCBR, KC_PIPE, KC_RCBR, _______, _______,
_______, LANG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)

};

#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(PREVWRD, NEXTWRD)},
[1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(CTRLDN, CTRLUP)},
[2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)},
};
#endif
// #ifdef ENCODER_MAP_ENABLE
// const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
// [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(PREVWRD, NEXTWRD)},
// [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(CTRLDN, CTRLUP)},
// [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______)},
// };
// #endif

#ifdef OLED_ENABLE

Expand Down
4 changes: 2 additions & 2 deletions keyboards/ergohaven/k03/keymaps/kissetfall/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VIAL_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
# ENCODER_ENABLE = yes
# ENCODER_MAP_ENABLE = yes
76 changes: 27 additions & 49 deletions keyboards/ergohaven/k03/keymaps/kissetfall/vial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"0,2",
{
"x": 9.5
"x": 7.25
},
"5,2"
],
Expand All @@ -61,7 +61,7 @@
},
"0,1",
{
"x": 7.5
"x": 5.25
},
"5,1",
{
Expand All @@ -80,7 +80,7 @@
},
"0,0",
{
"x": 5.5
"x": 3.25
},
"5,0",
{
Expand All @@ -95,7 +95,7 @@
},
"0,5",
{
"x": 15.5,
"x": 13.25,
"c": "#aaaaaa"
},
"5,5"
Expand All @@ -108,7 +108,7 @@
},
"1,2",
{
"x": 9.5
"x": 7.25
},
"6,2"
],
Expand All @@ -123,7 +123,7 @@
},
"1,1",
{
"x": 7.5
"x": 5.25
},
"6,1",
{
Expand All @@ -142,7 +142,7 @@
},
"1,0",
{
"x": 5.5
"x": 3.25
},
"6,0",
{
Expand All @@ -156,29 +156,18 @@
},
"1,5",
{
"x": 15.5
"x": 13.25
},
"6,5"
],
[
{
"y": -0.95,
"x": 6.25
},
"0,1\n\n\n\n\n\n\n\n\ne",
{
"x": 3
},
"1,1\n\n\n\n\n\n\n\n\ne"
],
[
{
"y": -0.5499999999999998,
"y": -0.5,
"x": 3
},
"2,2",
{
"x": 9.5
"x": 7.25
},
"7,2"
],
Expand All @@ -193,7 +182,7 @@
},
"2,1",
{
"x": 7.5
"x": 5.25
},
"7,1",
{
Expand All @@ -212,7 +201,7 @@
},
"2,0",
{
"x": 5.5
"x": 3.25
},
"7,0",
{
Expand All @@ -227,30 +216,19 @@
},
"2,5",
{
"x": 15.5,
"x": 13.25,
"c": "#cccccc"
},
"7,5"
],
[
{
"y": -0.9500000000000002,
"x": 6.25
},
"4,0",
{
"x": 3
},
"9,0"
],
[
{
"y": -0.5499999999999998,
"y": -0.5,
"x": 3
},
"3,2",
{
"x": 9.5
"x": 7.25
},
"8,2"
],
Expand All @@ -266,7 +244,7 @@
},
"3,1",
{
"x": 7.5,
"x": 5.25,
"n": true
},
"8,1",
Expand All @@ -286,7 +264,7 @@
},
"3,0",
{
"x": 5.5
"x": 3.25
},
"8,0",
{
Expand All @@ -301,21 +279,21 @@
},
"3,5",
{
"x": 15.5,
"x": 13.25,
"c": "#cccccc"
},
"8,5"
],
[
{
"y": -0.9500000000000002,
"x": 6.25
"x": 6
},
"0,0\n\n\n\n\n\n\n\n\ne",
"4,0",
{
"x": 3
"x": 1.25
},
"1,0\n\n\n\n\n\n\n\n\ne"
"9,0"
],
[
{
Expand All @@ -324,7 +302,7 @@
},
"4,4",
{
"x": 9.5
"x": 7.25
},
"9,4"
],
Expand All @@ -335,7 +313,7 @@
},
"4,5",
{
"x": 11.5
"x": 9.25
},
"9,5"
],
Expand All @@ -346,7 +324,7 @@
},
"4,3",
{
"x": 7.5
"x": 5.25
},
"9,3"
],
Expand All @@ -357,7 +335,7 @@
},
"4,2",
{
"x": 5.5
"x": 3.25
},
"9,2"
],
Expand All @@ -368,7 +346,7 @@
},
"4,1",
{
"x": 3.5
"x": 1.25
},
"9,1"
]
Expand Down
4 changes: 2 additions & 2 deletions keyboards/ergohaven/k03/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MCU = RP2040
BOARD = GENERIC_RP_RP2040
BOOTLOADER = rp2040
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no
# ALLOW_WARNINGS = yes
# PICO_INTRINSICS_ENABLED = no

# Build options
OLED_ENABLE = yes
Expand Down
4 changes: 2 additions & 2 deletions keyboards/ergohaven/macropad/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MCU = RP2040
BOARD = GENERIC_RP_RP2040
BOOTLOADER = rp2040
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no
# ALLOW_WARNINGS = yes
# PICO_INTRINSICS_ENABLED = no

# Build Options
ENCODER_ENABLE = yes
Expand Down
39 changes: 16 additions & 23 deletions keyboards/ergohaven/planeta/keymaps/kissetfall/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,30 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV,
KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_ESC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_MPLY,
KC_VOLD, KC_VOLU, KC_LCTL, LOWER, KC_SPC, AU_TOGG, CK_TOGG, KC_BSPC, RAISE, KC_RSFT, PREVWRD, NEXTWRD
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV,
KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_ESC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_MPLY,
KC_VOLD, KC_VOLU, KC_LCTL, LOWER, KC_SPC, PREVWRD, NEXTWRD, KC_BSPC, RAISE, KC_RSFT, KC_PGDN, KC_PGUP

),

[_LOWER] = LAYOUT(

_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_3, KC_2, KC_1, KC_0, KC_4, KC_7, KC_6, KC_5, KC_9, KC_8, _______,
KC_ENT, KC_LSFT, APP_S, KC_DEL, ALT_TAB, LANG, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______,
_______, _______, _______, APP_C, _______, SLV_H, _______, KC_HOME, CTRLDN, CTRLUP, KC_END, _______,
KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, ADJUST, _______, KC_PGDN, KC_PGUP
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_3, KC_2, KC_1, KC_0, KC_4, KC_7, KC_6, KC_5, KC_9, KC_8, _______,
KC_ENT, APP_A, ALT_TAB, KC_DEL, KC_LSFT, LANG, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______,
_______, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, APP_B, _______, KC_HOME, CTRLDN, CTRLUP, KC_END, _______,
KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, ADJUST, _______, _______, _______

),

[_RAISE] = LAYOUT(
_______, _______, _______, KC_AT, _______, _______, _______, _______, KC_CIRC, _______, _______, _______,
_______, _______, KC_TILD, KC_EQL, KC_PLUS, _______, _______, KC_LPRN, KC_UNDS, KC_RPRN, _______, _______,
_______, KC_BSLS, KC_DLR, KC_MINS, KC_HASH, KC_EXLM, KC_QUES, KC_LBRC, KC_PERC, KC_RBRC, KC_AMPR, _______,
_______, _______, KC_ASTR, KC_COLN, KC_SLSH, _______, _______, KC_LCBR, KC_PIPE, KC_RCBR, _______, _______,
_______, _______, _______, ADJUST, _______, _______, _______, _______, _______, _______, _______, _______
),
_______, _______, _______, KC_AT, _______, _______, _______, _______, KC_CIRC, _______, _______, _______,
_______, _______, KC_TILD, KC_EQL, KC_PLUS, _______, _______, KC_LPRN, KC_UNDS, KC_RPRN, _______, _______,
_______, KC_BSLS, KC_DLR, KC_MINS, KC_HASH, KC_EXLM, KC_QUES, KC_LBRC, KC_PERC, KC_RBRC, KC_AMPR, _______,
_______, _______, KC_ASTR, KC_COLN, KC_SLSH, _______, _______, KC_LCBR, KC_PIPE, KC_RCBR, _______, _______,
_______, _______, _______, ADJUST, _______, _______, _______, _______, _______, _______, _______, _______
)

[_ADJUST] = LAYOUT(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, CK_RST, CK_DOWN, CK_UP, _______, _______, KC_CAPS, _______, KC_BRID, KC_BRIU, _______, _______,
_______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
4 changes: 2 additions & 2 deletions keyboards/ergohaven/planeta/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MCU = RP2040
BOARD = GENERIC_RP_RP2040
BOOTLOADER = rp2040
ALLOW_WARNINGS = yes
PICO_INTRINSICS_ENABLED = no
# ALLOW_WARNINGS = yes
# PICO_INTRINSICS_ENABLED = no

DEFAULT_FOLDER = ergohaven/planeta/rev2

Expand Down
Loading

0 comments on commit 659331c

Please sign in to comment.