summaryrefslogtreecommitdiff
path: root/keyboards/peej
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-16 20:18:33 +1100
committerGitHub <noreply@github.com>2023-03-16 20:18:33 +1100
commit9dbee3e23d28e5f61384bbb5650505a572022341 (patch)
treebfa5fae549305e780fb81ce7275ced1f808a7e36 /keyboards/peej
parent72da3ee63e110392bebaa64dd7d862fb99097505 (diff)
Remove useless "ifdef KEYBOARD_*" (#20078)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/peej')
-rw-r--r--keyboards/peej/rosaline/config.h3
-rw-r--r--keyboards/peej/rosaline/ortho/ortho.h7
-rw-r--r--keyboards/peej/rosaline/rosaline.c2
-rw-r--r--keyboards/peej/rosaline/rosaline.h30
-rw-r--r--keyboards/peej/rosaline/staggered/staggered.h7
5 files changed, 10 insertions, 39 deletions
diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
index 265558e515..18505def82 100644
--- a/keyboards/peej/rosaline/config.h
+++ b/keyboards/peej/rosaline/config.h
@@ -17,3 +17,6 @@
#pragma once
#define USB_MAX_POWER_CONSUMPTION 100
+
+#define LED1 C5
+#define LED2 C4
diff --git a/keyboards/peej/rosaline/ortho/ortho.h b/keyboards/peej/rosaline/ortho/ortho.h
index b3287784c3..30beb92831 100644
--- a/keyboards/peej/rosaline/ortho/ortho.h
+++ b/keyboards/peej/rosaline/ortho/ortho.h
@@ -16,7 +16,7 @@
#pragma once
-#include "rosaline.h"
+#include "quantum.h"
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
@@ -36,6 +36,8 @@
* └───────┘ └───────┘
*/
+#define XXX KC_NO
+
#define LAYOUT_ortho_4x15( \
k00, k40, k01, k41, k02, k42, k03, k43, k04, k44, k05, k45, k06, k46, k07, \
k10, k50, k11, k51, k12, k52, k13, k53, k14, k54, k15, k55, k16, k56, k17, \
@@ -52,6 +54,3 @@
{ k60, k61, k62, k63, k64, k65, k66, XXX }, \
{ k70, k71, k72, k73, k74, k75, k76, XXX } \
}
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c
index 57141e8064..df0594da44 100644
--- a/keyboards/peej/rosaline/rosaline.c
+++ b/keyboards/peej/rosaline/rosaline.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rosaline.h"
+#include "quantum.h"
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
writePin(LED1, record->event.pressed);
diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h
deleted file mode 100644
index 22125f3188..0000000000
--- a/keyboards/peej/rosaline/rosaline.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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 XXX KC_NO
-
-#if defined(KEYBOARD_peej_rosaline_staggered)
- #include "staggered.h"
-#elif defined(KEYBOARD_peej_rosaline_ortho)
- #include "ortho.h"
-#endif
-
-#define LED1 C5
-#define LED2 C4
diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h
index cc2703c834..98186320a5 100644
--- a/keyboards/peej/rosaline/staggered/staggered.h
+++ b/keyboards/peej/rosaline/staggered/staggered.h
@@ -16,7 +16,7 @@
#pragma once
-#include "rosaline.h"
+#include "quantum.h"
/*
* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
@@ -36,6 +36,8 @@
* └──────────┴───┴────────┴───┘
*/
+#define XXX KC_NO
+
#define LAYOUT_all( \
k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \
k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36, k27, \
@@ -52,6 +54,3 @@
{ XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \
{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
}
-
-#define LED1 C5
-#define LED2 C4