summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThat-Canadian <poole.chris.11@gmail.com>2017-08-07 07:49:43 -0400
committerThat-Canadian <poole.chris.11@gmail.com>2017-08-07 07:49:43 -0400
commitaa67e3cedbcb09ad1afca9130568149c7db073ea (patch)
tree1bec1461937b945320e667c0431c0411db5e9160
parent525b3deadf8c6d063f2f62d900ae8b4d738b62fd (diff)
downloadqmk_firmware-aa67e3cedbcb09ad1afca9130568149c7db073ea.tar.gz
qmk_firmware-aa67e3cedbcb09ad1afca9130568149c7db073ea.zip
Changed my personal keymap and config.
-rw-r--r--keyboards/minidox/keymaps/that_canadian/config.h2
-rw-r--r--keyboards/minidox/keymaps/that_canadian/keymap.c15
2 files changed, 3 insertions, 14 deletions
diff --git a/keyboards/minidox/keymaps/that_canadian/config.h b/keyboards/minidox/keymaps/that_canadian/config.h
index aad7ed1e66..5832d1866e 100644
--- a/keyboards/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/minidox/keymaps/that_canadian/config.h
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define RGB_DI_PIN D7
#define RGBLIGHT_TIMER
-#define RGBLED_NUM 4 // Number of LEDs
+#define RGBLED_NUM 8 // Number of LEDs
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/minidox/keymaps/that_canadian/keymap.c
index 5d55d18251..b1ca139b7b 100644
--- a/keyboards/minidox/keymaps/that_canadian/keymap.c
+++ b/keyboards/minidox/keymaps/that_canadian/keymap.c
@@ -40,11 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | Z | X | C | V | B | | N | M | , | . | / |
* `----------------------------------' `----------------------------------'
* ,--------------------. ,------,-------------.
-<<<<<<< HEAD
* | Shift| LOWER| | | | RAISE| Ctrl |
-=======
- * | Ctrl | LOWER| | | | RAISE| Shift|
->>>>>>> a4958a532da154b9dd6f6144836a73f9de641f74
* `-------------| Space| |BckSpc|------+------.
* | | | |
* `------' `------'
@@ -105,9 +101,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,----------------------------------. ,----------------------------------.
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | Up | F9 | F10 |
* |------+------+------+------+------| |------+------+------+------+------|
- * | F11 | F12 | | | | | | Left | Down |Right |caltde|
+ * | F11 | F12 | |RGBSAI|RGBSAD| | | Left | Down |Right |caltde|
* |------+------+------+------+------| |------+------+------+------+------|
- * | Reset| | | | | | | | F8 |Taskmg| |
+ * | Reset|RGBTOG|RGBMOD|RGBHUI|RGBHUD| |RGBVAI|RGBVAD| F8 |Taskmg| |
* `----------------------------------' `----------------------------------'
* ,--------------------. ,------,-------------.
* | | LOWER| | | | RAISE| |
@@ -123,10 +119,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-#endif
-
void persistant_default_layer_set(uint16_t default_layer) {
eeconfig_update_default_layer(default_layer);
default_layer_set(default_layer);
@@ -136,9 +128,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
- #endif
persistant_default_layer_set(1UL<<_QWERTY);
}
return false;