summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-03-10 22:48:18 +0000
committerGitHub <noreply@github.com>2021-03-10 22:48:18 +0000
commit790f94533c936409e6be56e8b638969b42350180 (patch)
tree9da39389c6565e8755a9075be6c4fee95e6028af /keyboards/mechlovin
parent9089244db77d724f23ddfc01be370f9c029c8e6c (diff)
Refactor to use led config - Part 6 (#12115)
* Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * Convert to config * revert changes
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/adelais/adelais.c27
-rw-r--r--keyboards/mechlovin/adelais/config.h4
-rw-r--r--keyboards/mechlovin/delphine/config.h4
-rw-r--r--keyboards/mechlovin/delphine/delphine.c18
-rw-r--r--keyboards/mechlovin/hannah65/config.h2
-rw-r--r--keyboards/mechlovin/hannah65/hannah65.c18
-rw-r--r--keyboards/mechlovin/infinity87/config.h2
-rw-r--r--keyboards/mechlovin/infinity87/infinity87.c21
-rw-r--r--keyboards/mechlovin/infinity88/config.h2
-rw-r--r--keyboards/mechlovin/infinity88/infinity88.c22
-rw-r--r--keyboards/mechlovin/pisces/config.h2
-rw-r--r--keyboards/mechlovin/pisces/pisces.c25
12 files changed, 15 insertions, 132 deletions
diff --git a/keyboards/mechlovin/adelais/adelais.c b/keyboards/mechlovin/adelais/adelais.c
index da5f68f62b..b9df471d33 100644
--- a/keyboards/mechlovin/adelais/adelais.c
+++ b/keyboards/mechlovin/adelais/adelais.c
@@ -15,30 +15,3 @@
*/
#include "adelais.h"
-
-void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
-
- matrix_init_user();
- led_init_ports();
-}
-
-void led_init_ports(void) {
- setPinOutput(B2);
- writePinLow(B2);
- setPinOutput(C15);
- writePinLow(C15);
- setPinOutput(B9);
- writePinLow(B9);
-}
-
-bool led_update_kb(led_t led_state) {
- if(led_update_user(led_state)) {
- writePin(B2, led_state.caps_lock);
- writePin(B9, led_state.scroll_lock);
- writePin(C15, led_state.num_lock);
- }
-
- return true;
-}
diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h
index 875eba5148..3ec5c49132 100644
--- a/keyboards/mechlovin/adelais/config.h
+++ b/keyboards/mechlovin/adelais/config.h
@@ -30,3 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN C15
+#define LED_CAPS_LOCK_PIN B2
+#define LED_SCROLL_LOCK_PIN B9
diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h
index b3a084f67e..a642f37f9b 100644
--- a/keyboards/mechlovin/delphine/config.h
+++ b/keyboards/mechlovin/delphine/config.h
@@ -41,4 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, D3 }
#define MATRIX_COL_PINS { F7, D7, D6, D2 }
-#define DIODE_DIRECTION COL2ROW \ No newline at end of file
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN B5
diff --git a/keyboards/mechlovin/delphine/delphine.c b/keyboards/mechlovin/delphine/delphine.c
index 52292b3c92..8e33b6603c 100644
--- a/keyboards/mechlovin/delphine/delphine.c
+++ b/keyboards/mechlovin/delphine/delphine.c
@@ -15,21 +15,3 @@
*/
#include "delphine.h"
-
-void matrix_init_kb(void) {
- matrix_init_user();
- led_init_ports();
-}
-
-void led_init_ports(void) {
- setPinOutput(B5);
- writePinLow(B5);
-}
-
-bool led_update_kb(led_t led_state) {
- if(led_update_user(led_state)) {
- writePin(B5, led_state.num_lock);
- }
-
- return true;
-}
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index 6801c30a3d..8c94fe4b35 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -41,6 +41,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
+#define LED_CAPS_LOCK_PIN B9
+
#define BACKLIGHT_PIN B8
#define BACKLIGHT_BREATHING
#define BACKLIGHT_PWM_DRIVER PWMD3
diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c
index 4f937d8a2a..92e0917ebe 100644
--- a/keyboards/mechlovin/hannah65/hannah65.c
+++ b/keyboards/mechlovin/hannah65/hannah65.c
@@ -15,21 +15,3 @@
*/
#include "hannah65.h"
-
-void matrix_init_kb(void) {
- matrix_init_user();
- led_init_ports();
-}
-
-void led_init_ports(void) {
- setPinOutput(B9);
- writePinLow(B9);
-}
-
-bool led_update_kb(led_t led_state) {
- if(led_update_user(led_state)) {
- writePin(B9, led_state.caps_lock);
- }
-
- return true;
-}
diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h
index 703a06f8de..ccb9f67566 100644
--- a/keyboards/mechlovin/infinity87/config.h
+++ b/keyboards/mechlovin/infinity87/config.h
@@ -45,6 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
+#define LED_NUM_LOCK_PIN A3
+#define LED_CAPS_LOCK_PIN A4
#define BACKLIGHT_PIN B0
#define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/infinity87/infinity87.c b/keyboards/mechlovin/infinity87/infinity87.c
index 2de528bc36..434e796091 100644
--- a/keyboards/mechlovin/infinity87/infinity87.c
+++ b/keyboards/mechlovin/infinity87/infinity87.c
@@ -15,24 +15,3 @@
*/
#include "infinity87.h"
-
-void matrix_init_kb(void) {
- matrix_init_user();
- led_init_ports();
-}
-
-void led_init_ports(void) {
- setPinOutput(A3);
- writePinLow(A3);
- setPinOutput(A4);
- writePinLow(A4);
-}
-
-bool led_update_kb(led_t led_state) {
- if(led_update_user(led_state)) {
- writePin(A4, led_state.caps_lock);
- writePin(A3, led_state.num_lock);
- }
-
- return true;
-}
diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h
index df1ea4957b..a387b76386 100644
--- a/keyboards/mechlovin/infinity88/config.h
+++ b/keyboards/mechlovin/infinity88/config.h
@@ -45,6 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
+#define LED_NUM_LOCK_PIN A3
+#define LED_CAPS_LOCK_PIN A4
#define BACKLIGHT_PIN B0
#define BACKLIGHT_BREATHING
diff --git a/keyboards/mechlovin/infinity88/infinity88.c b/keyboards/mechlovin/infinity88/infinity88.c
index d342ce9eea..4d352358a7 100644
--- a/keyboards/mechlovin/infinity88/infinity88.c
+++ b/keyboards/mechlovin/infinity88/infinity88.c
@@ -15,25 +15,3 @@
*/
#include "infinity88.h"
-
-void matrix_init_kb(void) {
- matrix_init_user();
- led_init_ports();
-}
-
-void led_init_ports(void) {
- setPinOutput(A3);
- writePinLow(A3);
- setPinOutput(A4);
- writePinLow(A4);
-}
-
-bool led_update_kb(led_t led_state) {
- if(led_update_user(led_state)) {
- writePin(A4, led_state.caps_lock);
- writePin(A3, led_state.num_lock);
- }
-
- return true;
-}
-
diff --git a/keyboards/mechlovin/pisces/config.h b/keyboards/mechlovin/pisces/config.h
index 14f6404a7f..1debf021c8 100644
--- a/keyboards/mechlovin/pisces/config.h
+++ b/keyboards/mechlovin/pisces/config.h
@@ -45,6 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
+#define LED_CAPS_LOCK_PIN B2
+
#define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mechlovin/pisces/pisces.c b/keyboards/mechlovin/pisces/pisces.c
index 2a0a97f6d4..b43bf2aaa4 100644
--- a/keyboards/mechlovin/pisces/pisces.c
+++ b/keyboards/mechlovin/pisces/pisces.c
@@ -15,28 +15,3 @@
*/
#include "pisces.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
-
- matrix_init_user();
- led_init_ports();
-}
-
-void led_init_ports(void) {
- setPinOutput(B2);
- writePinLow(B2);
-}
-
-bool led_update_kb(led_t led_state) {
- if(led_update_user(led_state)) {
- writePin(B2, led_state.caps_lock);
- }
-
- return true;
-}