summaryrefslogtreecommitdiff
path: root/keyboards/palette1202
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/palette1202')
-rw-r--r--keyboards/palette1202/config.h7
-rw-r--r--keyboards/palette1202/info.json33
-rw-r--r--keyboards/palette1202/lib/oled_helper.c6
-rw-r--r--keyboards/palette1202/palette1202.c2
-rw-r--r--keyboards/palette1202/palette1202.h37
5 files changed, 24 insertions, 61 deletions
diff --git a/keyboards/palette1202/config.h b/keyboards/palette1202/config.h
index d3c5f5edc0..6c2ebfdc39 100644
--- a/keyboards/palette1202/config.h
+++ b/keyboards/palette1202/config.h
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B6, B2, B3 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Register custom font file */
#ifdef OLED_ENABLE
#define OLED_FONT_H "lib/glcdfont.c"
diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json
index 6698af203b..99f43a73f2 100644
--- a/keyboards/palette1202/info.json
+++ b/keyboards/palette1202/info.json
@@ -8,6 +8,11 @@
"pid": "0x1202",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["B6", "B2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F4", "pin_b": "F5", "resolution": 2},
@@ -19,22 +24,22 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label":"Tab", "x": 0, "y": 0.75 },
- { "label":"GUI + A", "x": 1, "y": 0.25 },
- { "label":"E", "x": 2, "y": 0 },
- { "label":"P", "x": 3, "y": 0.5 },
- { "label":"GUI + 0", "x": 4, "y": 0 },
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0},
- { "label":"Fn", "x": 0, "y": 1.75 },
- { "label":"M", "x": 1, "y": 1.25 },
- { "label":"BackSP", "x": 2, "y": 1 },
- { "label":"B", "x": 3, "y": 1.5 },
- { "label":"HYPR", "x": 4, "y": 1 },
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1},
- { "label":"Shift", "x": 1, "y": 2.5 },
- { "label":"LGUI", "x": 2, "y": 2.5 },
- { "label":"GUI + Z", "x": 3, "y": 2.5 },
- { "label":"Space", "x": 4, "y": 2.5, "r": 15 }
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
]
}
}
diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c
index 5fb3cc7539..38608e5a6c 100644
--- a/keyboards/palette1202/lib/oled_helper.c
+++ b/keyboards/palette1202/lib/oled_helper.c
@@ -1,8 +1,10 @@
-#ifdef OLED_ENABLE
-#include QMK_KEYBOARD_H
+#include "oled_helper.h"
+#include "quantum.h"
#include <stdio.h>
#include <string.h>
+#ifdef OLED_ENABLE
+
// returns character cord of the logo by line number
char *read_logo(int row) {
static char logoLines[][18] = {
diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c
index a193964e3e..b2712df906 100644
--- a/keyboards/palette1202/palette1202.c
+++ b/keyboards/palette1202/palette1202.c
@@ -13,7 +13,7 @@
* 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 "palette1202.h"
+#include "quantum.h"
// initialize OLED if OLED is enabled
#ifdef OLED_ENABLE
diff --git a/keyboards/palette1202/palette1202.h b/keyboards/palette1202/palette1202.h
deleted file mode 100644
index 737e381f73..0000000000
--- a/keyboards/palette1202/palette1202.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 niltea
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, \
- k10, k11, k12, k13, k14, \
- k21, k22, k23, k24 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { KC_NO, k21, k22, k23, k24 }, \
-}