summaryrefslogtreecommitdiff
path: root/keyboards/sofle
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/sofle')
-rwxr-xr-xkeyboards/sofle/keyhive/config.h9
-rw-r--r--keyboards/sofle/keyhive/info.json14
-rwxr-xr-xkeyboards/sofle/keyhive/keyhive.c19
-rw-r--r--keyboards/sofle/keymaps/bastien-baloup_fr/config.h2
-rw-r--r--keyboards/sofle/keymaps/devdev/config.h2
-rw-r--r--keyboards/sofle/keymaps/keyhive_via/encoder.c5
-rw-r--r--keyboards/sofle/keymaps/killmaster/config.h2
-rw-r--r--keyboards/sofle/keymaps/rgb_default/config.h2
-rw-r--r--keyboards/sofle/keymaps/via/config.h2
-rw-r--r--keyboards/sofle/rev1/config.h5
-rw-r--r--keyboards/sofle/rev1/info.json5
-rw-r--r--keyboards/sofle/rev1/rev1.c2
-rw-r--r--keyboards/sofle/sofle.c2
-rw-r--r--keyboards/sofle/sofle.h7
14 files changed, 28 insertions, 50 deletions
diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index c65caad1de..80ad4912cb 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -18,14 +18,6 @@
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
-#define MATRIX_ROW_PINS_RIGHT { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT { F6, F7, B1, B3, B2, B6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
-
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 10
// OLED settings
@@ -39,7 +31,6 @@
// Add RGB underglow
// by defining in the keyboard, incompatible keymaps will fail to compile.
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN D3
# define RGBLED_NUM 74
# define RGBLED_SPLIT {37,37}
# define RGBLIGHT_LIMIT_VAL 100 // LED Brightness, high power draw may exceed the USB limitations of 0.6A and cause a crash.
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index f1d76cb788..dfbe30f133 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -6,6 +6,14 @@
"pid": "0x1287",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", null],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4"}
@@ -19,6 +27,12 @@
{"pin_a": "F4", "pin_b": "F5", "resolution": 2}
]
}
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6", null],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ }
}
},
"processor": "atmega32u4",
diff --git a/keyboards/sofle/keyhive/keyhive.c b/keyboards/sofle/keyhive/keyhive.c
deleted file mode 100755
index 72e2d583f1..0000000000
--- a/keyboards/sofle/keyhive/keyhive.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright
- * 2021 solartempest
- * 2021 QMK
- *
- * 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/>.
- */
-
-#include "keyhive.h"
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
index f15cd7b8fb..dd3b6d8f5a 100644
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
+++ b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
@@ -40,7 +40,7 @@
#if defined(KEYBOARD_sofle_rev1)
#define RGBLED_NUM 70
// D3 for ws2812 RGB LED
- #define RGB_DI_PIN D3
+ #define WS2812_DI_PIN D3
#endif
#endif
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index 6564238bba..7d14c6e337 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -45,7 +45,7 @@
#define RGBLIGHT_LAYERS
/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/keyhive_via/encoder.c b/keyboards/sofle/keymaps/keyhive_via/encoder.c
index 0883c4a48a..7775cb7b86 100644
--- a/keyboards/sofle/keymaps/keyhive_via/encoder.c
+++ b/keyboards/sofle/keymaps/keyhive_via/encoder.c
@@ -26,7 +26,7 @@
void encoder_action_unregister(void) {
for (int index = 0; index < 2; ++index) {
if (encoder_state[index]) {
- keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = (timer_read() | 1)};
+ keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = timer_read(), .type = KEY_EVENT};
encoder_state[index] = 0;
action_exec(encoder_event);
}
@@ -34,7 +34,7 @@
}
void encoder_action_register(uint8_t index, bool clockwise) {
- keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
+ keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = timer_read(), .type = KEY_EVENT};
encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
action_exec(encoder_event);
}
@@ -46,4 +46,3 @@
return false;
};
#endif
-
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
index e4649cc5be..10c9ea450e 100644
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ b/keyboards/sofle/keymaps/killmaster/config.h
@@ -20,7 +20,7 @@ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
for more options.
*/
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 6564238bba..7d14c6e337 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -45,7 +45,7 @@
#define RGBLIGHT_LAYERS
/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h
index 2806b70b0f..d4bf95b710 100644
--- a/keyboards/sofle/keymaps/via/config.h
+++ b/keyboards/sofle/keymaps/via/config.h
@@ -24,7 +24,7 @@ for more options.
#if defined(KEYBOARD_sofle_rev1)
// Add RGB underglow and top facing lighting
-# define RGB_DI_PIN D3
+# define WS2812_DI_PIN D3
# define RGBLED_NUM 70
# define RGBLED_SPLIT \
{ 36, 36 }
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index 34886b3be1..be64549748 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -1,10 +1,5 @@
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define DIODE_DIRECTION COL2ROW
-
#define TAPPING_TERM 100
#define TAP_CODE_DELAY 10
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json
index 4a113ec2f2..1f9829426e 100644
--- a/keyboards/sofle/rev1/info.json
+++ b/keyboards/sofle/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x0287",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F4", "resolution": 2}
diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c
index 88a28e6a40..567f8301e3 100644
--- a/keyboards/sofle/rev1/rev1.c
+++ b/keyboards/sofle/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "sofle.h"
+#include "rev1.h"
#ifdef RGB_MATRIX_ENABLE
// Physical Layout
diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c
index cdb8c1671a..bd3f3e157c 100644
--- a/keyboards/sofle/sofle.c
+++ b/keyboards/sofle/sofle.c
@@ -1,4 +1,4 @@
-#include "sofle.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/sofle/sofle.h b/keyboards/sofle/sofle.h
deleted file mode 100644
index 90ee00bfd7..0000000000
--- a/keyboards/sofle/sofle.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(KEYBOARD_sofle_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_sofle_keyhive)
-# include "keyhive.h"
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:34:12 +0000