Skip to content

Commit

Permalink
Remove rules.mk and add VIK configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
VeyPatch committed Nov 5, 2024
1 parent 02ed4a5 commit 3ec4399
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 4 deletions.
2 changes: 1 addition & 1 deletion keyboards/splitkb/halcyon/elora/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Make example for this keyboard (after setting up your build environment):

make splitkb/halcyon/elora:default
make splitkb/halcyon/elora/rev2:default

The keyboard can be flashed by copying the resulting `.uf2` file onto the `RPI-RP2` flash drive.

Expand Down
27 changes: 27 additions & 0 deletions keyboards/splitkb/halcyon/elora/rev2/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2024 splitkb.com (support@splitkb.com)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

//// VIK

// GPIO1 = GP27
// GPIO2 = GP26
// CS = GP13

#if HAL_USE_I2C == TRUE
# define I2C_DRIVER I2C0
# define I2C1_SDA_PIN GP16
# define I2C1_SCL_PIN GP17
#endif

#if HAL_USE_SPI == TRUE
# define SPI_DRIVER SPID1
# define SPI_SCK_PIN GP14
# define SPI_MOSI_PIN GP15
# define SPI_MISO_PIN GP12
# define SPI_USE_WAIT TRUE
# define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#endif

#include_next <halconf.h>
18 changes: 18 additions & 0 deletions keyboards/splitkb/halcyon/elora/rev2/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2024 splitkb.com (support@splitkb.com)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include_next <mcuconf.h>

//// VIK

#if HAL_USE_I2C == TRUE
# undef RP_I2C_USE_I2C0
# define RP_I2C_USE_I2C0 TRUE
#endif

#if HAL_USE_SPI == TRUE
# undef RP_SPI_USE_SPI1
# define RP_SPI_USE_SPI1 TRUE
#endif
1 change: 0 additions & 1 deletion keyboards/splitkb/halcyon/elora/rules.mk

This file was deleted.

11 changes: 10 additions & 1 deletion keyboards/splitkb/halcyon/kyria/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,21 @@

![splitkb/halcyon/kyria](https://i.imgur.com/n7WuUs9.jpg)

The Halcyon Kyria rev4 is the fourth Kyria revision and the first keyboard in our Halcyon range. Similar to Aurora, all keyboards in the series share the same feature set. The key highlights:

- Halcyon keyboards come preassembled! You won't need a soldering iron.
- You'll be able to install [VIK](https://github.com/sadekbaroudi/vik) modules.
- It'll come fully documented, which includes the unboxing, assembly (with only a screwdriver), first installation and some advanced use cases.
- Both the connection to the host device as well as the interconnect between the keyboard halves use USB C.
- The controller has full ESD protection on all USB C ports, as well as all switch matrix GPIO!
- The controller is interchangable. If part of your keyboard ever breaks, we can replace just the bits that need replacing.

* Keyboard Maintainer: [splitkb.com](https://github.com/splitkb.com)
* Hardware Availability: [splitkb.com](https://splitkb.com).

Make example for this keyboard (after setting up your build environment):

make splitkb/halcyon/kyria:default
make splitkb/halcyon/kyria/rev4:default

The keyboard can be flashed by copying the resulting `.uf2` file onto the `RPI-RP2` flash drive.

Expand Down
27 changes: 27 additions & 0 deletions keyboards/splitkb/halcyon/kyria/rev4/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2024 splitkb.com (support@splitkb.com)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

//// VIK

// GPIO1 = GP27
// GPIO2 = GP26
// CS = GP13

#if HAL_USE_I2C == TRUE
# define I2C_DRIVER I2C0
# define I2C1_SDA_PIN GP16
# define I2C1_SCL_PIN GP17
#endif

#if HAL_USE_SPI == TRUE
# define SPI_DRIVER SPID1
# define SPI_SCK_PIN GP14
# define SPI_MOSI_PIN GP15
# define SPI_MISO_PIN GP12
# define SPI_USE_WAIT TRUE
# define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#endif

#include_next <halconf.h>
18 changes: 18 additions & 0 deletions keyboards/splitkb/halcyon/kyria/rev4/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2024 splitkb.com (support@splitkb.com)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#include_next <mcuconf.h>

//// VIK

#if HAL_USE_I2C == TRUE
# undef RP_I2C_USE_I2C0
# define RP_I2C_USE_I2C0 TRUE
#endif

#if HAL_USE_SPI == TRUE
# undef RP_SPI_USE_SPI1
# define RP_SPI_USE_SPI1 TRUE
#endif
1 change: 0 additions & 1 deletion keyboards/splitkb/halcyon/kyria/rules.mk

This file was deleted.

0 comments on commit 3ec4399

Please sign in to comment.