diff options
author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
---|---|---|
committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
tree | b7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/ergodash/mini/keymaps/default/config.h | |
parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) | |
download | firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.tar.gz firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.tar.bz2 firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.zip |
resolved conflicts
Diffstat (limited to 'keyboards/ergodash/mini/keymaps/default/config.h')
-rw-r--r-- | keyboards/ergodash/mini/keymaps/default/config.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/keyboards/ergodash/mini/keymaps/default/config.h b/keyboards/ergodash/mini/keymaps/default/config.h index a5a722fb2..df04873a9 100644 --- a/keyboards/ergodash/mini/keymaps/default/config.h +++ b/keyboards/ergodash/mini/keymaps/default/config.h @@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once + /* Use I2C or Serial, not both */ #define USE_SERIAL @@ -30,10 +31,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT // #define MASTER_RIGHT // #define EE_HANDS - -#undef RGBLED_NUM -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 20 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 17 |