Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relocate winry315 VIA logic #24008

Merged
merged 1 commit into from
Jun 29, 2024
Merged

Relocate winry315 VIA logic #24008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Relocate winry315 VIA logic
  • Loading branch information
@zvecr
zvecr committed Jun 29, 2024
commit 8fd1a47ed6b095429df2ca66e0d351b3bc619d97
5 changes: 5 additions & 0 deletions keyboards/winry/winry315/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
12 changes: 2 additions & 10 deletions keyboards/winry/winry315/winry315.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
14 changes: 6 additions & 8 deletions keyboards/winry/winry315/winry315.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Loading