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

This commit is contained in:
QMK Bot 2021-11-29 15:08:56 +00:00
commit a3e9b347ec
11 changed files with 21 additions and 33 deletions

View File

@ -37,10 +37,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ E6, B4, B2 } \ { E6, B4, B2 } \
} }
#define TAP_CODE_DELAY 10 #define TAP_CODE_DELAY 10
#define ENCODER_DIRECTION_FLIP
#define ENCODER_RESOLUTION 4 #define ENCODER_RESOLUTION 4
#define ENCODERS_PAD_A { F5 } #define ENCODERS_PAD_A { F6 }
#define ENCODERS_PAD_B { F6 } #define ENCODERS_PAD_B { F5 }
#define BACKLIGHT_PIN B5 #define BACKLIGHT_PIN B5
#define BACKLIGHT_BREATHING #define BACKLIGHT_BREATHING

View File

@ -44,10 +44,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3, D0 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3, D0 }
#define UNUSED_PINS #define UNUSED_PINS
#define ENCODERS_PAD_A { D5 } #define ENCODERS_PAD_A { B7 }
#define ENCODERS_PAD_B { B7 } #define ENCODERS_PAD_B { D5 }
#define ENCODER_DIRECTION_FLIP
/* COL2ROW, ROW2COL*/ /* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

View File

@ -41,9 +41,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200 #define TAPPING_TERM 200
/* Encoder */ /* Encoder */
#define ENCODERS_PAD_A { F4 } #define ENCODERS_PAD_A { F5 }
#define ENCODERS_PAD_B { F5 } #define ENCODERS_PAD_B { F4 }
#define ENCODER_RESOLUTION 4 #define ENCODER_RESOLUTION 4
#define ENCODER_DIRECTION_FLIP
#define TAP_CODE_DELAY 50 #define TAP_CODE_DELAY 50

View File

@ -50,10 +50,9 @@
*/ */
// #define GRAVE_ESC_CTRL_OVERRIDE // #define GRAVE_ESC_CTRL_OVERRIDE
#define ENCODERS_PAD_A { D7 } #define ENCODERS_PAD_A { C0 }
#define ENCODERS_PAD_B { C0 } #define ENCODERS_PAD_B { D7 }
#define ENCODER_RESOLUTION 4 #define ENCODER_RESOLUTION 4
#define ENCODER_DIRECTION_FLIP
#define TAP_CODE_DELAY 10 #define TAP_CODE_DELAY 10
/* Bootmagic Lite key configuration */ /* Bootmagic Lite key configuration */

View File

@ -35,10 +35,9 @@
#define UNUSED_PINS #define UNUSED_PINS
#define ENCODERS_PAD_A { E6 } #define ENCODERS_PAD_A { D7 }
#define ENCODERS_PAD_B { D7 } #define ENCODERS_PAD_B { E6 }
#define ENCODER_RESOLUTION 1 #define ENCODER_RESOLUTION 1
#define ENCODER_DIRECTION_FLIP
/* COL2ROW or ROW2COL */ /* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

View File

@ -34,9 +34,8 @@
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5} #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}
#define UNUSED_PINS #define UNUSED_PINS
#define ENCODERS_PAD_A { D1 } #define ENCODERS_PAD_A { E6 }
#define ENCODERS_PAD_B { E6 } #define ENCODERS_PAD_B { D1 }
#define ENCODER_DIRECTION_FLIP
#define TAP_CODE_DELAY 10 #define TAP_CODE_DELAY 10
/* COL2ROW or ROW2COL */ /* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

View File

@ -48,10 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW
/* Encoder pin assignment */ /* Encoder pin assignment */
#define ENCODERS_PAD_A { C3 } #define ENCODERS_PAD_A { C2 }
#define ENCODERS_PAD_B { C2 } #define ENCODERS_PAD_B { C3 }
#define ENCODER_DIRECTION_FLIP
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5 #define DEBOUNCE 5

View File

@ -41,12 +41,11 @@
/* ROTARY ENCODERS */ /* ROTARY ENCODERS */
#define ENCODERS_PAD_A \ #define ENCODERS_PAD_A \
{ D7, F7 }
#define ENCODERS_PAD_B \
{ B4, C7 } { B4, C7 }
#define ENCODERS_PAD_B \
{ D7, F7 }
#define ENCODER_RESOLUTION 3 #define ENCODER_RESOLUTION 3
#define ENCODER_DIRECTION_FLIP
#define DEBOUNCE 5 #define DEBOUNCE 5

View File

@ -41,12 +41,11 @@
/* ROTARY ENCODERS */ /* ROTARY ENCODERS */
#define ENCODERS_PAD_A \ #define ENCODERS_PAD_A \
{ D6, C6 }
#define ENCODERS_PAD_B \
{ D7, C7 } { D7, C7 }
#define ENCODERS_PAD_B \
{ D6, C6 }
#define ENCODER_RESOLUTION 4 #define ENCODER_RESOLUTION 4
#define ENCODER_DIRECTION_FLIP
#define DEBOUNCE 5 #define DEBOUNCE 5

View File

@ -25,9 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER zigotica #define MANUFACTURER zigotica
#define PRODUCT z12 #define PRODUCT z12
#define ENCODERS_PAD_A { B4, B2 } #define ENCODERS_PAD_A { B5, B6 }
#define ENCODERS_PAD_B { B5, B6 } #define ENCODERS_PAD_B { B4, B2 }
#define ENCODER_DIRECTION_FLIP
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 4 #define MATRIX_ROWS 4

View File

@ -74,7 +74,7 @@ def filter_files(files, core_only=False):
# The following statement checks each file to see if the file path is # The following statement checks each file to see if the file path is
# - in the core directories # - in the core directories
# - not in the ignored directories # - not in the ignored directories
if not any(i in str(file) for i in core_dirs) or any(i in str(file) for i in ignored): if not any(str(file).startswith(i) for i in core_dirs) or any(str(file).startswith(i) for i in ignored):
files[index] = None files[index] = None
cli.log.debug("Skipping non-core file %s, as '--core-only' is used.", file) cli.log.debug("Skipping non-core file %s, as '--core-only' is used.", file)