svlinky v0.2 is now default, with continued support for v0.1
This commit is contained in:
Sadek Baroudi
parent
92f84ab143
commit
9b94c47d05
|
|
@ -51,7 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
/* Locking resynchronize hack */
|
||||
#define LOCKING_RESYNC_ENABLE
|
||||
|
||||
#ifdef FP_CONVERT_TO_SVLINKY
|
||||
#if defined(FP_CONVERT_TO_SVLINKY_V01) || defined(FP_CONVERT_TO_SVLINKY_V02)
|
||||
// VIK pin config
|
||||
#define VIK_SPI_DRIVER SPID1
|
||||
#define VIK_SPI_SCK_PIN GP14
|
||||
|
|
@ -61,8 +61,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define VIK_I2C_DRIVER I2CD1
|
||||
#define VIK_I2C_SDA_PIN GP10
|
||||
#define VIK_I2C_SCL_PIN GP11
|
||||
#ifdef FP_CONVERT_TO_SVLINKY_V01
|
||||
#define VIK_GPIO_1 GP18
|
||||
#define VIK_GPIO_2 GP24
|
||||
#else // svlinky v0.2
|
||||
#define VIK_GPIO_1 GP26
|
||||
#define VIK_GPIO_2 GP27
|
||||
#endif
|
||||
#define VIK_WS2812_DI_PIN GP16
|
||||
|
||||
#ifdef VIK_EC11_EVQWGD001
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#ifdef FP_CONVERT_TO_SVLINKY
|
||||
#if defined(FP_CONVERT_TO_SVLINKY_V01) || defined(FP_CONVERT_TO_SVLINKY_V02)
|
||||
#define HAL_USE_SPI TRUE
|
||||
#define HAL_USE_I2C TRUE
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include_next "mcuconf.h"
|
||||
|
||||
#ifdef FP_CONVERT_TO_SVLINKY
|
||||
#if defined(FP_CONVERT_TO_SVLINKY_V01) || defined(FP_CONVERT_TO_SVLINKY_V02)
|
||||
#undef RP_SPI_USE_SPI1
|
||||
#define RP_SPI_USE_SPI1 TRUE
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,14 @@
|
|||
MCU = atmega32u4
|
||||
BOOTLOADER = atmel-dfu
|
||||
|
||||
ifeq ($(strip $(FP_CONVERT_TO)), svlinky)
|
||||
ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v01)
|
||||
VIK_ENABLE = yes
|
||||
OPT_DEFS += -DFP_CONVERT_TO_SVLINKY
|
||||
OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V01
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(FP_CONVERT_TO)), svlinky_v02)
|
||||
VIK_ENABLE = yes
|
||||
OPT_DEFS += -DFP_CONVERT_TO_SVLINKY_V02
|
||||
endif
|
||||
|
||||
# $(info $(MCU))
|
||||
|
|
|
|||
|
|
@ -23,11 +23,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define MATRIX_COLS 12
|
||||
|
||||
// wiring
|
||||
#ifdef FP_CONVERT_TO_SVLINKY
|
||||
#ifdef FP_CONVERT_TO_SVLINKY_V01
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ GP0, GP1, GP23, GP21 }
|
||||
#define MATRIX_COL_PINS \
|
||||
{ GP8, GP7, GP6, GP5, GP4, GP9, GP29, GP28, GP27, GP26, GP22, GP20 }
|
||||
#elif defined(FP_CONVERT_TO_SVLINKY_V02)
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ GP0, GP1, GP23, GP21 }
|
||||
#define MATRIX_COL_PINS \
|
||||
{ GP8, GP7, GP6, GP5, GP4, GP9, GP29, GP28, GP24, GP18, GP22, GP20 }
|
||||
#else
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ D3, D2, B2, B6 }
|
||||
|
|
|
|||
|
|
@ -47,15 +47,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define VIK_I2C_DRIVER I2CD1
|
||||
#define VIK_I2C_SDA_PIN GP10
|
||||
#define VIK_I2C_SCL_PIN GP11
|
||||
#define VIK_GPIO_1 GP18
|
||||
#define VIK_GPIO_2 GP24
|
||||
#ifdef FP_SVLINKY_V01
|
||||
#define VIK_GPIO_1 GP18 // svlinky v0.1
|
||||
#define VIK_GPIO_2 GP24 // svlinky v0.1
|
||||
#else // svlinky v0.2
|
||||
#define VIK_GPIO_1 GP26 // svlinky v0.2
|
||||
#define VIK_GPIO_2 GP27 // svlinky v0.2
|
||||
#endif
|
||||
#define VIK_WS2812_DI_PIN GP16
|
||||
|
||||
// Used only if you have a weact st7735 display, set to unused pin
|
||||
#define VIK_ST7735_UNUSED_PIN GP13
|
||||
|
||||
// All the through hole pins from the controller
|
||||
#define MATRIX_ROW_PINS { GP29, GP28, GP27, GP26, GP22, GP20, GP23, GP21 }
|
||||
#ifdef FP_SVLINKY_V01
|
||||
#define MATRIX_ROW_PINS { GP29, GP28, GP27, GP26, GP22, GP20, GP23, GP21 } // svlinky v0.1
|
||||
#else
|
||||
#define MATRIX_ROW_PINS { GP29, GP28, GP18, GP24, GP22, GP20, GP23, GP21 } // svlinky v0.2
|
||||
#endif
|
||||
#define MATRIX_COL_PINS { GP0, GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9 }
|
||||
|
||||
/* COL2ROW or ROW2COL */
|
||||
|
|
@ -63,8 +72,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
// For VIK modules with encoders
|
||||
#ifdef ENCODER_ENABLE
|
||||
#define ENCODERS_PAD_A { GP18 }
|
||||
#define ENCODERS_PAD_B { GP24 }
|
||||
#ifdef FP_SVLINKY_V01
|
||||
#define ENCODERS_PAD_A { GP18 } // svlinky v0.1
|
||||
#define ENCODERS_PAD_B { GP24 } // svlinky v0.1
|
||||
#else
|
||||
#define ENCODERS_PAD_A { GP26 } // svlinky v0.2
|
||||
#define ENCODERS_PAD_B { GP27 } // svlinky v0.2
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CIRQUE_ENABLE
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
[
|
||||
{
|
||||
"type" : "single",
|
||||
"name" : "FP_SVLINKY_V01",
|
||||
"user_input": "Are you building with a svlinky v0.1? (y) if v0.1 and (n) if v0.2"
|
||||
},
|
||||
{
|
||||
"type" : "one-of",
|
||||
"names" : [
|
||||
|
|
|
|||
|
|
@ -60,4 +60,8 @@ ifeq ($(strip $(CIRQUE_ENABLE)), yes)
|
|||
OPT_DEFS += -DCIRQUE_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(strip $(FP_SVLINKY_V01)), yes)
|
||||
OPT_DEFS += -DFP_SVLINKY_V01
|
||||
endif
|
||||
|
||||
include keyboards/fingerpunch/src/rules.mk
|
||||
|
|
|
|||
Loading…
Reference in New Issue