Skip to content

Commit

Permalink
Keyboard: Move Bathroom Epiphany boards into its own directory (qmk#3936
Browse files Browse the repository at this point in the history
)

* make bpiphany directory with simple readme file

* move unloved_bastard to bpiphany directory

* move frosty_flake to bpiphany directory

* move pegasushoof to bpiphany directory

* move tiger_lily to bpiphany directory

* add a little more info to readme

* move kitten_paw to bpiphany directory

* update make instructions

* update intro text

* add missing routines to matrix.c of unloved_bastard

* add missing routines
  • Loading branch information
mechmerlin authored and ChrissiQ committed Sep 25, 2018
1 parent 00db997 commit 4e784d4
Show file tree
Hide file tree
Showing 78 changed files with 121 additions and 28 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@ static uint8_t debouncing = DEBOUNCING_DELAY;
static matrix_row_t matrix[MATRIX_ROWS];
static matrix_row_t matrix_debouncing[MATRIX_ROWS];

__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}

__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}

__attribute__ ((weak))
void matrix_init_user(void) {
}

__attribute__ ((weak))
void matrix_scan_user(void) {
}

static matrix_row_t scan_col(void) {
return (
(PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,19 @@ Make example for this keyboard (after setting up your build environment):
104 key default layout:

```
make frosty_flake:default
make bpiphany/frosty_flake:default
```

To directly flash the frosty_flake after compiling use

```
make frosty_flake:default:dfu
make bpiphany/frosty_flake:default:dfu
```

87 key tkl layout:

```
make frosty_flake:tkl:dfu
make bpiphany/frosty_flake:tkl:dfu
```

See [build environment
setup](https://docs.qmk.fm/build_environment_setup.html) then the
[make instructions](https://docs.qmk.fm/make_instructions.html) for
more information.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
static uint8_t read_rows(void);
static void select_col(uint8_t col);

__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}

__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}

__attribute__ ((weak))
void matrix_init_user(void) {
}

__attribute__ ((weak))
void matrix_scan_user(void) {
}

inline uint8_t matrix_rows(void) {
return MATRIX_ROWS;
}
Expand All @@ -48,7 +66,7 @@ inline uint8_t matrix_cols(void) {
* col: 0 1 2 3 4 5 6 7
* pin: PC7 PD5 PD3 PD1 PC2 PD6 PD4 PD2
*
* Rrr pin configuration
* Rrr pin configuration
*
* These rrrs uses one 74HC154 4 to 16 bit demultiplexer (low
* active), together with 2 rrrs driven directly from the micro
Expand Down Expand Up @@ -84,7 +102,7 @@ uint8_t matrix_scan(void) {
}
}
}

if (debouncing) {
if (--debouncing) {
_delay_ms(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=46700.0

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

make kitten_paw:default
make bpiphany/kitten_paw:default

See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
File renamed without changes.
12 changes: 12 additions & 0 deletions keyboards/bpiphany/pegasushoof/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Pegasus Hoof Controller
===

Keyboard Maintainer: QMK Community
Hardware Supported: Pegasus Hoof
Hardware Availability: https://1upkeyboards.com/filco-pegasus-hoof-controller.html

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

make bpiphany/pegasus_hoof:default

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
static matrix_row_t read_cols(void);
static void select_row(uint8_t col);

__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}

__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}

__attribute__ ((weak))
void matrix_init_user(void) {
}

__attribute__ ((weak))
void matrix_scan_user(void) {
}

inline uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions keyboards/bpiphany/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Bathroom Epiphanies

bpiphany is the owner and designer of [Bathroom Epiphanies](http://bathroomepiphanies.com/).

He is based in Sweden and creates several controller boards as a swappable component for some off the shelf keyboards.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,24 @@ static uint8_t debouncing = DEBOUNCING_DELAY;
static matrix_row_t matrix[MATRIX_ROWS];
static matrix_row_t matrix_debouncing[MATRIX_ROWS];

__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}

__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}

__attribute__ ((weak))
void matrix_init_user(void) {
}

__attribute__ ((weak))
void matrix_scan_user(void) {
}

static matrix_row_t scan_col(void) {
return (
(PINC&(1<<2) ? 0 : ((matrix_row_t)1<<0)) | \
Expand Down Expand Up @@ -134,4 +152,4 @@ uint8_t matrix_key_count(void) {
for (uint8_t row = 0; row < MATRIX_ROWS; row++)
count += bitpop32(matrix[row]);
return count;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=46700.0

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

make tiger_lily:default
make bpiphany/tiger_lily:default

See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,24 @@
#include "util.h"
#include "matrix.h"

__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}

__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}

__attribute__ ((weak))
void matrix_init_user(void) {
}

__attribute__ ((weak))
void matrix_scan_user(void) {
}

#ifndef DEBOUNCING_DELAY
# define DEBOUNCING_DELAY 5
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Hardware Availability: Pretty much anywhere

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

make unloved_bastard:default
make bpiphany/unloved_bastard:default

See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 0 additions & 12 deletions keyboards/pegasushoof/README.md

This file was deleted.

0 comments on commit 4e784d4

Please sign in to comment.