Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		| @@ -16,6 +16,8 @@ | ||||
|     #include "rev6.h" | ||||
| #elif defined(KEYBOARD_keebio_iris_rev6a) | ||||
|     #include "rev6a.h" | ||||
| #elif defined(KEYBOARD_keebio_iris_rev6b) | ||||
|     #include "rev6b.h" | ||||
| #elif defined(KEYBOARD_keebio_iris_rev7) | ||||
|     #include "rev7.h" | ||||
| #endif | ||||
|   | ||||
							
								
								
									
										121
									
								
								keyboards/keebio/iris/rev6b/config.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										121
									
								
								keyboards/keebio/iris/rev6b/config.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,121 @@ | ||||
| /* | ||||
| Copyright 2021 Danny Nguyen <danny@keeb.io> | ||||
|  | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
|  | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
|  | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| */ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| /* key matrix size */ | ||||
| // Rows are doubled-up | ||||
| #define MATRIX_ROWS 10 | ||||
| #define MATRIX_COLS 6 | ||||
|  | ||||
| // wiring of each half | ||||
| #define MATRIX_ROW_PINS { B1, F0, F5, B4, D7 } | ||||
| #define MATRIX_COL_PINS { F1, F4, B5, C7, D4, D6 } | ||||
| #define MATRIX_ROW_PINS_RIGHT { B1, F0, F5, B4, B5 } | ||||
| #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 } | ||||
| #define SPLIT_HAND_PIN D5 | ||||
|  | ||||
| #define ENCODERS_PAD_A { B3 } | ||||
| #define ENCODERS_PAD_B { B2 } | ||||
| #define ENCODERS_PAD_A_RIGHT { B3 } | ||||
| #define ENCODERS_PAD_B_RIGHT { B2 } | ||||
|  | ||||
| /* COL2ROW or ROW2COL */ | ||||
| #define DIODE_DIRECTION COL2ROW | ||||
|  | ||||
| /* define if matrix has ghost */ | ||||
| //#define MATRIX_HAS_GHOST | ||||
|  | ||||
| /* number of backlight levels */ | ||||
| // #define BACKLIGHT_LEVELS 3 | ||||
|  | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
| #define DEBOUNCE 5 | ||||
|  | ||||
| /* serial.c configuration for split keyboard */ | ||||
| #define SOFT_SERIAL_PIN D0 | ||||
|  | ||||
| /* ws2812 RGB LED */ | ||||
| #define RGB_DI_PIN E6 | ||||
| #ifdef RGB_DI_PIN | ||||
| #    define RGBLED_NUM 68 | ||||
| #    define RGBLED_SPLIT { 34, 34 } | ||||
| #    define RGBLIGHT_HUE_STEP 8 | ||||
| #    define RGBLIGHT_SAT_STEP 8 | ||||
| #    define RGBLIGHT_VAL_STEP 8 | ||||
| #    define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */ | ||||
| #    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */ | ||||
| /*== enabled animations ==*/ | ||||
| #    define RGBLIGHT_EFFECT_BREATHING | ||||
| #    define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||||
| #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||||
| #    define RGBLIGHT_EFFECT_SNAKE | ||||
| #    define RGBLIGHT_EFFECT_KNIGHT | ||||
| #    define RGBLIGHT_EFFECT_CHRISTMAS | ||||
| #    define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||||
| #    define RGBLIGHT_EFFECT_RGB_TEST | ||||
| #    define RGBLIGHT_EFFECT_ALTERNATING | ||||
| #    define RGBLIGHT_EFFECT_TWINKLE | ||||
| #    define RGBLIGHT_DEFAULT_VAL 120 | ||||
| #    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) | ||||
| // RGB Matrix | ||||
| //#    ifdef RGB_MATRIX_ENABLE | ||||
| #        define ENABLE_RGB_MATRIX_ALPHAS_MODS | ||||
| #        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | ||||
| #        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | ||||
| #        define ENABLE_RGB_MATRIX_BREATHING | ||||
| #        define ENABLE_RGB_MATRIX_BAND_SAT | ||||
| #        define ENABLE_RGB_MATRIX_BAND_VAL | ||||
| #        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT | ||||
| #        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL | ||||
| #        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT | ||||
| #        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_ALL | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN | ||||
| #        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL | ||||
| #        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL | ||||
| #        define ENABLE_RGB_MATRIX_DUAL_BEACON | ||||
| #        define ENABLE_RGB_MATRIX_RAINBOW_BEACON | ||||
| #        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS | ||||
| // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined | ||||
| #        define ENABLE_RGB_MATRIX_TYPING_HEATMAP | ||||
| #        define ENABLE_RGB_MATRIX_DIGITAL_RAIN | ||||
| // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS | ||||
| #        define ENABLE_RGB_MATRIX_SPLASH | ||||
| #        define ENABLE_RGB_MATRIX_MULTISPLASH | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_SPLASH | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||||
| #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 | ||||
| #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS | ||||
| #        define DRIVER_LED_TOTAL RGBLED_NUM | ||||
| #        define RGB_MATRIX_SPLIT { 34, 34 } | ||||
| #        define RGB_DISABLE_WHEN_USB_SUSPENDED | ||||
| #        define RGB_MATRIX_KEYPRESSES | ||||
| //#    endif | ||||
| #endif | ||||
							
								
								
									
										7
									
								
								keyboards/keebio/iris/rev6b/info.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								keyboards/keebio/iris/rev6b/info.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | ||||
| { | ||||
|     "keyboard_name": "Iris Rev. 6b", | ||||
|     "usb": { | ||||
|         "pid": "0x6456", | ||||
|         "device_version": "6.2.0" | ||||
|     } | ||||
| } | ||||
							
								
								
									
										85
									
								
								keyboards/keebio/iris/rev6b/rev6b.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								keyboards/keebio/iris/rev6b/rev6b.c
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,85 @@ | ||||
| /* | ||||
| Copyright 2021 Danny Nguyen <danny@keeb.io> | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| */ | ||||
| #include "rev6b.h" | ||||
|  | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| led_config_t g_led_config = { { | ||||
|     // Key Matrix to LED Index | ||||
|     // Left Half | ||||
|     { 0, 1, 2, 3, 4, 5 }, | ||||
|     { 11, 10, 9, 8, 7, 6 }, | ||||
|     { 12, 13, 14, 15, 16, 17 }, | ||||
|     { 23, 22, 21, 20, 19, 18 }, | ||||
|     { NO_LED, NO_LED, 24, 25, 26, 27 }, | ||||
|     // Right Half | ||||
|     { 34, 35, 36, 37, 38, 39 }, | ||||
|     { 45, 44, 43, 42, 41, 40 }, | ||||
|     { 46, 47, 48, 49, 50, 51 }, | ||||
|     { 57, 56, 55, 54, 53, 52 }, | ||||
|     { NO_LED, NO_LED, 58, 59, 60, 61 } | ||||
| }, { | ||||
|     // LED Index to Physical Position | ||||
|     // Left Half | ||||
|     { 0, 5 }, { 16, 5 }, { 32, 2 }, { 48, 0 }, { 64, 2 }, { 80, 3 }, | ||||
|     { 80, 17 }, { 64, 15 }, { 48, 13 }, { 32, 15 }, { 16, 18 }, { 0, 18 }, | ||||
|     { 0, 32 }, { 16, 32 }, { 32, 28 }, { 48, 27 }, { 64, 28 }, { 80, 30 }, | ||||
|     { 80, 43 }, { 64, 42 }, { 48, 40 }, { 32, 42 }, { 16, 45 }, { 0, 45 }, | ||||
|     { 56, 47 }, { 72, 58 }, { 90, 64 }, { 98, 52 }, | ||||
|     { 80, 58 }, { 40, 50 }, { 8, 43 }, { 8, 5 }, { 40, 1 }, { 72, 3 }, | ||||
|     // Right Half | ||||
|     { 224, 5 }, { 208, 5 }, { 192, 2 }, { 176, 0 }, { 160, 2 }, { 144, 3 }, | ||||
|     { 144, 18 }, { 160, 18 }, { 176, 15 }, { 192, 13 }, { 208, 15 }, { 224, 17 }, | ||||
|     { 224, 32 }, { 208, 32 }, { 192, 28 }, { 176, 27 }, { 160, 28 }, { 144, 30 }, | ||||
|     { 144, 45 }, { 160, 45 }, { 176, 42 }, { 192, 40 }, { 208, 42 }, { 224, 43 }, | ||||
|     { 168, 47 }, { 152, 58 }, { 134, 64 }, { 126, 52 }, | ||||
|     { 144, 58 }, { 184, 50 }, { 216, 43 }, { 216, 5 }, { 184, 1 }, { 152, 3 } | ||||
| }, { | ||||
|     // LED Index to Flag | ||||
|     // Left Half | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|           4, 4, 4, 4, | ||||
|     2, 2, 2, 2, 2, 2, | ||||
|     // Right Half | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, 4, 4, | ||||
|     4, 4, 4, 4, | ||||
|     2, 2, 2, 2, 2, 2 | ||||
|  | ||||
| } }; | ||||
| #endif | ||||
|  | ||||
| #ifdef ENCODER_ENABLE | ||||
| bool encoder_update_kb(uint8_t index, bool clockwise) { | ||||
|     if (!encoder_update_user(index, clockwise)) { return false; } | ||||
|     if (index == 0) { | ||||
|         if (clockwise) { | ||||
|             tap_code(KC_VOLU); | ||||
|         } else { | ||||
|             tap_code(KC_VOLD); | ||||
|         } | ||||
|     } else if (index == 1) { | ||||
|         if (clockwise) { | ||||
|             tap_code(KC_PGDN); | ||||
|         } else { | ||||
|             tap_code(KC_PGUP); | ||||
|         } | ||||
|     } | ||||
|     return false; | ||||
| } | ||||
| #endif | ||||
							
								
								
									
										42
									
								
								keyboards/keebio/iris/rev6b/rev6b.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								keyboards/keebio/iris/rev6b/rev6b.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | ||||
| /* | ||||
| Copyright 2021 Danny Nguyen <danny@keeb.io> | ||||
|  | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 2 of the License, or | ||||
| (at your option) any later version. | ||||
|  | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
|  | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| */ | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| #include "iris.h" | ||||
| #include "quantum.h" | ||||
|  | ||||
|  | ||||
| #define LAYOUT( \ | ||||
|     LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \ | ||||
|     LB1, LB2, LB3, LB4, LB5, LB6,           RB6, RB5, RB4, RB3, RB2, RB1, \ | ||||
|     LC1, LC2, LC3, LC4, LC5, LC6,           RC6, RC5, RC4, RC3, RC2, RC1, \ | ||||
|     LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ | ||||
|                         LE3, LE4, LE5, RE5, RE4, RE3 \ | ||||
|     ) \ | ||||
|     { \ | ||||
|         { LA1, LA2, LA3, LA4, LA5, LA6 }, \ | ||||
|         { LB1, LB2, LB3, LB4, LB5, LB6 }, \ | ||||
|         { LC1, LC2, LC3, LC4, LC5, LC6 }, \ | ||||
|         { LD1, LD2, LD3, LD4, LD5, LD6 }, \ | ||||
|         { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ | ||||
|         { RA1, RA2, RA3, RA4, RA5, RA6 }, \ | ||||
|         { RB1, RB2, RB3, RB4, RB5, RB6 }, \ | ||||
|         { RC1, RC2, RC3, RC4, RC5, RC6 }, \ | ||||
|         { RD1, RD2, RD3, RD4, RD5, RD6 }, \ | ||||
|         { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ | ||||
|     } | ||||
							
								
								
									
										24
									
								
								keyboards/keebio/iris/rev6b/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								keyboards/keebio/iris/rev6b/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | ||||
| # MCU name | ||||
| MCU = atmega32u4 | ||||
|  | ||||
| # Bootloader selection | ||||
| BOOTLOADER = atmel-dfu | ||||
|  | ||||
| # Build Options | ||||
| #   change yes to no to disable | ||||
| # | ||||
| BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite | ||||
| MOUSEKEY_ENABLE = no        # Mouse keys | ||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control | ||||
| CONSOLE_ENABLE = yes        # Console for debug | ||||
| COMMAND_ENABLE = no         # Commands for debug and configuration | ||||
| NKRO_ENABLE = no            # Enable N-Key Rollover | ||||
| BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
| SPLIT_KEYBOARD = yes | ||||
| ENCODER_ENABLE = yes | ||||
| RGB_MATRIX_ENABLE = yes | ||||
| RGB_MATRIX_DRIVER = WS2812 | ||||
|  | ||||
| LTO_ENABLE = yes | ||||
		Reference in New Issue
	
	Block a user