~ruther/qmk_firmware: Change aidansmithdotdev/fine40 to use Encoder Map (#19912)

6 files changed, 32 insertions(+), 12 deletions(-)

M keyboards/aidansmithdotdev/fine40/fine40.c
M keyboards/aidansmithdotdev/fine40/info.json
M keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
A keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk
M keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c
M keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk

M keyboards/aidansmithdotdev/fine40/fine40.c => keyboards/aidansmithdotdev/fine40/fine40.c +10 -10

@@ 71,15 71,15 @@ bool oled_task_kb(void) {
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-	// Volume control
-	if (clockwise) {
-		tap_code(KC_VOLU);
-	} else {
-		tap_code(KC_VOLD);
-	}
-	return false;
+   if (!encoder_update_user(index, clockwise)) {
+       return false;
+   }
+   // Volume control
+   if (clockwise) {
+   	tap_code(KC_VOLU);
+   } else {
+   	tap_code(KC_VOLD);
+   }
+   return true;
 }
 #endif=
\ No newline at end of file

M keyboards/aidansmithdotdev/fine40/info.json => keyboards/aidansmithdotdev/fine40/info.json +1 -1

@@ 27,7 27,7 @@
     },
     "encoder": {
         "rotary": [
-            {"pin_a": "D5", "pin_b": "B7", "resolution": 2}
+            {"pin_a": "B7", "pin_b": "D5", "resolution": 2}
         ]
     },
     "layouts": {

M keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c => keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c +9 -0

@@ 41,3 41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
 ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MAIN] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LEFT] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_TAB] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif<
\ No newline at end of file

A keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk => keyboards/aidansmithdotdev/fine40/keymaps/default/rules.mk +1 -0

@@ 0,0 1,1 @@
+ENCODER_MAP_ENABLE = yes

M keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c => keyboards/aidansmithdotdev/fine40/keymaps/via/keymap.c +9 -0

@@ 41,3 41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
 ),
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MAIN] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_LEFT] =  { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_RIGHT] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_TAB] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif<
\ No newline at end of file

M keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk => keyboards/aidansmithdotdev/fine40/keymaps/via/rules.mk +2 -1

@@ 1,1 1,2 @@
-VIA_ENABLE = yes>
\ No newline at end of file
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes