Skip to content

Commit

Permalink
Simplification of default keymap options
Browse files Browse the repository at this point in the history
- moved keymap config.h options to the kb config.h
- added rgblight to the json files
- added tapping term and tapping term per key to json
  • Loading branch information
t4corun committed Sep 28, 2024
1 parent 2d3e9b9 commit 69f3644
Show file tree
Hide file tree
Showing 26 changed files with 301 additions and 681 deletions.
41 changes: 24 additions & 17 deletions keyboards/geigeigeist/klor/config.h
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
/* Copyright 2022 GEIST (@geigeigeist)
* Copyright 2024 t4corun (@t4corun)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Copyright 2022 GEIST <@geigeigeist>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

// Most configuration will be found in info.json

// ┌─────────────────────────────────────────────────┐
// │ g e n e r a l │
// └─────────────────────────────────────────────────┘

#define MASTER_LEFT
#define NO_ACTION_ONESHOT

// ┌─────────────────────────────────────────────────┐
// │ o l e d s │
// └─────────────────────────────────────────────────┘
Expand Down Expand Up @@ -62,7 +69,7 @@
#define DRV2605L_V_RMS 2.0
#define DRV2605L_F_LRA 150 // resonance freq
#define DRV2605L_GREETING DRV2605L_EFFECT_750_MS_ALERT_100
#define DRV2605L_DEFAULT_MODE DRV2605L_EFFECT_SOFT_BUMP_100
#define DRV2605L_DEFAULT_MODE DRV2605L_EFFECT_STRONG_CLICK_30
#endif // HAPTIC_ENABLE && HAPTIC_DRV2605L

// ┌─────────────────────────────────────────────────┐
Expand Down
17 changes: 0 additions & 17 deletions keyboards/geigeigeist/klor/halconf.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
/* Copyright 2022 GEIST (@geigeigeist)
* Copyright 2024 t4corun (@t4corun)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define HAL_USE_I2C TRUE
Expand Down
155 changes: 81 additions & 74 deletions keyboards/geigeigeist/klor/info.json
Original file line number Diff line number Diff line change
@@ -1,113 +1,120 @@
{
"manufacturer": "GEIST",
"maintainer": "t4corun",
"url": "https://github.com/GEIGEIGEIST/KLOR",
"usb": {
"vid": "0x3A3C"
"audio": {
"driver": "pwm_hardware",
"voices": true
},

"processor": "RP2040",
"bootloader": "rp2040",

"matrix_pins": {
"cols": [ "GP27", "GP26", "GP22", "GP20", "GP23", "GP21" ],
"rows": [ "GP5", "GP6", "GP7", "GP8" ]
"bootmagic": {
"enabled": true
},
"diode_direction": "COL2ROW",

"encoder": {
"rotary": [
{"pin_a": "GP28", "pin_b": "GP29", "resolution": 2}
]
},
"features": {
"audio": false,
"command": false,
"console": false,
"encoder": true,
"extrakey": false,
"extrakey": true,
"haptic": false,
"oled": true,
"rgb_matrix": false,
"rgblight": false,
"swap_hands": true
},

"bootmagic": {
"enabled": true
"haptic": {
"driver": "drv2605l"
},
"matrix_pins": {
"cols": ["GP27", "GP26", "GP22", "GP20", "GP23", "GP21"],
"rows": ["GP5", "GP6", "GP7", "GP8"]
},

"mouse_key": {
"enabled": false
},

"split": {
"enabled": true,
"encoder": {
"right": {
"rotary": [
{
"pin_a": "GP29",
"pin_b": "GP28",
"resolution": 2
}
]
}
},
"serial": {
"driver": "vendor",
"pin": "GP1"
"processor": "RP2040",
"qmk": {
"locking": {
"enabled": false,
"resync": false
}
},
"rgblight": {
"led_count": 100,
"animations": {
"breathing": true,
"snake": true
},
"transport": {
"protocol": "serial",
"sync": {
"matrix_state": true,
"oled": true,
"haptic": true
}
}
},

"encoder": {
"rotary": [
{
"pin_a": "GP28",
"pin_b": "GP29",
"resolution": 2
}
]
},

"ws2812": {
"pin": "GP0",
"driver": "vendor"
"default": {
"animation": "breathing",
"hue": 4,
"sat": 79,
"speed": 32,
"val": 59
},
"driver": "ws2812",
"sleep": true,
"split": true
},

"rgb_matrix": {
"driver": "ws2812",
"max_brightness": 180,
"sleep": true,
"timeout": 60000,
"animations": {
"breathing": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_pinwheel": true,
"hue_breathing": true,
"typing_heatmap": true,
"cycle_up_down": true,
"digital_rain": true,
"splash": true
"hue_breathing": true,
"splash": true,
"typing_heatmap": true
},
"default": {
"animation": "cycle_pinwheel",
"hue": 4,
"sat": 79,
"val": 59,
"speed": 32
"speed": 32,
"val": 59
},
"driver": "ws2812",
"max_brightness": 180,
"sleep": true,
"timeout": 60000
},
"split": {
"enabled": true,
"encoder": {
"right": {
"rotary": [
{"pin_a": "GP29", "pin_b": "GP28", "resolution": 2}
]
}
},
"serial": {
"driver": "vendor",
"pin": "GP1"
},
"transport": {
"protocol": "serial",
"sync": {
"haptic": true,
"matrix_state": true,
"oled": true
}
}
},

"haptic": {
"driver": "drv2605l"
"tapping": {
"term": 170,
"term_per_key": true
},

"audio": {
"driver": "pwm_hardware",
"voices": true
"url": "https://github.com/GEIGEIGEIST/KLOR",
"usb": {
"vid": "0x3A3C"
},
"ws2812": {
"driver": "vendor",
"pin": "GP0"
}
}
4 changes: 2 additions & 2 deletions keyboards/geigeigeist/klor/klor.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Copyright 2022 GEIST (@geigeigeist)
* Copyright 2024 t4corun (@t4corun)
/* Copyright 2022
* GEIST @geigeigeist
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions keyboards/geigeigeist/klor/klor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Copyright 2022 GEIST (@geigeigeist)
* Copyright 2024 t4corun (@t4corun)
/* Copyright 2022
* GEIST @geigeigeist
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit 69f3644

Please sign in to comment.