summaryrefslogtreecommitdiff
path: root/keyboards/ploopyco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ploopyco')
-rw-r--r--keyboards/ploopyco/mouse/config.h1
-rw-r--r--keyboards/ploopyco/mouse/info.json3
-rw-r--r--keyboards/ploopyco/mouse/mouse.c2
-rw-r--r--keyboards/ploopyco/trackball/rev1/rev1.h21
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/config.h2
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/info.json3
-rw-r--r--keyboards/ploopyco/trackball/rev1_005/rev1_005.h21
-rw-r--r--keyboards/ploopyco/trackball/trackball.h5
-rw-r--r--keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h22
-rw-r--r--keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h22
-rw-r--r--keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h22
-rw-r--r--keyboards/ploopyco/trackball_thumb/info.json8
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/info.json5
-rw-r--r--keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h21
-rw-r--r--keyboards/ploopyco/trackball_thumb/trackball_thumb.h3
15 files changed, 14 insertions, 147 deletions
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index c7fcc504e3..bc7e587ee7 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -30,7 +30,6 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGB_DI_PIN B5
#define RGBLED_NUM 4
#define RGBLIGHT_LIMIT_VAL 40
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index c8889f59f9..96b91d89a6 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -11,6 +11,9 @@
"bootmagic": {
"matrix": [0, 3]
},
+ "ws2812": {
+ "pin": "B5"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"matrix_pins": {
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index 275c02214e..e2dada4a15 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
+#include "mouse.h"
#ifndef OPT_DEBOUNCE
# define OPT_DEBOUNCE 5 // (ms) Time between scroll events
diff --git a/keyboards/ploopyco/trackball/rev1/rev1.h b/keyboards/ploopyco/trackball/rev1/rev1.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * 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
-
-#include "trackball.h"
diff --git a/keyboards/ploopyco/trackball/rev1_005/config.h b/keyboards/ploopyco/trackball/rev1_005/config.h
index fcf51c4c1b..66a453dcb8 100644
--- a/keyboards/ploopyco/trackball/rev1_005/config.h
+++ b/keyboards/ploopyco/trackball/rev1_005/config.h
@@ -23,8 +23,6 @@
#define UNUSABLE_PINS \
{ D1, D3, B4, B7, D6, C7, F6, F5, F3, F7 }
-// If board has a debug LED, you can enable it by defining this
-#define RGB_DI_PIN B5
#define RGBLED_NUM 3
#define RGBLIGHT_LIMIT_VAL 40
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/info.json
index b963f8842a..91574c5c4b 100644
--- a/keyboards/ploopyco/trackball/rev1_005/info.json
+++ b/keyboards/ploopyco/trackball/rev1_005/info.json
@@ -5,5 +5,8 @@
"direct": [
["D4", "D2", "E6", "B6", "D7"]
]
+ },
+ "ws2812": {
+ "pin": "B5"
}
}
diff --git a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h b/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
deleted file mode 100644
index a82c20a116..0000000000
--- a/keyboards/ploopyco/trackball/rev1_005/rev1_005.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2020 Ploopy Corporation
- *
- * 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
-
-#include "trackball.h"
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index 4cdae526aa..f4516222e0 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -21,11 +21,6 @@
#include "quantum.h"
#include "analog.h"
#include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_rev1)
-# include "rev1.h"
-#elif defined(KEYBOARD_ploopyco_trackball_rev1_005)
-# include "rev1_005.h"
-#endif
// Sensor defs
#define OPT_ENC1 F0
diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_mini/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h b/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_mini/rev1_002/rev1_002.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h
deleted file mode 100644
index 4f34e17dd4..0000000000
--- a/keyboards/ploopyco/trackball_nano/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * 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
-
-#include "trackball_mini.h"
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
index 3cf2d0ca37..3b9404b401 100644
--- a/keyboards/ploopyco/trackball_thumb/info.json
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -23,12 +23,12 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"matrix":[0,0], "x":0, "y":0, "h": 1},
+ {"matrix":[0,0], "x":0, "y":0},
{"matrix":[0,2], "x":1, "y":0, "h":2},
{"matrix":[0,3],"x":2.5, "y":0.25, "h":1.5},
- {"matrix":[0,4],"x":4, "y":0, "h":2},
- {"matrix":[0,5],"x":5, "y":0.5, "h":1},
- {"matrix":[0,1],"x":0, "y":1, "h":1}
+ {"matrix":[0,4],"x":4, "y":0},
+ {"matrix":[0,5],"x":5, "y":0.5},
+ {"matrix":[0,1],"x":0, "y":1}
]
}
}
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
index 80951b5b2d..602692866c 100644
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
+++ b/keyboards/ploopyco/trackball_thumb/rev1_001/info.json
@@ -8,13 +8,14 @@
},
"rgblight": {
"led_count": 3,
- "pin": "B5",
"max_brightness": 40,
"animations": {
"breathing": true,
"rainbow_mood": true,
"rainbow_swirl": true
}
+ },
+ "ws2812": {
+ "pin": "B5"
}
-
}
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h b/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
deleted file mode 100644
index f43818665c..0000000000
--- a/keyboards/ploopyco/trackball_thumb/rev1_001/rev1_001.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- *
- * 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
-
-#include "trackball_thumb.h"
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
index 356b8902db..8ee17634f1 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -21,9 +21,6 @@
#include "quantum.h"
#include "analog.h"
#include "opt_encoder.h"
-#if defined(KEYBOARD_ploopyco_trackball_thumb_rev1_001)
-# include "rev1_001.h"
-#endif
// Sensor defs
#define OPT_ENC1 F4
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 21:44:58 +0000