summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThat-Canadian <poole.chris.11@gmail.com>2017-07-10 16:51:37 -0400
committerThat-Canadian <poole.chris.11@gmail.com>2017-07-10 16:51:37 -0400
commit1fdf3c84fe2bb10698bf528a9726aab5af12ca6d (patch)
treed64dea2733b654501b79ddd8a382d815b19681b4
parent9312b9db6c94f0ed5e17d4cc9904bd0b72de5298 (diff)
downloadqmk_firmware-1fdf3c84fe2bb10698bf528a9726aab5af12ca6d.tar.gz
qmk_firmware-1fdf3c84fe2bb10698bf528a9726aab5af12ca6d.zip
Updated minidox rev1 config, and readme. Also updated that_canadian keymap to include RGB
-rw-r--r--keyboards/minidox/keymaps/that_canadian/Makefile3
-rw-r--r--keyboards/minidox/keymaps/that_canadian/config.h37
-rw-r--r--keyboards/minidox/keymaps/that_canadian/keymap.c4
-rw-r--r--keyboards/minidox/readme.md2
-rw-r--r--keyboards/minidox/rev1/config.h11
5 files changed, 45 insertions, 12 deletions
diff --git a/keyboards/minidox/keymaps/that_canadian/Makefile b/keyboards/minidox/keymaps/that_canadian/Makefile
new file mode 100644
index 0000000000..457a3d01d4
--- /dev/null
+++ b/keyboards/minidox/keymaps/that_canadian/Makefile
@@ -0,0 +1,3 @@
+ifndef QUANTUM_DIR
+ include ../../../../Makefile
+endif
diff --git a/keyboards/minidox/keymaps/that_canadian/config.h b/keyboards/minidox/keymaps/that_canadian/config.h
new file mode 100644
index 0000000000..7a8193e081
--- /dev/null
+++ b/keyboards/minidox/keymaps/that_canadian/config.h
@@ -0,0 +1,37 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#define USE_SERIAL
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D7
+#define RGBLIGHT_TIMER
+#define RGBLED_NUM 4 // Number of LEDs
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
+
+#endif \ No newline at end of file
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/minidox/keymaps/that_canadian/keymap.c
index 838f306026..940c388c92 100644
--- a/keyboards/minidox/keymaps/that_canadian/keymap.c
+++ b/keyboards/minidox/keymaps/that_canadian/keymap.c
@@ -113,8 +113,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = KEYMAP( \
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F9, KC_F10, \
- KC_F11, KC_F12, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL, \
- RESET, _______, _______, _______, _______, _______, _______, KC_F8, TSKMGR, _______, \
+ KC_F11, KC_F12, _______, RGB_SAI, RGB_SAD, _______, KC_LEFT, KC_DOWN, KC_RGHT, CALTDEL, \
+ RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_F8, TSKMGR, _______, \
_______, _______, _______, _______, _______, _______ \
)
};
diff --git a/keyboards/minidox/readme.md b/keyboards/minidox/readme.md
index 37ab84b086..f6227386de 100644
--- a/keyboards/minidox/readme.md
+++ b/keyboards/minidox/readme.md
@@ -3,7 +3,7 @@ ECO
![MimiDox](http://i.imgur.com/iWb3yO0.jpg)
-DESCRIPTION HERE
+A compact version of the ErgoDox
Keyboard Maintainer: That-Canadian
Hardware Supported: MiniDox PCB rev1 Pro Micro
diff --git a/keyboards/minidox/rev1/config.h b/keyboards/minidox/rev1/config.h
index 4370e7d736..a858a5b902 100644
--- a/keyboards/minidox/rev1/config.h
+++ b/keyboards/minidox/rev1/config.h
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef REV1_CONFIG_H
#define REV1_CONFIG_H
-#include "config_common.h"
+#include "../config.h"
#define DEVICE_VER 0x0001
@@ -34,12 +34,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define I2C_MASTER_LEFT
//#define I2C_MASTER_RIGHT
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
-#define RGBLED_NUM 12 // Number of LEDs
-#define ws2812_PORTREG PORTD
-#define ws2812_DDRREG DDRD
-
+
#endif