Update to work with the latest Kaleidoscope

Updated the Makefile, the example, and LED-Wavepool.cpp to work with the latest
Kaleidoscope.

Signed-off-by: Gergely Nagy <algernon@keyboard.io>
pull/510/head
Gergely Nagy 6 years ago
parent 4d58d3e6a3
commit 00a48d5280
No known key found for this signature in database
GPG Key ID: AC1E90BAC433F68F

@ -1,13 +1,14 @@
# This stub makefile for a Kaleidoscope plugin pulls in # This stub makefile for a Kaleidoscope plugin pulls in
# all targets from the Kaleidoscope-Plugin library # all targets from the Kaleidoscope-Plugin library
MAKEFILE_PREFIX=keyboardio/avr/libraries/Kaleidoscope-Plugin/build
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
BOARD_HARDWARE_PATH ?= $(HOME)/Documents/Arduino/hardware SKETCHBOOK_DIR ?= $(HOME)/Documents/Arduino/
else else
BOARD_HARDWARE_PATH ?= $(HOME)/Arduino/hardware SKETCHBOOK_DIR ?= $(HOME)/Arduino
endif endif
include $(BOARD_HARDWARE_PATH)/$(MAKEFILE_PREFIX)/rules.mk BOARD_HARDWARE_PATH ?= $(SKETCHBOOK_DIR)/hardware
KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR ?= keyboardio/avr/build-tools/makefiles/
include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk

@ -17,8 +17,8 @@
*/ */
#include <Kaleidoscope.h> #include <Kaleidoscope.h>
#include <Kaleidoscope-LEDControl.h>
#include <Kaleidoscope-LED-Wavepool.h> #include <Kaleidoscope-LED-Wavepool.h>
#include "LED-Off.h"
const Key keymaps[][ROWS][COLS] PROGMEM = { const Key keymaps[][ROWS][COLS] PROGMEM = {
[0] = KEYMAP_STACKED [0] = KEYMAP_STACKED
@ -40,9 +40,13 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
Key_NoKey), Key_NoKey),
}; };
void setup() { KALEIDOSCOPE_INIT_PLUGINS(
Kaleidoscope.use(&LEDOff, &WavepoolEffect); LEDControl,
LEDOff,
WavepoolEffect
);
void setup() {
Kaleidoscope.setup(); Kaleidoscope.setup();
WavepoolEffect.idle_timeout = 5000; // 5 seconds WavepoolEffect.idle_timeout = 5000; // 5 seconds

@ -17,7 +17,6 @@
*/ */
#include <Kaleidoscope-LED-Wavepool.h> #include <Kaleidoscope-LED-Wavepool.h>
#include <LEDUtils.h>
namespace kaleidoscope { namespace kaleidoscope {

Loading…
Cancel
Save