Move common visualizer keyframes into visualizer_keyframes.h
This commit is contained in:
parent
64d63ab422
commit
b7041d06ae
7 changed files with 54 additions and 12 deletions
|
@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "visualizer.h"
|
#include "visualizer.h"
|
||||||
|
#include "visualizer_keyframes.h"
|
||||||
#include "lcd_keyframes.h"
|
#include "lcd_keyframes.h"
|
||||||
#include "lcd_backlight_keyframes.h"
|
#include "lcd_backlight_keyframes.h"
|
||||||
#include "system/serial_link.h"
|
#include "system/serial_link.h"
|
||||||
|
|
|
@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "visualizer.h"
|
#include "visualizer.h"
|
||||||
|
#include "visualizer_keyframes.h"
|
||||||
#include "lcd_keyframes.h"
|
#include "lcd_keyframes.h"
|
||||||
#include "lcd_backlight_keyframes.h"
|
#include "lcd_backlight_keyframes.h"
|
||||||
#include "system/serial_link.h"
|
#include "system/serial_link.h"
|
||||||
|
|
|
@ -230,12 +230,6 @@ void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* stat
|
||||||
(*temp_animation.frame_functions[next_frame])(&temp_animation, &temp_state);
|
(*temp_animation.frame_functions[next_frame])(&temp_animation, &temp_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state) {
|
|
||||||
(void)animation;
|
|
||||||
(void)state;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Optimize the stack size, this is probably way too big
|
// TODO: Optimize the stack size, this is probably way too big
|
||||||
static DECLARE_THREAD_STACK(visualizerThreadStack, 1024);
|
static DECLARE_THREAD_STACK(visualizerThreadStack, 1024);
|
||||||
static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
|
static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
|
||||||
|
|
|
@ -34,7 +34,7 @@ SOFTWARE.
|
||||||
#include "lcd_backlight.h"
|
#include "lcd_backlight.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// use this function to merget both real_mods and oneshot_mods in a uint16_t
|
// use this function to merge both real_mods and oneshot_mods in a uint16_t
|
||||||
uint8_t visualizer_get_mods(void);
|
uint8_t visualizer_get_mods(void);
|
||||||
|
|
||||||
// This need to be called once at the start
|
// This need to be called once at the start
|
||||||
|
@ -126,10 +126,6 @@ void stop_keyframe_animation(keyframe_animation_t* animation);
|
||||||
// Useful for crossfades for example
|
// Useful for crossfades for example
|
||||||
void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* state);
|
void run_next_keyframe(keyframe_animation_t* animation, visualizer_state_t* state);
|
||||||
|
|
||||||
// Some predefined keyframe functions that can be used by the user code
|
|
||||||
// Does nothing, useful for adding delays
|
|
||||||
bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state);
|
|
||||||
|
|
||||||
// The master can set userdata which will be transferred to the slave
|
// The master can set userdata which will be transferred to the slave
|
||||||
#ifdef VISUALIZER_USER_DATA_SIZE
|
#ifdef VISUALIZER_USER_DATA_SIZE
|
||||||
void visualizer_set_user_data(void* user_data);
|
void visualizer_set_user_data(void* user_data);
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
# SOFTWARE.
|
# SOFTWARE.
|
||||||
|
|
||||||
SRC += $(VISUALIZER_DIR)/visualizer.c
|
SRC += $(VISUALIZER_DIR)/visualizer.c \
|
||||||
|
$(VISUALIZER_DIR)/visualizer_keyframes.c
|
||||||
EXTRAINCDIRS += $(GFXINC) $(VISUALIZER_DIR)
|
EXTRAINCDIRS += $(GFXINC) $(VISUALIZER_DIR)
|
||||||
GFXLIB = $(LIB_PATH)/ugfx
|
GFXLIB = $(LIB_PATH)/ugfx
|
||||||
VPATH += $(VISUALIZER_PATH)
|
VPATH += $(VISUALIZER_PATH)
|
||||||
|
|
23
quantum/visualizer/visualizer_keyframes.c
Normal file
23
quantum/visualizer/visualizer_keyframes.c
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
/* Copyright 2017 Fred Sundvik
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "visualizer_keyframes.h"
|
||||||
|
|
||||||
|
bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state) {
|
||||||
|
(void)animation;
|
||||||
|
(void)state;
|
||||||
|
return false;
|
||||||
|
}
|
26
quantum/visualizer/visualizer_keyframes.h
Normal file
26
quantum/visualizer/visualizer_keyframes.h
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
/* Copyright 2017 Fred Sundvik
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef QUANTUM_VISUALIZER_VISUALIZER_KEYFRAMES_H_
|
||||||
|
#define QUANTUM_VISUALIZER_VISUALIZER_KEYFRAMES_H_
|
||||||
|
|
||||||
|
#include "visualizer.h"
|
||||||
|
|
||||||
|
// Some predefined keyframe functions that can be used by the user code
|
||||||
|
// Does nothing, useful for adding delays
|
||||||
|
bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* state);
|
||||||
|
|
||||||
|
#endif /* QUANTUM_VISUALIZER_VISUALIZER_KEYFRAMES_H_ */
|
Loading…
Reference in a new issue