aboutsummaryrefslogtreecommitdiff
path: root/keyboards/doio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/doio')
-rw-r--r--keyboards/doio/kb04/keyboard.json (renamed from keyboards/doio/kb04/info.json)0
-rw-r--r--keyboards/doio/kb04/rules.mk1
-rw-r--r--keyboards/doio/kb12/keyboard.json (renamed from keyboards/doio/kb12/info.json)0
-rw-r--r--keyboards/doio/kb12/rules.mk1
-rw-r--r--keyboards/doio/kb16/lib/bongocat/bongocat.c9
-rw-r--r--keyboards/doio/kb16/lib/layer_status/layer_status.c4
-rw-r--r--keyboards/doio/kb16/lib/logo.c3
-rw-r--r--keyboards/doio/kb19/keyboard.json (renamed from keyboards/doio/kb19/info.json)0
-rw-r--r--keyboards/doio/kb19/rules.mk1
-rw-r--r--keyboards/doio/kb30/keyboard.json (renamed from keyboards/doio/kb30/info.json)11
-rw-r--r--keyboards/doio/kb30/rules.mk15
-rw-r--r--keyboards/doio/kb38/info.json7
-rw-r--r--keyboards/doio/kb3x/keyboard.json (renamed from keyboards/doio/kb3x/info.json)0
-rw-r--r--keyboards/doio/kb3x/rules.mk1
14 files changed, 26 insertions, 27 deletions
diff --git a/keyboards/doio/kb04/info.json b/keyboards/doio/kb04/keyboard.json
index 2455f82e03..2455f82e03 100644
--- a/keyboards/doio/kb04/info.json
+++ b/keyboards/doio/kb04/keyboard.json
diff --git a/keyboards/doio/kb04/rules.mk b/keyboards/doio/kb04/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/doio/kb04/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/doio/kb12/info.json b/keyboards/doio/kb12/keyboard.json
index c87d5f9544..c87d5f9544 100644
--- a/keyboards/doio/kb12/info.json
+++ b/keyboards/doio/kb12/keyboard.json
diff --git a/keyboards/doio/kb12/rules.mk b/keyboards/doio/kb12/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/doio/kb12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.c b/keyboards/doio/kb16/lib/bongocat/bongocat.c
index 12ca8694c1..c90df38aec 100644
--- a/keyboards/doio/kb16/lib/bongocat/bongocat.c
+++ b/keyboards/doio/kb16/lib/bongocat/bongocat.c
@@ -14,7 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
// WPM-responsive animation stuff here
#define IDLE_FRAMES 5
@@ -28,7 +34,6 @@
#define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
#define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024
-#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
uint32_t curr_anim_duration = 0; // variable animation duration
uint32_t bongo_timer = 0;
diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.c b/keyboards/doio/kb16/lib/layer_status/layer_status.c
index 657ac86ff2..d9ba20bd8c 100644
--- a/keyboards/doio/kb16/lib/layer_status/layer_status.c
+++ b/keyboards/doio/kb16/lib/layer_status/layer_status.c
@@ -15,7 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "oled_driver.h"
+#include "action_layer.h"
+#include "progmem.h"
#define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/doio/kb16/lib/logo.c b/keyboards/doio/kb16/lib/logo.c
index 7a52b479ff..ade4b954e0 100644
--- a/keyboards/doio/kb16/lib/logo.c
+++ b/keyboards/doio/kb16/lib/logo.c
@@ -15,7 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "oled_driver.h"
+#include "progmem.h"
#define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/doio/kb19/info.json b/keyboards/doio/kb19/keyboard.json
index faaaedd36f..faaaedd36f 100644
--- a/keyboards/doio/kb19/info.json
+++ b/keyboards/doio/kb19/keyboard.json
diff --git a/keyboards/doio/kb19/rules.mk b/keyboards/doio/kb19/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/doio/kb19/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/keyboard.json
index 60e02a58ba..637a1fe68b 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/keyboard.json
@@ -48,6 +48,17 @@
"max_brightness": 200,
"sleep": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["B14", "B13", "B12", "B0", "A7", "A9", "A8"],
"rows": ["B3", "B4", "B9", "B8", "A5", "A6"]
diff --git a/keyboards/doio/kb30/rules.mk b/keyboards/doio/kb30/rules.mk
deleted file mode 100644
index 1e48f891f2..0000000000
--- a/keyboards/doio/kb30/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 9a67e3ed5c..a1775a2b10 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -12,8 +12,7 @@
"extrakey": true,
"mousekey": true,
"nkro": true,
- "rgb_matrix": true,
- "rgblight": false
+ "rgb_matrix": true
},
"matrix_pins": {
"cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"],
@@ -22,8 +21,8 @@
"processor": "atmega32u4",
"usb": {
"device_version": "1.0.0",
- "pid": "0x0000",
- "vid": "0xFEED"
+ "pid": "0x3801",
+ "vid": "0xD010"
},
"encoder": {
"rotary": [
diff --git a/keyboards/doio/kb3x/info.json b/keyboards/doio/kb3x/keyboard.json
index be0d138439..be0d138439 100644
--- a/keyboards/doio/kb3x/info.json
+++ b/keyboards/doio/kb3x/keyboard.json
diff --git a/keyboards/doio/kb3x/rules.mk b/keyboards/doio/kb3x/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/doio/kb3x/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank