Keyboard: [Fortitude60] LED fix and Serial improvement (qmk#3982)

* arrangement Underglow * modified serial function references from helix * Remove defines (ws2812_*REG)
mil · Sep 28, 2018 · a65085a · a65085a
1 parent 8ef747a
commit a65085a
Show file tree

Hide file tree

Showing 9 changed files with 420 additions and 150 deletions.
diff --git a/keyboards/fortitude60/config.h b/keyboards/fortitude60/config.h
@@ -19,5 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CONFIG_H
 
 #include "config_common.h"
+#include <serial_config.h>
 
 #endif  // CONFIG_H
diff --git a/keyboards/fortitude60/keymaps/default/config.h b/keyboards/fortitude60/keymaps/default/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define USE_SERIAL_PD2
 /* #undef RGBLED_NUM */
 /* #define RGBLIGHT_ANIMATIONS */
 /* #define RGBLED_NUM 12 */

diff --git a/keyboards/fortitude60/keymaps/default/keymap.c b/keyboards/fortitude60/keymaps/default/keymap.c
@@ -119,9 +119,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------.             ,-----------------------------------------.
  * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
  * |------+------+------+------+------+------.             ,------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |   `  |   1  |   ↑  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
  * |------+------+------+------+------+------.             ,------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |   -  |   =  |   [  |   ]  |  |   |
+ * | Del  |   ←  |   ↓  |   →  |  F4  |  F5  |             |  F6  |   -  |   =  |   [  |   ]  |  |   |
  * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
  * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |      |  F12 |ISO # |ISO / |      |      |      |
  * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'

diff --git a/keyboards/fortitude60/keymaps/default/rules.mk b/keyboards/fortitude60/keymaps/default/rules.mk
@@ -1 +1,2 @@
 RGBLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = no
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
@@ -64,12 +64,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
 /* ws2812 RGB LED */
-/* #define RGB_DI_PIN D3 */
-/* #define RGBLIGHT_TIMER */
-/* #define RGBLED_NUM 16    // Number of LEDs */
-/* #define ws2812_PORTREG  PORTD */
-/* #define ws2812_DDRREG   DDRD */
-
+#ifdef RGBLIGHT_ENABLE
+  #define RGB_DI_PIN B5
+  #define RGBLIGHT_TIMER
+  #define RGBLED_NUM 18    // Number of LEDs */
+#endif
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

diff --git a/keyboards/fortitude60/rev1/rules.mk b/keyboards/fortitude60/rev1/rules.mk
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes