aboutsummaryrefslogtreecommitdiff
path: root/keyboards/25keys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/25keys')
-rw-r--r--keyboards/25keys/aleth42/info.json10
-rw-r--r--keyboards/25keys/aleth42/rev0/config.h23
-rw-r--r--keyboards/25keys/aleth42/rev0/keyboard.json (renamed from keyboards/25keys/aleth42/rev0/info.json)20
-rw-r--r--keyboards/25keys/aleth42/rev0/rules.mk12
-rw-r--r--keyboards/25keys/aleth42/rev1/config.h23
-rw-r--r--keyboards/25keys/aleth42/rev1/keyboard.json (renamed from keyboards/25keys/aleth42/rev1/info.json)21
-rw-r--r--keyboards/25keys/aleth42/rev1/rules.mk12
-rw-r--r--keyboards/25keys/cassette42/common/oled_helper.c4
-rw-r--r--keyboards/25keys/cassette42/keyboard.json (renamed from keyboards/25keys/cassette42/info.json)8
-rw-r--r--keyboards/25keys/cassette42/rules.mk15
-rw-r--r--keyboards/25keys/zinc/info.json15
-rw-r--r--keyboards/25keys/zinc/rev1/keyboard.json (renamed from keyboards/25keys/zinc/rev1/info.json)19
-rw-r--r--keyboards/25keys/zinc/rev1/rules.mk1
-rw-r--r--keyboards/25keys/zinc/reva/keyboard.json (renamed from keyboards/25keys/zinc/reva/info.json)19
-rw-r--r--keyboards/25keys/zinc/reva/rules.mk1
-rw-r--r--keyboards/25keys/zinc/rules.mk17
16 files changed, 90 insertions, 130 deletions
diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json
deleted file mode 100644
index 2000c037f5..0000000000
--- a/keyboards/25keys/aleth42/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "keyboard_name": "ALETH42",
- "manufacturer": "25KEYS",
- "url": "http://www.sho-k.co.uk/tech/aleth42",
- "maintainer": "monksoffunk",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEAC8"
- }
-}
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
deleted file mode 100644
index 0d7a5de560..0000000000
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 monksoffunk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/keyboard.json
index 675c741bf5..bbb566d909 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/keyboard.json
@@ -1,7 +1,27 @@
{
+ "keyboard_name": "ALETH42",
+ "manufacturer": "25KEYS",
+ "url": "http://www.sho-k.co.uk/tech/aleth42",
+ "maintainer": "monksoffunk",
"usb": {
+ "vid": "0x04D8",
+ "pid": "0xEAC8",
"device_version": "0.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "rgblight": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
"rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/25keys/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk
deleted file mode 100644
index e0954e7355..0000000000
--- a/keyboards/25keys/aleth42/rev0/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
deleted file mode 100644
index 0d7a5de560..0000000000
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 monksoffunk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/keyboard.json
index fd4b07fe3e..0feab708a0 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/keyboard.json
@@ -1,7 +1,28 @@
{
+ "keyboard_name": "ALETH42",
+ "manufacturer": "25KEYS",
+ "url": "http://www.sho-k.co.uk/tech/aleth42",
+ "maintainer": "monksoffunk",
"usb": {
+ "vid": "0x04D8",
+ "pid": "0xEAC8",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
"rows": ["B4", "B0", "B2", "B1"]
diff --git a/keyboards/25keys/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk
deleted file mode 100644
index 683b249802..0000000000
--- a/keyboards/25keys/aleth42/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes
diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
index 1c4148a7d9..83832a9947 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.c
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -1,5 +1,7 @@
#include "oled_helper.h"
-#include "quantum.h"
+#include "progmem.h"
+#include "rgblight.h"
+#include "oled_driver.h"
#include <stdio.h>
#include <string.h>
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/keyboard.json
index 38a73368f6..cba2e61272 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xCA42",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true
+ },
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B2"},
diff --git a/keyboards/25keys/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
index f8febbdec8..788ba43e59 100644
--- a/keyboards/25keys/cassette42/rules.mk
+++ b/keyboards/25keys/cassette42/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-
SRC += ./common/oled_helper.c
diff --git a/keyboards/25keys/zinc/info.json b/keyboards/25keys/zinc/info.json
deleted file mode 100644
index 2350242316..0000000000
--- a/keyboards/25keys/zinc/info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "manufacturer": "25KEYS",
- "url": "https://github.com/monksoffunk/zinc",
- "maintainer": "monksoffunk",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEA3B",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina"
-}
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/keyboard.json
index 47fb1f2e98..c1bead2d8a 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/keyboard.json
@@ -1,16 +1,35 @@
{
"keyboard_name": "Zinc rev.1",
+ "manufacturer": "25KEYS",
+ "url": "https://github.com/monksoffunk/zinc",
+ "maintainer": "monksoffunk",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA3B",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"matrix_pins": {
"cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
"rows": ["F6", "F7", "B1", "B3"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"tapping": {
"term": 100
},
+ "rgb_matrix": {
+ "driver": "ws2812"
+ },
"rgblight": {
"hue_steps": 10
},
diff --git a/keyboards/25keys/zinc/rev1/rules.mk b/keyboards/25keys/zinc/rev1/rules.mk
deleted file mode 100644
index d38a618090..0000000000
--- a/keyboards/25keys/zinc/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/keyboard.json
index 1ab2fb7e38..01d2291c49 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/keyboard.json
@@ -1,16 +1,35 @@
{
"keyboard_name": "Zinc rev.A",
+ "manufacturer": "25KEYS",
+ "url": "https://github.com/monksoffunk/zinc",
+ "maintainer": "monksoffunk",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA3B",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"tapping": {
"term": 100
},
+ "rgb_matrix": {
+ "driver": "ws2812"
+ },
"rgblight": {
"hue_steps": 10
},
diff --git a/keyboards/25keys/zinc/reva/rules.mk b/keyboards/25keys/zinc/reva/rules.mk
deleted file mode 100644
index 83895bdcb8..0000000000
--- a/keyboards/25keys/zinc/reva/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes \ No newline at end of file
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index 1e1d687ebb..1edcb0a345 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -1,18 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-RGB_MATRIX_ENABLE = no
-
DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c