1
0
Fork 0

Make arm_atsam led matrix circular animation circular rather than obloid

This commit is contained in:
Ian O'Dea 2019-01-07 10:20:15 -06:00
parent d55dc9b816
commit 9f3afae5d1
2 changed files with 4 additions and 1 deletions

View file

@ -218,6 +218,7 @@ void disp_calc_extents(void)
disp.width = disp.right - disp.left; disp.width = disp.right - disp.left;
disp.height = disp.top - disp.bottom; disp.height = disp.top - disp.bottom;
disp.max_distance = sqrtf(powf(disp.width, 2) + powf(disp.height, 2));
} }
void disp_pixel_setup(void) void disp_pixel_setup(void)
@ -267,6 +268,7 @@ void led_matrix_run(void)
float go; float go;
float bo; float bo;
float po; float po;
uint8_t led_this_run = 0; uint8_t led_this_run = 0;
led_setup_t *f = (led_setup_t*)led_setups[led_animation_id]; led_setup_t *f = (led_setup_t*)led_setups[led_animation_id];
@ -330,7 +332,7 @@ void led_matrix_run(void)
{ {
if (led_animation_circular) { if (led_animation_circular) {
po = sqrtf((powf(fabsf(50 - led_cur->py), 2) + powf(fabsf(50 - led_cur->px), 2))); po = sqrtf((powf(fabsf((disp.width / 2) - (led_cur->x - disp.left)), 2) + powf(fabsf((disp.height / 2) - (led_cur->y - disp.bottom)), 2))) / disp.max_distance * 100;
} }
else { else {
if (led_animation_orientation) if (led_animation_orientation)

View file

@ -83,6 +83,7 @@ typedef struct led_disp_s {
float bottom; float bottom;
float width; float width;
float height; float height;
float max_distance;
} led_disp_t; } led_disp_t;
uint8_t led_matrix_init(void); uint8_t led_matrix_init(void);