Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
bc324218d6
979 changed files with 1935 additions and 2171 deletions
|
|
@ -38,12 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
//#define LED_NUM_LOCK_PIN B0
|
||||
//#define LED_CAPS_LOCK_PIN B1
|
||||
//#define LED_SCROLL_LOCK_PIN B2
|
||||
//#define LED_COMPOSE_PIN B3
|
||||
//#define LED_KANA_PIN B4
|
||||
|
||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||
#define LOCKING_SUPPORT_ENABLE
|
||||
/* Locking resynchronize hack */
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/* COL2ROW or ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
#define LED_CAPS_LOCK_PIN B6
|
||||
#define LED_PIN_ON_STATE 0
|
||||
|
||||
#define BACKLIGHT_PIN B7
|
||||
#ifdef BACKLIGHT_PIN
|
||||
#define BACKLIGHT_LEVELS 3
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
"pid": "0x6874",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "B6",
|
||||
"on_state": 0
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "atmel-dfu",
|
||||
"layout_aliases": {
|
||||
|
|
|
|||
|
|
@ -45,12 +45,6 @@
|
|||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
//#define LED_NUM_LOCK_PIN B0
|
||||
//#define LED_CAPS_LOCK_PIN B1
|
||||
//#define LED_SCROLL_LOCK_PIN B2
|
||||
//#define LED_COMPOSE_PIN B3
|
||||
//#define LED_KANA_PIN B4
|
||||
|
||||
#define RGB_DI_PIN B5
|
||||
#define RGB_MATRIX_LED_COUNT 20
|
||||
#ifdef RGB_DI_PIN
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define MATRIX_ROW_PINS { F6 }
|
||||
#define MATRIX_COL_PINS { F4, D7 }
|
||||
|
||||
// LED on kbmount base board is on B7
|
||||
#define LED_CAPS_LOCK_PIN B7 // onboard LED for testing
|
||||
|
||||
/* COL2ROW, ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@
|
|||
"pid": "0x3304",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "B7"
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "caterina",
|
||||
"layouts": {
|
||||
|
|
|
|||
|
|
@ -21,8 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define BACKLIGHT_BREATHING
|
||||
#define BACKLIGHT_LEVELS 6
|
||||
#define BACKLIGHT_PINS { F4, F5 } // Top Row, Bottom Row
|
||||
|
||||
/* LED Indicators */
|
||||
#define LED_PIN_ON_STATE 0
|
||||
#define LED_CAPS_LOCK_PIN B0 // RX Led
|
||||
#define LED_NUM_LOCK_PIN D5 // TX Led
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@
|
|||
"pid": "0x5350",
|
||||
"device_version": "10.0.1"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "B0",
|
||||
"num_lock": "D5",
|
||||
"on_state": 0
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "caterina",
|
||||
"matrix_pins": {
|
||||
|
|
|
|||
|
|
@ -48,6 +48,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||
#define RGBLIGHT_EFFECT_TWINKLE
|
||||
|
||||
#define LED_CAPS_LOCK_PIN A10
|
||||
|
||||
#define BACKLIGHT_LEVELS 5
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@
|
|||
"pid": "0x0011",
|
||||
"device_version": "0.0.2"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "A10"
|
||||
},
|
||||
"processor": "STM32F072",
|
||||
"bootloader": "stm32-dfu",
|
||||
"layouts": {
|
||||
|
|
|
|||
|
|
@ -58,9 +58,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define LOCKING_RESYNC_ENABLE
|
||||
|
||||
/* Indicator leds */
|
||||
#define LED_CAPS_LOCK_PIN B1
|
||||
#define LED_NUM_LOCK_PIN B12
|
||||
#define LED_SCROLL_LOCK_PIN B13
|
||||
#define LAYER_1 B14
|
||||
#define LAYER_2 B15
|
||||
#define LAYER_3 B0
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@
|
|||
"pid": "0x0010",
|
||||
"device_version": "0.0.2"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "B1",
|
||||
"num_lock": "B12",
|
||||
"scroll_lock": "B13"
|
||||
},
|
||||
"processor": "STM32F072",
|
||||
"bootloader": "stm32-dfu",
|
||||
"layouts": {
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 }
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
#define LED_CAPS_LOCK_PIN A6
|
||||
#define LED_SCROLL_LOCK_PIN A7
|
||||
|
||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||
#define LOCKING_SUPPORT_ENABLE
|
||||
/* Locking resynchronize hack */
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
"pid": "0x000A",
|
||||
"device_version": "0.0.2"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "A6",
|
||||
"scroll_lock": "A7"
|
||||
},
|
||||
"processor": "STM32F411",
|
||||
"bootloader": "stm32-dfu",
|
||||
"layouts": {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
|
||||
#define WS2812_DMA_CHANNEL 6
|
||||
|
||||
#define LED_CAPS_LOCK_PIN A10
|
||||
|
||||
// If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
|
||||
#define CAPSLOCK_INDICATOR
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
"pid": "0x6584",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "A10"
|
||||
},
|
||||
"processor": "STM32F411",
|
||||
"bootloader": "stm32-dfu"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
|
||||
#define WS2812_DMA_CHANNEL 6
|
||||
|
||||
#define LED_CAPS_LOCK_PIN C8
|
||||
|
||||
// If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
|
||||
#define CAPSLOCK_INDICATOR
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
"pid": "0x6585",
|
||||
"device_version": "0.0.2"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "C8"
|
||||
},
|
||||
"processor": "STM32F401",
|
||||
"bootloader": "stm32-dfu"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
//#define NO_ACTION_LAYER
|
||||
//#define NO_ACTION_TAPPING
|
||||
//#define NO_ACTION_ONESHOT
|
||||
|
||||
#define LED_NUM_LOCK_PIN D2
|
||||
#define LED_CAPS_LOCK_PIN D1
|
||||
#define LED_SCROLL_LOCK_PIN D0
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@
|
|||
"pid": "0x454C",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "D1",
|
||||
"num_lock": "D2",
|
||||
"scroll_lock": "D0"
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "atmel-dfu",
|
||||
"layouts": {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue