summaryrefslogtreecommitdiff
path: root/keyboards/pimentoso
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/pimentoso')
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev1/config.h27
-rw-r--r--keyboards/pimentoso/paddino02/rev1/info.json25
-rw-r--r--keyboards/pimentoso/paddino02/rev1/rev1.c16
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev1/rev1.h13
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev2/left/config.h27
-rw-r--r--keyboards/pimentoso/paddino02/rev2/left/info.json25
-rw-r--r--keyboards/pimentoso/paddino02/rev2/left/left.c16
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev2/left/left.h13
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev2/right/config.h27
-rw-r--r--keyboards/pimentoso/paddino02/rev2/right/info.json25
-rw-r--r--keyboards/pimentoso/paddino02/rev2/right/right.c16
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev2/right/right.h13
-rw-r--r--keyboards/pimentoso/touhoupad/config.h9
-rw-r--r--keyboards/pimentoso/touhoupad/info.json28
-rw-r--r--keyboards/pimentoso/touhoupad/touhoupad.c16
-rw-r--r--keyboards/pimentoso/touhoupad/touhoupad.h28
16 files changed, 63 insertions, 261 deletions
diff --git a/keyboards/pimentoso/paddino02/rev1/config.h b/keyboards/pimentoso/paddino02/rev1/config.h
index e29507dde7..5f36081323 100755
--- a/keyboards/pimentoso/paddino02/rev1/config.h
+++ b/keyboards/pimentoso/paddino02/rev1/config.h
@@ -1,34 +1,7 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* 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
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json
index f7fbee01d1..1ee1a11399 100644
--- a/keyboards/pimentoso/paddino02/rev1/info.json
+++ b/keyboards/pimentoso/paddino02/rev1/info.json
@@ -8,23 +8,28 @@
"pid": "0x0020",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D7", "E6", "B4", "B5"],
+ "rows": ["D1", "D0", "D4"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.25},
- {"x":2, "y":0},
- {"x":3, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"x":0, "y":1.5},
- {"x":1, "y":1.25},
- {"x":2, "y":1},
- {"x":3, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"x":2, "y":2.75},
- {"x":3, "y":2.75}
+ {"matrix": [2, 2], "x": 2, "y": 2.75},
+ {"matrix": [2, 3], "x": 3, "y": 2.75}
]
}
}
diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.c b/keyboards/pimentoso/paddino02/rev1/rev1.c
deleted file mode 100644
index 9ebd22df79..0000000000
--- a/keyboards/pimentoso/paddino02/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Michele Ferri <zomgsako@gmail.com>
- *
- * 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/>.
- */
-#include "rev1.h"
diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.h b/keyboards/pimentoso/paddino02/rev1/rev1.h
deleted file mode 100755
index cca4a3c263..0000000000
--- a/keyboards/pimentoso/paddino02/rev1/rev1.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K22, K23 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { KC_NO, KC_NO, K22, K23 } \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/left/config.h b/keyboards/pimentoso/paddino02/rev2/left/config.h
index 976f02f261..5f36081323 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/left/config.h
@@ -1,34 +1,7 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D4, D1 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* 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
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json
index 90d7e4e90d..f297903f68 100644
--- a/keyboards/pimentoso/paddino02/rev2/left/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/left/info.json
@@ -8,23 +8,28 @@
"pid": "0x0021",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["D7", "E6", "B4", "B5"],
+ "rows": ["D0", "D4", "D1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.25},
- {"x":2, "y":0},
- {"x":3, "y":0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"x":0, "y":1.5},
- {"x":1, "y":1.25},
- {"x":2, "y":1},
- {"x":3, "y":1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"x":2, "y":2.75},
- {"x":3, "y":2.75}
+ {"matrix": [2, 2], "x": 2, "y": 2.75},
+ {"matrix": [2, 3], "x": 3, "y": 2.75}
]
}
}
diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.c b/keyboards/pimentoso/paddino02/rev2/left/left.c
deleted file mode 100644
index 26e31efb89..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/left/left.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Michele Ferri <zomgsako@gmail.com>
- *
- * 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/>.
- */
-#include "left.h"
diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.h b/keyboards/pimentoso/paddino02/rev2/left/left.h
deleted file mode 100755
index cca4a3c263..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/left/left.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K22, K23 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { KC_NO, KC_NO, K22, K23 } \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/right/config.h b/keyboards/pimentoso/paddino02/rev2/right/config.h
index 206f0a5429..5f36081323 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/config.h
+++ b/keyboards/pimentoso/paddino02/rev2/right/config.h
@@ -1,34 +1,7 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F6, F5 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* 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
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json
index 3e361839f3..385ee96af9 100644
--- a/keyboards/pimentoso/paddino02/rev2/right/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/right/info.json
@@ -8,23 +8,28 @@
"pid": "0x0022",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1"],
+ "rows": ["F4", "F6", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.25},
- {"x":1, "y":0},
- {"x":2, "y":0.25},
- {"x":3, "y":0.5},
+ {"matrix": [0, 3], "x": 0, "y": 0.25},
+ {"matrix": [0, 2], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0.25},
+ {"matrix": [0, 0], "x": 3, "y": 0.5},
- {"x":0, "y":1.25},
- {"x":1, "y":1},
- {"x":2, "y":1.25},
- {"x":3, "y":1.5},
+ {"matrix": [1, 3], "x": 0, "y": 1.25},
+ {"matrix": [1, 2], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 0], "x": 3, "y": 1.5},
- {"x":0, "y":2.75},
- {"x":1, "y":2.75}
+ {"matrix": [2, 1], "x": 0, "y": 2.75},
+ {"matrix": [2, 0], "x": 1, "y": 2.75}
]
}
}
diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.c b/keyboards/pimentoso/paddino02/rev2/right/right.c
deleted file mode 100644
index 872541271a..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/right/right.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Michele Ferri <zomgsako@gmail.com>
- *
- * 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/>.
- */
-#include "right.h"
diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.h b/keyboards/pimentoso/paddino02/rev2/right/right.h
deleted file mode 100755
index ac7ed847de..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/right/right.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21 \
-) { \
- { K03, K02, K01, K00 }, \
- { K13, K12, K11, K10 }, \
- { K21, K20, KC_NO, KC_NO } \
-}
diff --git a/keyboards/pimentoso/touhoupad/config.h b/keyboards/pimentoso/touhoupad/config.h
index ce44b3ad20..6ded752fcc 100644
--- a/keyboards/pimentoso/touhoupad/config.h
+++ b/keyboards/pimentoso/touhoupad/config.h
@@ -15,14 +15,6 @@
*/
#pragma once
-
-#define MATRIX_ROW_PINS { D4 }
-#define MATRIX_COL_PINS { C6,D7,E6,B4,B6,B2,B3,B1,F7,F6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -33,4 +25,3 @@
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#endif
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index 755b1cf6ba..4e35191761 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -8,24 +8,32 @@
"pid": "0x0031",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "F4"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6"],
+ "rows": ["D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"esc", "x":5.25, "y":0},
- {"label":"enter", "x":6.25, "y":0},
+ {"matrix": [0, 9], "x": 5.25, "y": 0},
+ {"matrix": [0, 8], "x": 6.25, "y": 0},
- {"label":"slow", "x":0, "y":1},
- {"label":"fire", "x":1, "y":1},
- {"label":"rapid", "x":2, "y":1},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
- {"label":"up", "x":6.25, "y":1.75},
- {"label":"left", "x":5.25, "y":2.75},
- {"label":"down", "x":6.25, "y":2.75},
- {"label":"right", "x":7.25, "y":2.75},
+ {"matrix": [0, 7], "x": 6.25, "y": 1.75},
+ {"matrix": [0, 4], "x": 5.25, "y": 2.75},
+ {"matrix": [0, 5], "x": 6.25, "y": 2.75},
+ {"matrix": [0, 6], "x": 7.25, "y": 2.75},
- {"label":"bomb", "x":3.25, "y":3}
+ {"matrix": [0, 3], "x": 3.25, "y": 3}
]
}
}
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.c b/keyboards/pimentoso/touhoupad/touhoupad.c
deleted file mode 100644
index a7c7fa073f..0000000000
--- a/keyboards/pimentoso/touhoupad/touhoupad.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Michele Ferri <zomgsako@gmail.com>
- *
- * 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/>.
- */
-#include "touhoupad.h"
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.h b/keyboards/pimentoso/touhoupad/touhoupad.h
deleted file mode 100644
index 8c7bfc36e1..0000000000
--- a/keyboards/pimentoso/touhoupad/touhoupad.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Michele Ferri <zomgsako@gmail.com>
- *
- * 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 "quantum.h"
-
-#define LAYOUT( \
- k09, k08, \
- k00, k01, k02, \
- k07, \
- k04, k05, k06, \
- k03 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
-}