added number of rounds specifier for matrix, updated default profiles
This commit is contained in:
parent
d738d36c16
commit
ceffdd6bbf
|
@ -18,7 +18,8 @@ comment "Animations"
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
dep_bool_menu "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT
|
dep_bool_menu "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT
|
||||||
int "Number of streamers" STREAMER_NUM 30
|
int "Number of streamers" MATRIX_STREAMER_NUM 30
|
||||||
|
int "Run for this number of rounds" MATRIX_CYCLES 500
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT
|
dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT
|
||||||
|
|
|
@ -5,6 +5,12 @@
|
||||||
#include "../pixel.h"
|
#include "../pixel.h"
|
||||||
#include "../util.h"
|
#include "../util.h"
|
||||||
|
|
||||||
|
#ifndef MATRIX_CYCLES
|
||||||
|
#define MATRIX_CYCLES 500
|
||||||
|
#endif
|
||||||
|
#ifndef MATRIX_STREAMER_NUM
|
||||||
|
#define MATRIX_STREAMER_NUM 30
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct{
|
typedef struct{
|
||||||
pixel start;
|
pixel start;
|
||||||
|
@ -31,8 +37,8 @@ inline static void set_bright(pixel_matrix_t *matrix, uint8_t x, uint8_t y, uint
|
||||||
}
|
}
|
||||||
|
|
||||||
void matrix() {
|
void matrix() {
|
||||||
unsigned int counter = 500; /* run 500 cycles */
|
unsigned int counter = MATRIX_CYCLES;
|
||||||
streamer streamers[STREAMER_NUM];
|
streamer streamers[MATRIX_STREAMER_NUM];
|
||||||
pixel_matrix_t matrix_bright;
|
pixel_matrix_t matrix_bright;
|
||||||
unsigned char x, y;
|
unsigned char x, y;
|
||||||
unsigned char index = 0;
|
unsigned char index = 0;
|
||||||
|
@ -80,7 +86,7 @@ void matrix() {
|
||||||
|
|
||||||
unsigned char nsc;
|
unsigned char nsc;
|
||||||
for(nsc=0;nsc<6;nsc++){
|
for(nsc=0;nsc<6;nsc++){
|
||||||
if(streamer_num<STREAMER_NUM){
|
if(streamer_num<MATRIX_STREAMER_NUM){
|
||||||
unsigned char sy = random8()%(2*NUM_ROWS);
|
unsigned char sy = random8()%(2*NUM_ROWS);
|
||||||
if (sy>NUM_ROWS-1) sy=0;
|
if (sy>NUM_ROWS-1) sy=0;
|
||||||
streamers[streamer_num] = (streamer){{random8()%NUM_COLS, sy}, 0, (random8()%8)+12, index++,(random8()%16)+3};
|
streamers[streamer_num] = (streamer){{random8()%NUM_COLS, sy}, 0, (random8()%8)+12, index++,(random8()%16)+3};
|
||||||
|
|
|
@ -83,11 +83,14 @@ FEUER_N=5
|
||||||
FEUER_DIV=44
|
FEUER_DIV=44
|
||||||
FEUER_DELAY=50
|
FEUER_DELAY=50
|
||||||
ANIMATION_MATRIX=y
|
ANIMATION_MATRIX=y
|
||||||
STREAMER_NUM=30
|
MATRIX_STREAMER_NUM=30
|
||||||
|
MATRIX_CYCLES=500
|
||||||
ANIMATION_RANDOM_BRIGHT=y
|
ANIMATION_RANDOM_BRIGHT=y
|
||||||
# ANIMATION_STONEFLY is not set
|
# ANIMATION_STONEFLY is not set
|
||||||
# ANIMATION_FLYINGDOTS is not set
|
# ANIMATION_FLYINGDOTS is not set
|
||||||
ANIMATION_GAMEOFLIFE=y
|
ANIMATION_GAMEOFLIFE=y
|
||||||
|
GOL_DELAY=30
|
||||||
|
GOL_CYCLES=180
|
||||||
# ANIMATION_BREAKOUT is not set
|
# ANIMATION_BREAKOUT is not set
|
||||||
# ANIMATION_MHERWEG is not set
|
# ANIMATION_MHERWEG is not set
|
||||||
# ANIMATION_LTN_ANT is not set
|
# ANIMATION_LTN_ANT is not set
|
||||||
|
|
|
@ -80,6 +80,8 @@ ANIMATION_RANDOM_BRIGHT=y
|
||||||
# ANIMATION_STONEFLY is not set
|
# ANIMATION_STONEFLY is not set
|
||||||
# ANIMATION_FLYINGDOTS is not set
|
# ANIMATION_FLYINGDOTS is not set
|
||||||
ANIMATION_GAMEOFLIFE=y
|
ANIMATION_GAMEOFLIFE=y
|
||||||
|
GOL_DELAY=30
|
||||||
|
GOL_CYCLES=180
|
||||||
# ANIMATION_BREAKOUT is not set
|
# ANIMATION_BREAKOUT is not set
|
||||||
# ANIMATION_MHERWEG is not set
|
# ANIMATION_MHERWEG is not set
|
||||||
# ANIMATION_LTN_ANT is not set
|
# ANIMATION_LTN_ANT is not set
|
||||||
|
|
Loading…
Reference in New Issue