~ruther/qmk_firmware: [Keyboard] Refactor: add adelais rev.3 (#9496)

10 files changed, 73 insertions(+), 8 deletions(-)

M keyboards/mechlovin/adelais/keymaps/default/keymap.c
M keyboards/mechlovin/adelais/keymaps/via/keymap.c
M keyboards/mechlovin/adelais/readme.md
M keyboards/mechlovin/adelais/rules.mk
M keyboards/mechlovin/adelais/standard_led/config.h
A keyboards/mechlovin/adelais/standard_led/rev2/config.h
A keyboards/mechlovin/adelais/standard_led/rev2/rules.mk
A keyboards/mechlovin/adelais/standard_led/rev3/config.h
A keyboards/mechlovin/adelais/standard_led/rev3/rules.mk
M keyboards/mechlovin/adelais/standard_led/rules.mk

M keyboards/mechlovin/adelais/keymaps/default/keymap.c => keyboards/mechlovin/adelais/keymaps/default/keymap.c +28 -1

@@ 29,4 29,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
               KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                  KC_TRNS,          KC_TRNS,                            KC_TRNS ),
 
-};>
\ No newline at end of file
+};
+
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_LEFT);
+        } else {
+            tap_code(KC_RGHT);
+        }
+    }
+    else if (index == 2) {
+        if (clockwise) {
+            tap_code(KC_UP);
+        } else {
+            tap_code(KC_DOWN);
+        }
+    }
+}
+
+  #endif<
\ No newline at end of file

M keyboards/mechlovin/adelais/keymaps/via/keymap.c => keyboards/mechlovin/adelais/keymaps/via/keymap.c +28 -1

@@ 41,4 41,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
               KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
               KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                  KC_TRNS,          KC_TRNS,                            KC_TRNS ),
 
-};>
\ No newline at end of file
+};
+
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_LEFT);
+        } else {
+            tap_code(KC_RGHT);
+        }
+    }
+    else if (index == 2) {
+        if (clockwise) {
+            tap_code(KC_UP);
+        } else {
+            tap_code(KC_DOWN);
+        }
+    }
+}
+
+  #endif<
\ No newline at end of file

M keyboards/mechlovin/adelais/readme.md => keyboards/mechlovin/adelais/readme.md +1 -1

@@ 3,7 3,7 @@
 ![adelais](https://i.imgur.com/6U1IfZe.png)
 
 Compatible with TGR Alice and all clone variants.  
-`standard_led` (Adelais) comes with backlight and RGB underglow LEDs pre-soldered.  
+`standard_led` (Adelais) comes with backlight and RGB underglow LEDs pre-soldered. Adelais rev.3 support 3 rotary encoder, USB TypeC both side and reset button.
 `rgb_led` (Adelais En Ciel) comes with per-key RGB LEDs pre-soldered.
 
 * Keyboard Maintainer: [Team Mechlovin'](https://github.com/mechlovin)

M keyboards/mechlovin/adelais/rules.mk => keyboards/mechlovin/adelais/rules.mk +1 -1

@@ 20,4 20,4 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
 
-DEFAULT_FOLDER = mechlovin/adelais/standard_led>
\ No newline at end of file
+DEFAULT_FOLDER = mechlovin/adelais/standard_led/rev2<
\ No newline at end of file

M keyboards/mechlovin/adelais/standard_led/config.h => keyboards/mechlovin/adelais/standard_led/config.h +0 -1

@@ 1,6 1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0xAD01
 #define PRODUCT      Adelais
 #define DESCRIPTION  Team.Mechlovin Adelais

A keyboards/mechlovin/adelais/standard_led/rev2/config.h => keyboards/mechlovin/adelais/standard_led/rev2/config.h +3 -0

@@ 0,0 1,3 @@
+#pragma once
+
+#define PRODUCT_ID   0xAD01<
\ No newline at end of file

A keyboards/mechlovin/adelais/standard_led/rev2/rules.mk => keyboards/mechlovin/adelais/standard_led/rev2/rules.mk +0 -0

A keyboards/mechlovin/adelais/standard_led/rev3/config.h => keyboards/mechlovin/adelais/standard_led/rev3/config.h +8 -0

@@ 0,0 1,8 @@
+#pragma once
+
+#define PRODUCT_ID   0xAD02
+
+#define ENCODERS_PAD_A { A6, A4, B7 }
+#define ENCODERS_PAD_B { A5, A3, B6 }
+#define ENCODER_RESOLUTION 4
+

A keyboards/mechlovin/adelais/standard_led/rev3/rules.mk => keyboards/mechlovin/adelais/standard_led/rev3/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_ENABLE = yes

M keyboards/mechlovin/adelais/standard_led/rules.mk => keyboards/mechlovin/adelais/standard_led/rules.mk +3 -3

@@ 1,3 1,3 @@
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-BACKLIGHT_DRIVER = pwm
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow>
\ No newline at end of file
+
+
+DEFAULT_FOLDER = mechlovin/adelais/standard_led/rev2<
\ No newline at end of file