summaryrefslogtreecommitdiffstats
path: root/keyboards/ferris/0_2/compact
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-09 12:14:22 -0700
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-09 12:14:22 -0700
commit7bec943043b8d03482e9f4ffc69cc63b9fc4a18a (patch)
treee138b4d121f2196d3983e1643cab4381ee729c9b /keyboards/ferris/0_2/compact
parentc0628c2820b436550f62af5f6b7fae1f66b0bf8b (diff)
parent26ea090190b815862f108903e5f41f20c6d16d66 (diff)
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
Diffstat (limited to 'keyboards/ferris/0_2/compact')
-rw-r--r--keyboards/ferris/0_2/compact/config.h23
-rw-r--r--keyboards/ferris/0_2/compact/readme.md17
-rw-r--r--keyboards/ferris/0_2/compact/rules.mk0
3 files changed, 40 insertions, 0 deletions
diff --git a/keyboards/ferris/0_2/compact/config.h b/keyboards/ferris/0_2/compact/config.h
new file mode 100644
index 0000000000..ee465b9acd
--- /dev/null
+++ b/keyboards/ferris/0_2/compact/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2021 Pierre Chevalier <pierrechevalier83@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
+
+#undef PRODUCT_ID
+#define PRODUCT_ID 0x0003
+#undef PRODUCT
+#define PRODUCT Ferris 0.2 - Compact
diff --git a/keyboards/ferris/0_2/compact/readme.md b/keyboards/ferris/0_2/compact/readme.md
new file mode 100644
index 0000000000..b17b59bfae
--- /dev/null
+++ b/keyboards/ferris/0_2/compact/readme.md
@@ -0,0 +1,17 @@
+# Ferris 0.2 - Compact
+
+![Ferris 0.2 - Compact, top view](https://i.imgur.com/V2ZLKjih.jpg)
+![Ferris 0.2 - Compact, bottom view](https://i.imgur.com/3icP8pzh.jpg)
+
+Ferris 0.2 - Compact with Kailh Choc support and Choc spacing.
+
+* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
+* Hardware Supported:
+ * Ferris 0.2 - Compact: (STM32F072 MCU on the left, MCP23017 on the right)
+* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
+
+Make examples for this keyboard (after setting up your build environment):
+
+ make ferris/0_2/compact:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ferris/0_2/compact/rules.mk b/keyboards/ferris/0_2/compact/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/ferris/0_2/compact/rules.mk