summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authormechlovin <57231893+mechlovin@users.noreply.github.com>2021-09-24 00:13:23 -0700
committerGitHub <noreply@github.com>2021-09-24 00:13:23 -0700
commitfcb7c7b04fc822e04ac0d2ba9ba8d2483d838b80 (patch)
tree0ff2d621776df0f162f91448b0be9280cedc9f96 /keyboards
parentd7e61e56bb020832ae13e7776b88eddb717ee0e6 (diff)
[Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, Adelais AVR rev. 1 (#14252)
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/mechlovin/adelais/adelais.h44
-rw-r--r--keyboards/mechlovin/adelais/config.h9
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/config.h21
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/readme.md16
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/config.h7
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h30
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/config.h7
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h30
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/config.h77
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/halconf.h (renamed from keyboards/mechlovin/adelais/standard_led/halconf.h)1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/mcuconf.h (renamed from keyboards/mechlovin/adelais/standard_led/mcuconf.h)1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c166
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rev3.h52
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk5
-rw-r--r--keyboards/mechlovin/adelais/rules.mk4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/.noci (renamed from keyboards/mechlovin/adelais/standard_led/.noci)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/chconf.h24
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/config.h (renamed from keyboards/mechlovin/adelais/standard_led/config.h)8
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/halconf.h24
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/mcuconf.h29
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/readme.md (renamed from keyboards/mechlovin/adelais/standard_led/readme.md)2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/.noci (renamed from keyboards/mechlovin/adelais/standard_led/rev2/.noci)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h (renamed from keyboards/mechlovin/adelais/standard_led/rev2/config.h)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/rev2.h49
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk (renamed from keyboards/mechlovin/adelais/standard_led/rev2/rules.mk)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h (renamed from keyboards/mechlovin/adelais/standard_led/rev3/config.h)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/rev3.h49
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk (renamed from keyboards/mechlovin/adelais/standard_led/rev3/rules.mk)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk5
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h (renamed from keyboards/mechlovin/adelais/standard_led/rev4/config.h)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/readme.md16
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rev4.h49
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk (renamed from keyboards/mechlovin/adelais/standard_led/rev4/rules.mk)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk6
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rules.mk2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/.noci0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/readme.md (renamed from keyboards/mechlovin/adelais/standard_led/rev4/readme.md)6
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h67
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c363
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/readme.md16
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/rev1.h48
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk13
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rules.mk2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/rules.mk8
44 files changed, 1190 insertions, 66 deletions
diff --git a/keyboards/mechlovin/adelais/adelais.h b/keyboards/mechlovin/adelais/adelais.h
index 5a5673abc7..12af379c88 100644
--- a/keyboards/mechlovin/adelais/adelais.h
+++ b/keyboards/mechlovin/adelais/adelais.h
@@ -18,32 +18,18 @@
#include "quantum.h"
-#define LAYOUT_alice_split_bs( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_alice( \
- K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
- K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
- K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
- K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
- K40, K42, K44, K46, K48, K4A, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
-}
-
-#define LAYOUT_all LAYOUT_alice_split_bs
+#ifdef KEYBOARD_mechlovin_adelais_rgb_led_rev1
+ #include "rev1.h"
+#elif KEYBOARD_mechlovin_adelais_rgb_led_rev2
+ #include "rev2.h"
+#elif KEYBOARD_mechlovin_adelais_rgb_led_rev3
+ #include "rev3.h"
+#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev2
+ #include "rev2.h"
+#elif KEYBOARD_mechlovin_adelais_standard_led__armrev3
+ #include "rev3.h"
+#elif KEYBOARD_mechlovin_adelais_standard_led_arm_rev4
+ #include "rev4.h"
+#elif KEYBOARD_mechlovin_adelais_standard_led_avr_rev1
+ #include "rev1.h"
+#endif
diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h
index 3ec5c49132..035ffa8032 100644
--- a/keyboards/mechlovin/adelais/config.h
+++ b/keyboards/mechlovin/adelais/config.h
@@ -26,11 +26,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key matrix size */
#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define LED_NUM_LOCK_PIN C15
-#define LED_CAPS_LOCK_PIN B2
-#define LED_SCROLL_LOCK_PIN B9
+#define MATRIX_COLS 15 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/rgb_led/config.h b/keyboards/mechlovin/adelais/rgb_led/config.h
new file mode 100644
index 0000000000..2ec0afd47b
--- /dev/null
+++ b/keyboards/mechlovin/adelais/rgb_led/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2020 Team Mechlovin'
+
+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
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechlovin/adelais/rgb_led/readme.md b/keyboards/mechlovin/adelais/rgb_led/readme.md
deleted file mode 100644
index f58ca7aa29..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Adelais En Ciel
-
-![adelais](https://i.imgur.com/6U1IfZe.png)
-
-Compatible with TGR Alice and all clone variants.
-`rgb_led` (Adelais En Ciel) comes with per-key RGB LEDs pre-soldered, rev.2 and rev.3 support a rotary encoder.
-
-* Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)
-* Hardware Supported: Adelais En Ciel
-* Hardware Availability: [Mechlovin.studio](https://mechlovin.studio/collections/pcb/products/adelais-en-ciel-alice-compatible-rgb-pcb?variant=33937050828939)
-
-Make example for this keyboard (after setting up your build environment):
-
- make mechlovin/adelais/rgb_led:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index d75cbd3f2a..97092e25e0 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -13,7 +13,12 @@
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+
+
+#define LED_NUM_LOCK_PIN C15
+#define LED_CAPS_LOCK_PIN B2
+#define LED_SCROLL_LOCK_PIN B9 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
index 16cdf9ed85..5a5673abc7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rev1.h
@@ -17,3 +17,33 @@
#pragma once
#include "quantum.h"
+
+#define LAYOUT_alice_split_bs( \
+ K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
+ K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
+ K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
+ K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
+ K40, K42, K44, K46, K48, K4A, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
+}
+
+#define LAYOUT_alice( \
+ K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
+ K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
+ K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
+ K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
+ K40, K42, K44, K46, K48, K4A, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
+}
+
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index c830edce26..9c71c537b7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -31,7 +31,7 @@
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
@@ -43,3 +43,8 @@
#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
+
+
+#define LED_NUM_LOCK_PIN C15
+#define LED_CAPS_LOCK_PIN B2
+#define LED_SCROLL_LOCK_PIN B9 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
index 16cdf9ed85..5a5673abc7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.h
@@ -17,3 +17,33 @@
#pragma once
#include "quantum.h"
+
+#define LAYOUT_alice_split_bs( \
+ K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
+ K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
+ K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
+ K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
+ K40, K42, K44, K46, K48, K4A, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
+}
+
+#define LAYOUT_alice( \
+ K1E, K00, K01, K02, K03, K04, K05, K06, K07,K08,K09, K0A, K0B, K0C, K0D, \
+ K2E, K10, K11, K12, K13, K14, K15, K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
+ K3E, K20, K21, K22, K23, K24, K25, K26,K27,K28, K29, K2A, K2B, K2D,\
+ K30, K32, K33, K34, K35, K36, K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
+ K40, K42, K44, K46, K48, K4A, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \
+ { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { K40, KC_NO, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, KC_NO, KC_NO, K4D, K4E }, \
+}
+
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
new file mode 100644
index 0000000000..f55d386f7a
--- /dev/null
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -0,0 +1,77 @@
+/*
+Copyright 2021 Mechlovin' Studio
+
+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 PRODUCT_ID 0xAEC3
+#define PRODUCT Adelais En Ciel Rev3
+
+#define MATRIX_ROW_PINS { A4, A3, C13, A1, A2}
+#define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A14, A13, A15, B3, B4, B5, B8, B9 }
+
+#define RGB_DI_PIN A7
+#define WS2812_SPI SPID1 // default: SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5
+#define RGBLED_NUM 23
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+//rgb matrix setting
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 0b1110100 AD <-> GND
+// 0b1110111 AD <-> VCC
+// 0b1110101 AD <-> SCL
+// 0b1110110 AD <-> SDA
+#define DRIVER_ADDR_1 0b0110010
+#define DRIVER_ADDR_2 0b0110010
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+
+#define RGB_MATRIX_DISABLE_KEYCODES
+
+#define ENCODERS_PAD_A { B12 }
+#define ENCODERS_PAD_B { B13 }
+#define ENCODER_RESOLUTION 4
+
+#define TAP_CODE_DELAY 10
+
+
+#define LED_NUM_LOCK_PIN A0
+#define LED_CAPS_LOCK_PIN C14
+#define LED_SCROLL_LOCK_PIN C15 \ No newline at end of file
diff --git a/keyboards/mechlovin/adelais/standard_led/halconf.h b/keyboards/mechlovin/adelais/rgb_led/rev3/halconf.h
index 01d02f71c3..d001829d03 100644
--- a/keyboards/mechlovin/adelais/standard_led/halconf.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/halconf.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#pragma once
#define HAL_USE_I2C TRUE
diff --git a/keyboards/mechlovin/adelais/standard_led/mcuconf.h b/keyboards/mechlovin/adelais/rgb_led/rev3/mcuconf.h
index b7ecee0204..20d2a82c27 100644
--- a/keyboards/mechlovin/adelais/standard_led/mcuconf.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/mcuconf.h
@@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#pragma once
#include_next <mcuconf.h>
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
new file mode 100644
index 0000000000..7631bc8505
--- /dev/null
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -0,0 +1,166 @@
+/* Copyright 2021 Team Mechlovin
+ *
+ * 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 "rev3.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+ {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
+ {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
+ {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */
+ {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* D73-K02-03 */
+ {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* D75-K03-04 */
+ {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* D77-K04-05 */
+ {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* D79-K05-06 */
+ {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* D81-K06-07 */
+ {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* D83-K07-08 */
+ {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* D85-K08-09 */
+ {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* D87-K09-10 */
+ {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* D90-K0A-11 */
+ {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* D93-K0B-12 */
+ {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* D95-K0C-13 */
+ {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* D98-K0D-14 */
+ {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* D100-K0E-15 */
+ {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* D94-K41-16 */
+ {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* D92-K10-17 */
+ {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* D89-K11-18 */
+ {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* D86-K12-19 */
+ {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* D84-K13-20 */
+ {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* D82-K14-21 */
+ {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* D80-K15-22 */
+ {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* D78-K16-23 */
+ {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* D76-K17-24 */
+ {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* D74-K18-25 */
+ {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* D72-K19-26 */
+ {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* D51-K1A-27 */
+ {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* D10-K1B-28 */
+ {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* D101-K1C-29 */
+ {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* D104-K1D-30 */
+ {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* D108-K43-31 */
+ {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* D111-K20-32 */
+ {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* D114-K21-33 */
+ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* D117-K22-34 */
+ {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* D120-K23-35 */
+ {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* D123-K24-36 */
+ {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* D126-K25-37 */
+ {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* D129-K26-38 */
+ {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* D133-K27-39 */
+ {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* D142-K28-40 */
+ {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* D146-K29-41 */
+ {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* D160-K2A-42 */
+ {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* D167-K2B-43 */
+ {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* D168-K2D-44 */
+
+ {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* D163-K30-45 */
+ {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* D147-K31-46 */
+ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* D144-K32-47 */
+ {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* D137-K33-48 */
+ {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* D130-K34-49 */
+ {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* D127-K35-50 */
+ {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* D124-K36-51 */
+ {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* D121-K37-52 */
+ {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* D118-K38-53 */
+ {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* D115-K39-54 */
+ {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* D112-K3A-55 */
+ {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* D109-K3B-56 */
+ {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* D105-K3D-57 */
+ {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* D103-K3E-58 */
+
+ {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* D163-K40-59 */
+ {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* D147-K42-60 */
+ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* D137-K44-61 */
+ {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* D127-K46-62 */
+ {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* D121-K48-63 */
+ {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* D115-K4A-64 */
+ {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* D103-K4E-65 */
+};
+
+led_config_t g_led_config = {
+ {
+ // Key Matrix to LED Index
+ { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
+ {17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, NO_LED},
+ {32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, NO_LED, 44, NO_LED},
+ {45, NO_LED, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58},
+ {59, NO_LED, 60, NO_LED, 61, NO_LED, 62, NO_LED, 63, NO_LED, 64, NO_LED, NO_LED, NO_LED, 65},
+ }, {
+ //LED Index to Physical Positon
+ {0,0}, { 17, 0}, { 34, 0 }, { 51, 0 }, { 69, 0}, { 86, 0}, {100, 0}, {103, 0}, { 120, 0}, { 138, 0}, { 155, 0}, { 172, 0}, { 189, 0}, {207, 0}, {215, 0}, {224, 0},
+ {0,16}, { 17, 16}, { 34,16 }, { 51,16 }, { 69,16}, { 86,16}, {103,16}, { 120,16}, { 138,16}, { 155,16}, { 172,16}, { 189,16}, {207, 16}, {215, 16}, {224,16},
+ {0,32}, { 17, 32}, { 34,32 }, { 51,32 }, { 69,32}, { 86,32}, {103,32}, { 120,32}, { 138,32}, { 155,32}, { 172,32}, { 189,32}, {207, 32}, {224,32},
+ { 17, 48}, { 34,48 }, { 51,48 }, { 69,48}, { 86,48}, {103,48}, { 120,48}, { 138,48}, { 155,48}, { 172,48}, { 189,48}, {207, 48}, {215, 48}, {224,48},
+ { 17, 64}, { 51,64 }, { 86,64}, { 103,64}, { 138,64}, { 172,64}, {224, 64},
+ }, {
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1,
+ }
+};
+
+__attribute__((weak)) void rgb_matrix_indicators_user(void) {
+ if (host_keyboard_led_state().caps_lock) {
+ rgb_matrix_set_color(32, 255, 255, 255);
+ }
+}
+
+
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ switch(keycode) {
+ #ifdef RGBLIGHT_ENABLE
+ #ifdef RGB_MATRIX_ENABLE
+ case KC_F13: // toggle rgb matrix
+ rgb_matrix_toggle();
+ return false;
+ case KC_F14:
+ rgb_matrix_step();
+ return false;
+ case KC_F15:
+ rgb_matrix_increase_