diff options
| -rw-r--r-- | keyboards/winry/winry315/keymaps/via/keymap.c | 5 | ||||
| -rw-r--r-- | keyboards/winry/winry315/winry315.c | 12 | ||||
| -rw-r--r-- | keyboards/winry/winry315/winry315.h | 14 | 
3 files changed, 13 insertions, 18 deletions
| diff --git a/keyboards/winry/winry315/keymaps/via/keymap.c b/keyboards/winry/winry315/keymaps/via/keymap.c index 0641fbfd03..4585f46fb6 100644 --- a/keyboards/winry/winry315/keymaps/via/keymap.c +++ b/keyboards/winry/winry315/keymaps/via/keymap.c @@ -37,3 +37,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {      [2 ... 7] =  { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }  };  #endif + +// The enum values are assumed to match the layout option values used by VIA. +void via_set_layout_options_kb(uint32_t value) { +    winry315_set_orientation(value & 0x03); +} diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c index e7901a2e00..03621d3e3f 100644 --- a/keyboards/winry/winry315/winry315.c +++ b/keyboards/winry/winry315/winry315.c @@ -3,13 +3,11 @@  #include "winry315.h" -#include "via.h" -  #if !defined(WINRY315_DEFAULT_ORIENTATION)  #    define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_TOP  #endif -#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE) +#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)  #    ifndef MEDIA_KEY_DELAY  #        define MEDIA_KEY_DELAY 10  #    endif @@ -41,7 +39,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {      }      return true;  } -#endif // !defined(VIA_ENABLE) && defined(ENCODER_ENABLE) +#endif // defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)  #if defined(RGB_MATRIX_ENABLE) @@ -200,9 +198,3 @@ void winry315_set_orientation(uint8_t orientation) {      }  #endif // defined(RGB_MATRIX_ENABLE)  } - -#if defined(VIA_ENABLE) -void via_set_layout_options_kb(uint32_t value) { -    winry315_set_orientation(value & 0x03); -} -#endif // defined(VIA_ENABLE) diff --git a/keyboards/winry/winry315/winry315.h b/keyboards/winry/winry315/winry315.h index 8129c9d6e0..ea7b4120e2 100644 --- a/keyboards/winry/winry315/winry315.h +++ b/keyboards/winry/winry315/winry315.h @@ -5,8 +5,7 @@  #include "quantum.h" -// Supported orientations of the board.  The enum values must match the layout -// option values used by VIA. +// Supported orientations of the board.  enum winry315_orientation {      WINRY315_ORIENTATION_TOP,   // Encoders at the top side (default)      WINRY315_ORIENTATION_LEFT,  // Encoders at the left side @@ -17,10 +16,9 @@ enum winry315_orientation {  // Set the orientation of the board (changes the RGB Matrix effect behavior to  // match the new orientation).  // -// This function is intended to be used in the `via` keymap, where the board -// orientation is configured dynamically using a VIA layout option.  If you are -// making a custom keymap for one specific orientation, it is better to set the -// orientation in config.h (e.g., `#define WINRY315_DEFAULT_ORIENTATION -// WINRY315_ORIENTATION_LEFT`) instead of adding custom code that calls this -// function. +// This function is intended to be used to configure the orientation +// dynamically. If you are making a custom keymap for one specific orientation, +// it is better to set the orientation in config.h +// (e.g., `#define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT`) +// instead of adding custom code that calls this function.  void winry315_set_orientation(uint8_t orientation); | 
