~ruther/qmk_firmware

f8b427d5abc63e45594625a859bff7a30e2d7b78 — QMK Bot 1 year, 3 months ago 063f971 + a9e9c9a 
Merge remote-tracking branch 'origin/master' into develop
patch browse .tar.gz 
15 files changed, 39 insertions(+), 60 deletions(-)

M keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
M keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
M keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
M keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
M keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
M keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
M keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
M keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
M keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
M keyboards/bastardkb/scylla/v2/stemcell/info.json
M keyboards/bastardkb/scylla/v2/stemcell/rules.mk
M keyboards/bastardkb/skeletyl/v2/stemcell/info.json
M keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
M keyboards/bastardkb/tbkmini/v2/stemcell/info.json
M keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk

M keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h => keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +3 -4
@@ 39,15 39,14 @@

/* SPI config for pmw3360 sensor. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN B1
#define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN B2
#define SPI_MOSI_PIN A7
#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN B3
#define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5

/* PMW3360 settings. */
#define A1 PAL_LINE(GPIOA, 1)
#define POINTING_DEVICE_CS_PIN A1
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64


M keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json => keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +5 -6
@@ 7,20 7,19 @@
        "driver": "ws2812"
    },
    "ws2812": {
        "pin": "D3",
        "pin": "A2",
        "driver": "pwm"
    },
    "build": {
        "debounce_type": "asym_eager_defer_pk"
    },
    "matrix_pins": {
        "cols": ["F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
        "cols": ["B2", "A4", "B4", "B5", "B8"],
        "rows": ["B0", "B3", "A15", "B9"]
    },
    "diode_direction": "ROW2COL",
    "split": {
        "soft_serial_pin": "D2"
        "soft_serial_pin": "A3"
    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
    "development_board": "stemcell"
}


M keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk => keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +0 -2
@@ 1,5 1,3 @@
CONVERT_TO = stemcell

# Build Options
#   change yes to no to disable
#


M keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h => keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +3 -4
@@ 39,15 39,14 @@

/* SPI config for pmw3360 sensor. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN B1
#define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN B2
#define SPI_MOSI_PIN A7
#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN B3
#define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5

/* PMW3360 settings. */
#define A1 PAL_LINE(GPIOA, 1)
#define POINTING_DEVICE_CS_PIN A1
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64


M keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json => keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +5 -6
@@ 7,20 7,19 @@
        "driver": "ws2812"
    },
    "ws2812": {
        "pin": "D3",
        "pin": "A2",
        "driver": "pwm"
    },
    "build": {
        "debounce_type": "asym_eager_defer_pk"
    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
        "rows": ["B0", "B3", "A15", "B9"]
    },
    "diode_direction": "ROW2COL",
    "split": {
        "soft_serial_pin": "D2"
        "soft_serial_pin": "A3"
    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
    "development_board": "stemcell"
}


M keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk => keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +0 -2
@@ 1,5 1,3 @@
CONVERT_TO = stemcell

# Build Options
#   change yes to no to disable
#


M keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h => keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +3 -4
@@ 39,15 39,14 @@

/* SPI config for pmw3360 sensor. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN B1
#define SPI_SCK_PIN A5
#define SPI_SCK_PAL_MODE 5
#define SPI_MOSI_PIN B2
#define SPI_MOSI_PIN A7
#define SPI_MOSI_PAL_MODE 5
#define SPI_MISO_PIN B3
#define SPI_MISO_PIN A6
#define SPI_MISO_PAL_MODE 5

/* PMW3360 settings. */
#define A1 PAL_LINE(GPIOA, 1)
#define POINTING_DEVICE_CS_PIN A1
#define PMW3360_CS_MODE 3
#define PMW3360_CS_DIVISOR 64


M keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json => keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +5 -6
@@ 7,20 7,19 @@
        "driver": "ws2812"
    },
    "ws2812": {
        "pin": "D3",
        "pin": "A2",
        "driver": "pwm"
    },
    "build": {
        "debounce_type": "asym_eager_defer_pk"
    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F4", "F7", "C6", "D4", "B5"]
        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
        "rows": ["B10", "B0", "B3", "A15", "B9"]
    },
    "diode_direction": "ROW2COL",
    "split": {
        "soft_serial_pin": "D2"
        "soft_serial_pin": "A3"
    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
    "development_board": "stemcell"
}


M keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk => keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +0 -2
@@ 1,5 1,3 @@
CONVERT_TO = stemcell

# Build Options
#   change yes to no to disable
#


M keyboards/bastardkb/scylla/v2/stemcell/info.json => keyboards/bastardkb/scylla/v2/stemcell/info.json +5 -6
@@ 7,20 7,19 @@
        "driver": "ws2812"
    },
    "ws2812": {
        "pin": "D3",
        "pin": "A2",
        "driver": "pwm"
    },
    "build": {
        "debounce_type": "asym_eager_defer_pk"
    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F4", "F7", "C6", "D4", "B5"]
        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
        "rows": ["B10", "B0", "B3", "A15", "B9"]
    },
    "diode_direction": "ROW2COL",
    "split": {
        "soft_serial_pin": "D2"
        "soft_serial_pin": "A3"
    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
    "development_board": "stemcell"
}


M keyboards/bastardkb/scylla/v2/stemcell/rules.mk => keyboards/bastardkb/scylla/v2/stemcell/rules.mk +0 -2
@@ 1,5 1,3 @@
CONVERT_TO = stemcell

# Build Options
#   change yes to no to disable
#


M keyboards/bastardkb/skeletyl/v2/stemcell/info.json => keyboards/bastardkb/skeletyl/v2/stemcell/info.json +5 -6
@@ 7,20 7,19 @@
        "driver": "ws2812"
    },
    "ws2812": {
        "pin": "D3",
        "pin": "A2",
        "driver": "pwm"
    },
    "build": {
        "debounce_type": "asym_eager_defer_pk"
    },
    "matrix_pins": {
        "cols": ["F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
        "cols": ["B2", "A4", "B4", "B5", "B8"],
        "rows": ["B0", "B3", "A15", "B9"]
    },
    "diode_direction": "ROW2COL",
    "split": {
        "soft_serial_pin": "D2"
        "soft_serial_pin": "A3"
    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
    "development_board": "stemcell"
}


M keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk => keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +0 -2
@@ 1,5 1,3 @@
CONVERT_TO = stemcell

# Build Options
#   change yes to no to disable
#


M keyboards/bastardkb/tbkmini/v2/stemcell/info.json => keyboards/bastardkb/tbkmini/v2/stemcell/info.json +5 -6
@@ 7,20 7,19 @@
        "driver": "ws2812"
    },
    "ws2812": {
        "pin": "D3",
        "pin": "A2",
        "driver": "pwm"
    },
    "build": {
        "debounce_type": "asym_eager_defer_pk"
    },
    "matrix_pins": {
        "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
        "rows": ["F7", "C6", "D4", "B5"]
        "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
        "rows": ["B0", "B3", "A15", "B9"]
    },
    "diode_direction": "ROW2COL",
    "split": {
        "soft_serial_pin": "D2"
        "soft_serial_pin": "A3"
    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu"
    "development_board": "stemcell"
}


M keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk => keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +0 -2
@@ 1,5 1,3 @@
CONVERT_TO = stemcell

# Build Options
#   change yes to no to disable
#
Do not follow this link