From 00225b77e54fdc893f6c64768e1bffaa01df5849 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Mon, 9 Sep 2019 21:57:45 -0700
Subject: [Keyboard] Waldo RGB Enable (#6711)
* enable rgb animations
* clean up code
---
keyboards/waldo/config.h | 19 +++++++++++--------
keyboards/waldo/rules.mk | 33 ---------------------------------
2 files changed, 11 insertions(+), 41 deletions(-)
(limited to 'keyboards/waldo')
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index c913ae7712..c3272bf1da 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -36,16 +36,12 @@ along with this program. If not, see .
#define UNUSED_PINS
#define BACKLIGHT_PIN B7
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
@@ -73,5 +69,12 @@ along with this program. If not, see .
//#define NO_ACTION_FUNCTION
// RGB LED
-#define RGB_DI_PIN B0 // The pin the LED strip is connected to
-#define RGBLED_NUM 10 // Number of LEDs in your strip
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 10
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
+#endif
\ No newline at end of file
diff --git a/keyboards/waldo/rules.mk b/keyboards/waldo/rules.mk
index 40ac48474e..6b3a9b96cc 100644
--- a/keyboards/waldo/rules.mk
+++ b/keyboards/waldo/rules.mk
@@ -1,45 +1,12 @@
# MCU name
MCU = atmega32u4
-# Processor frequency.
-# This will define a symbol, F_CPU, in all source code files equal to the
-# processor frequency in Hz. You can then use this symbol in your source code to
-# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-# automatically to create a 32-bit value in your source code.
-#
-# This will be an integer division of F_USB below, as it is sourced by
-# F_USB after it has run through any CPU prescalers. Note that this value
-# does not *change* the processor frequency - it should merely be updated to
-# reflect the processor speed set externally so that the code can use accurate
-# software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-# This will define a symbol, F_USB, in all source code files equal to the
-# input clock frequency (before any prescaling is performed) in Hz. This value may
-# differ from F_CPU if prescaling is used on the latter, and is required as the
-# raw input clock is fed directly to the PLL sections of the AVR for high speed
-# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-# at the end, this will be done automatically to create a 32-bit value in your
-# source code.
-#
-# If no clock division is performed on the input clock inside the AVR (via the
-# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
BOOTLOADER = atmel-dfu
-
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
--
cgit v1.2.3
From b47c10bf6f152d7a5c35fc4f7478aa69e91fb081 Mon Sep 17 00:00:00 2001
From: fauxpark
Date: Wed, 30 Oct 2019 15:27:25 +1100
Subject: Cleanup rules.mk for 32U4 keyboards, T-Z (#7190)
* Cleanup rules.mk for 32U4 keyboards, T-Z
* Use atmel-dfu in place of lufa-ms until it exists
---
keyboards/waldo/keymaps/default/rules.mk | 0
keyboards/waldo/keymaps/default_split_shft_bck/rules.mk | 0
keyboards/waldo/rules.mk | 15 ++++++++-------
3 files changed, 8 insertions(+), 7 deletions(-)
delete mode 100644 keyboards/waldo/keymaps/default/rules.mk
delete mode 100644 keyboards/waldo/keymaps/default_split_shft_bck/rules.mk
(limited to 'keyboards/waldo')
diff --git a/keyboards/waldo/keymaps/default/rules.mk b/keyboards/waldo/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/waldo/keymaps/default_split_shft_bck/rules.mk b/keyboards/waldo/keymaps/default_split_shft_bck/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/waldo/rules.mk b/keyboards/waldo/rules.mk
index 6b3a9b96cc..c174a9eb96 100644
--- a/keyboards/waldo/rules.mk
+++ b/keyboards/waldo/rules.mk
@@ -1,15 +1,16 @@
# MCU name
MCU = atmega32u4
-# Bootloader
-# This definition is optional, and if your keyboard supports multiple bootloaders of
-# different sizes, comment this out, and the correct address will be loaded
-# automatically (+60). See bootloader.mk for all options.
+# Bootloader selection
+# Teensy halfkay
+# Pro Micro caterina
+# Atmel DFU atmel-dfu
+# LUFA DFU lufa-dfu
+# QMK DFU qmk-dfu
+# ATmega32A bootloadHID
+# ATmega328P USBasp
BOOTLOADER = atmel-dfu
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
# Build Options
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
--
cgit v1.2.3
From e6b9980bd45c186f7360df68c24b6e05a80c10dc Mon Sep 17 00:00:00 2001
From: Drashna Jaelre
Date: Wed, 20 Nov 2019 14:31:36 -0800
Subject: Remove keymap_config extern from default keymaps (#7399)
* Remove keymap_config extern from default keymaps
* Revert unicode
Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :(
Co-Authored-By: fauxpark
---
keyboards/waldo/keymaps/default/keymap.c | 1 -
1 file changed, 1 deletion(-)
(limited to 'keyboards/waldo')
diff --git a/keyboards/waldo/keymaps/default/keymap.c b/keyboards/waldo/keymaps/default/keymap.c
index 2fcb3a1afb..f8041a3f85 100644
--- a/keyboards/waldo/keymaps/default/keymap.c
+++ b/keyboards/waldo/keymaps/default/keymap.c
@@ -16,7 +16,6 @@
#include QMK_KEYBOARD_H
-extern keymap_config_t keymap_config;
enum waldo_layers {
_BASE,
--
cgit v1.2.3