aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack <[email protected]>2022-12-22 14:33:32 -0700
committerjack <[email protected]>2022-12-22 14:33:32 -0700
commita52c1339326103370bf0c96453a9240e9f7cd351 (patch)
tree7308c4654ebbb903861a1bac3a7f530c5c877420
parented2402f7061d02b0fa376af4886f2d4308d35646 (diff)
downloadqmk_me-a52c1339326103370bf0c96453a9240e9f7cd351.tar.gz
qmk_me-a52c1339326103370bf0c96453a9240e9f7cd351.zip
add license headers to all applicable files
add bully keyboard
-rw-r--r--keyboards/bully/info.json66
-rw-r--r--keyboards/bully/keymaps/waffle/keymap.c23
-rw-r--r--keyboards/bully/rules.mk2
-rw-r--r--keyboards/minidox/keymaps/waffle/keymap.c2
-rw-r--r--keyboards/relic/keymaps/waffle/keymap.c3
-rw-r--r--keyboards/vault35/keymaps/waffle/keymap.c3
-rw-r--r--keyboards/xyz60/keymaps/waffle/keymap.c2
-rw-r--r--keymaps/f60/keymap.c2
-rw-r--r--keymaps/ferris/config.h2
-rw-r--r--keymaps/ferris/keymap.c2
-rw-r--r--keymaps/kyria/config.h2
-rw-r--r--keymaps/kyria/keymap.c2
-rw-r--r--keymaps/kyria/mcuconf.h2
-rw-r--r--keymaps/microdox/config.h2
-rw-r--r--keymaps/microdox/keymap.c2
-rw-r--r--waffle/raw.py2
16 files changed, 116 insertions, 3 deletions
diff --git a/keyboards/bully/info.json b/keyboards/bully/info.json
new file mode 100644
index 0000000..b9f38ab
--- /dev/null
+++ b/keyboards/bully/info.json
@@ -0,0 +1,66 @@
+{
+ "keyboard_name": "bully",
+ "manufacturer": "waffles",
+ "maintainer": "waffle87",
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B0", "A7", "A6", "A5", "A4", "A2", "B7", "B6", "B5", "B4", "B3", "A15"],
+ "rows": ["B10", "B11", "B1", "B2"]
+ },
+ "usb": {
+ "vid": "0x6A73",
+ "pid": "0x6279",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
+ { "label": "q", "matrix": [0, 1], "x": 1.5, "y": 0 },
+ { "label": "w", "matrix": [0, 2], "x": 2.5, "y": 0 },
+ { "label": "e", "matrix": [0, 3], "x": 3.5, "y": 0 },
+ { "label": "r", "matrix": [0, 4], "x": 4.5, "y": 0 },
+ { "label": "t", "matrix": [0, 5], "x": 5.5, "y": 0 },
+ { "label": "y", "matrix": [0, 6], "x": 6.5, "y": 0 },
+ { "label": "u", "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "label": "i", "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "label": "o", "matrix": [0, 9], "x": 9.5, "y": 0 },
+ { "label": "p", "matrix": [0, 10], "x": 10.5, "y": 0 },
+ { "label": "", "matrix": [3, 11], "w": 2, "x": 11.5, "y": 0 },
+ { "label": "", "matrix": [1, 0], "w": 1.75, "x": 0, "y": 1 },
+ { "label": "a", "matrix": [1, 1], "x": 1.75, "y": 1 },
+ { "label": "s", "matrix": [1, 2], "x": 2.75, "y": 1 },
+ { "label": "d", "matrix": [1, 3], "x": 3.75, "y": 1 },
+ { "label": "f", "matrix": [1, 4], "x": 4.75, "y": 1 },
+ { "label": "g", "matrix": [1, 5], "x": 5.75, "y": 1 },
+ { "label": "h", "matrix": [1, 6], "x": 6.75, "y": 1 },
+ { "label": "j", "matrix": [1, 7], "x": 7.75, "y": 1 },
+ { "label": "k", "matrix": [1, 8], "x": 8.75, "y": 1 },
+ { "label": "l", "matrix": [1, 9], "x": 9.75, "y": 1 },
+ { "label": ";", "matrix": [1, 10], "x": 10.75, "y": 1 },
+ { "label": "bspc", "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1 },
+ { "label": "", "matrix": [2, 0], "w": 2.25, "x": 0, "y": 2 },
+ { "label": "z", "matrix": [2, 1], "x": 2.25, "y": 2 },
+ { "label": "x", "matrix": [2, 2], "x": 3.25, "y": 2 },
+ { "label": "c", "matrix": [2, 3], "x": 4.25, "y": 2 },
+ { "label": "v", "matrix": [2, 4], "x": 5.25, "y": 2 },
+ { "label": "b", "matrix": [2, 5], "x": 6.25, "y": 2 },
+ { "label": "n", "matrix": [2, 6], "x": 7.25, "y": 2 },
+ { "label": "m", "matrix": [2, 7], "x": 8.25, "y": 2 },
+ { "label": ",", "matrix": [2, 8], "x": 9.25, "y": 2 },
+ { "label": ".", "matrix": [2, 9], "x": 10.25, "y": 2 },
+ { "label": "/", "matrix": [2, 10], "x": 11.25, "y": 2 },
+ { "label": "", "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2 },
+ { "label": "", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "label": "../", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
+ { "label": "esc", "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 },
+ { "label": "spc", "matrix": [3, 5], "w": 6.25, "x": 3.75, "y": 3 },
+ { "label": "", "matrix": [3, 8], "w": 1.25, "x": 10, "y": 3 },
+ { "label": "", "matrix": [3, 9], "w": 1, "x": 11.25, "y": 3 },
+ { "label": "", "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keyboards/bully/keymaps/waffle/keymap.c
new file mode 100644
index 0000000..dfcf189
--- /dev/null
+++ b/keyboards/bully/keymaps/waffle/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-3.0-or-later
+#include "waffle.h"
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_waffle(
+ KC_NO, ___BASE1___, PNP,
+ KC_NO, ___BASE2___, KC_BSPC,
+ KC_NO, ___BASE3___, KC_NO,
+ KC_VOLD, UPDIR, KC_ESC, LWRSPC, C(S(KC_V)), MO(_RAISE), KC_VOLU
+ ),
+ [_LOWER] = LAYOUT_waffle(
+ KC_TRNS, ___LOWER1___, KC_TRNS,
+ KC_TRNS, ___LOWER2___, KC_TRNS,
+ KC_TRNS, ___LOWER3___, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_RAISE] = LAYOUT_waffle(
+ KC_TRNS, ___RAISE1___, KC_TRNS,
+ KC_TRNS, ___RAISE2___, KC_TRNS,
+ KC_TRNS, ___RAISE3___, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/bully/rules.mk b/keyboards/bully/rules.mk
new file mode 100644
index 0000000..6a889fd
--- /dev/null
+++ b/keyboards/bully/rules.mk
@@ -0,0 +1,2 @@
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/minidox/keymaps/waffle/keymap.c b/keyboards/minidox/keymaps/waffle/keymap.c
index ffe5888..7cd12de 100644
--- a/keyboards/minidox/keymaps/waffle/keymap.c
+++ b/keyboards/minidox/keymaps/waffle/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "waffle.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle_3x5(
diff --git a/keyboards/relic/keymaps/waffle/keymap.c b/keyboards/relic/keymaps/waffle/keymap.c
index 144b999..7f9b289 100644
--- a/keyboards/relic/keymaps/waffle/keymap.c
+++ b/keyboards/relic/keymaps/waffle/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "waffle.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle(
@@ -6,7 +8,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___BASE3___,
KC_VOLD, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), KC_VOLU
),
-
[_LOWER] = LAYOUT_waffle(
___LOWER1___, QK_MAKE,
___LOWER2___,
diff --git a/keyboards/vault35/keymaps/waffle/keymap.c b/keyboards/vault35/keymaps/waffle/keymap.c
index fbf7df3..47185f7 100644
--- a/keyboards/vault35/keymaps/waffle/keymap.c
+++ b/keyboards/vault35/keymaps/waffle/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "waffle.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle(
@@ -6,7 +8,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___BASE3___,
UPDIR, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), PNP
),
-
[_LOWER] = LAYOUT_waffle(
___LOWER1___, KC_NO,
___LOWER2___,
diff --git a/keyboards/xyz60/keymaps/waffle/keymap.c b/keyboards/xyz60/keymaps/waffle/keymap.c
index ad77ec7..b5082bb 100644
--- a/keyboards/xyz60/keymaps/waffle/keymap.c
+++ b/keyboards/xyz60/keymaps/waffle/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-3.0-or-later
#include "waffle.h"
#define ___NONE___ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c
index ad77ec7..dfd4e15 100644
--- a/keymaps/f60/keymap.c
+++ b/keymaps/f60/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include "waffle.h"
#define ___NONE___ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h
index 9cdcaab..aa81960 100644
--- a/keymaps/ferris/config.h
+++ b/keymaps/ferris/config.h
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGB_DI_PIN B0
#define RGB_MATRIX_LED_COUNT 34
diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c
index 788cd7f..66341fe 100644
--- a/keymaps/ferris/keymap.c
+++ b/keymaps/ferris/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include "waffle.h"
#define XX NO_LED
diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h
index 5cb4d4a..37914b6 100644
--- a/keymaps/kyria/config.h
+++ b/keymaps/kyria/config.h
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define WPM_GRAPH
#define I2C_DRIVER I2CD1
diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c
index b4d2bf9..7c18d95 100644
--- a/keymaps/kyria/keymap.c
+++ b/keymaps/kyria/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include "waffle.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keymaps/kyria/mcuconf.h b/keymaps/kyria/mcuconf.h
index 96b0b51..4984ee0 100644
--- a/keymaps/kyria/mcuconf.h
+++ b/keymaps/kyria/mcuconf.h
@@ -1,4 +1,4 @@
-// Copyright 2022 QMK
+// Copyright 2022 jack (@waffle87)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keymaps/microdox/config.h b/keymaps/microdox/config.h
index bb611eb..7b56619 100644
--- a/keymaps/microdox/config.h
+++ b/keymaps/microdox/config.h
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define RGBLED_NUM RGB_MATRIX_LED_COUNT
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/keymaps/microdox/keymap.c b/keymaps/microdox/keymap.c
index 75af123..8dc627b 100644
--- a/keymaps/microdox/keymap.c
+++ b/keymaps/microdox/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include "waffle.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_waffle_3x5(
diff --git a/waffle/raw.py b/waffle/raw.py
index 1410156..dbb94fa 100644
--- a/waffle/raw.py
+++ b/waffle/raw.py
@@ -1,3 +1,5 @@
+# Copyright 2022 jack (@waffle87)
+# SPDX-License-Identifier: GPL-2.0-or-later
import hid
import sys
import psutil