Merge remote-tracking branch 'origin/master' into develop

5 files changed, 81 insertions, 0 deletions

diff --git a/keyboards/oddball/v2_1/config.h b/keyboards/oddball/v2_1/config.h
new file mode 100644
index 0000000000..6be3e8a248
--- /dev/null
+++ b/keyboards/oddball/v2_1/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 Alexander Tulloh
+ *
+ * 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
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D4, E6, D7, C6 }
+#define MATRIX_COL_PINS { B6, B5, B4, F5, F6, F7 }
+#define UNUSED_PINS { D3, D5, C7, F1, F0, B7, F4 }
diff --git a/keyboards/oddball/v2_1/readme.md b/keyboards/oddball/v2_1/readme.md
new file mode 100644
index 0000000000..27ab10661b
--- /dev/null
+++ b/keyboards/oddball/v2_1/readme.md
@@ -0,0 +1,12 @@
+# Oddball v2.1
+
+Make examples for this keyboard (after setting up your build environment):
+
+```
+# with ADNS sensor
+make oddball/v2_1:default
+```
+```
+# with PMW sensor
+make oddball/v2_1:pmw3360
+```
diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk
new file mode 100644
index 0000000000..94a167143c
--- /dev/null
+++ b/keyboards/oddball/v2_1/rules.mk
@@ -0,0 +1,2 @@
+# Elite C
+BOOTLOADER = qmk-dfu
diff --git a/keyboards/oddball/v2_1/v2_1.c b/keyboards/oddball/v2_1/v2_1.c
new file mode 100644
index 0000000000..4c2433b413
--- /dev/null
+++ b/keyboards/oddball/v2_1/v2_1.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Alexander Tulloh
+ *
+ * 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 "v2_1.h"
diff --git a/keyboards/oddball/v2_1/v2_1.h b/keyboards/oddball/v2_1/v2_1.h
new file mode 100644
index 0000000000..08df4a7975
--- /dev/null
+++ b/keyboards/oddball/v2_1/v2_1.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Alexander Tulloh
+ *
+ * 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 "oddball.h"