Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-07-22 07:53:44 +00:00
commit 78fb223da7
2 changed files with 20 additions and 15 deletions

View file

@ -18,6 +18,7 @@
#include "quantum.h" #include "quantum.h"
// clang-format off
#define LAYOUT( \ #define LAYOUT( \
K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K18, K09, \ K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K18, K09, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K38, K29, \ K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K38, K29, \
@ -39,3 +40,4 @@
{ KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KC_NO, KA9 }, \ { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KC_NO, KA9 }, \
{ KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KC_NO, KB8, KC_NO }, \ { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KC_NO, KB8, KC_NO }, \
} }
// clang-format on

View file

@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT reviung5 #define PRODUCT reviung5
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 1 #define MATRIX_ROWS 1
#define MATRIX_COLS 5 #define MATRIX_COLS 5
/* /*
* Keyboard Matrix Assignments * Keyboard Matrix Assignments
@ -40,28 +40,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
* *
*/ */
#define MATRIX_ROW_PINS { F4 } #define MATRIX_ROW_PINS \
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } { F4 }
#define MATRIX_COL_PINS \
{ D4, C6, D7, E6, B4 }
#define UNUSED_PINS #define UNUSED_PINS
/* COL2ROW, ROW2COL */ /* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW
/* Encoder */ /* Encoder */
#define ENCODERS_PAD_A { D0 } #define ENCODERS_PAD_A \
#define ENCODERS_PAD_B { D1 } { D0 }
#define ENCODERS_PAD_B \
{ D1 }
#define RGB_DI_PIN D3 #define RGB_DI_PIN D3
#ifdef RGB_DI_PIN #ifdef RGB_DI_PIN
# define RGBLED_NUM 4 # define RGBLED_NUM 4
# define RGBLIGHT_HUE_STEP 16 # define RGBLIGHT_HUE_STEP 16
# define RGBLIGHT_SAT_STEP 16 # define RGBLIGHT_SAT_STEP 16
# define RGBLIGHT_VAL_STEP 16 # define RGBLIGHT_VAL_STEP 16
# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ # define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ # define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/ /*== all animations enable ==*/
# define RGBLIGHT_ANIMATIONS # define RGBLIGHT_ANIMATIONS
/*== or choose animations ==*/ /*== or choose animations ==*/
//# define RGBLIGHT_EFFECT_BREATHING //# define RGBLIGHT_EFFECT_BREATHING
//# define RGBLIGHT_EFFECT_RAINBOW_MOOD //# define RGBLIGHT_EFFECT_RAINBOW_MOOD