summaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorIan O'Dea <ianodea@gmail.com>2019-01-07 09:36:28 -0600
committerIan O'Dea <ianodea@gmail.com>2019-01-07 09:36:28 -0600
commitd55dc9b8168dc4582751b4d7ee4b2de3f5b4e3ab (patch)
tree4c00891aeca6bbcc39b7ae8221f9922677afcbe9 /tmk_core/protocol
parent28986998046b4dbdbc228dbb7889836de2a3ee18 (diff)
Add ability to animate arm_atsam led matrix from the center of a circle
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/arm_atsam/led_matrix.c20
-rw-r--r--tmk_core/protocol/arm_atsam/led_matrix.h1
2 files changed, 15 insertions, 6 deletions
diff --git a/tmk_core/protocol/arm_atsam/led_matrix.c b/tmk_core/protocol/arm_atsam/led_matrix.c
index e914fc80ea..3e07fbe6c3 100644
--- a/tmk_core/protocol/arm_atsam/led_matrix.c
+++ b/tmk_core/protocol/arm_atsam/led_matrix.c
@@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "arm_atsam_protocol.h"
#include "tmk_core/common/led.h"
#include <string.h>
+#include <math.h>
void SERCOM1_0_Handler( void )
{
@@ -249,6 +250,7 @@ uint8_t led_animation_breathing;
uint8_t led_animation_breathe_cur;
uint8_t breathe_step;
uint8_t breathe_dir;
+uint8_t led_animation_circular;
uint64_t led_next_run;
uint8_t led_animation_id;
@@ -327,13 +329,18 @@ void led_matrix_run(void)
for (fcur = 0; fcur < fmax; fcur++)
{
- if (led_animation_orientation)
- {
- po = led_cur->py;
+ if (led_animation_circular) {
+ po = sqrtf((powf(fabsf(50 - led_cur->py), 2) + powf(fabsf(50 - led_cur->px), 2)));
}
- else
- {
- po = led_cur->px;
+ else {
+ if (led_animation_orientation)
+ {
+ po = led_cur->py;
+ }
+ else
+ {
+ po = led_cur->px;
+ }
}
float pomod;
@@ -466,6 +473,7 @@ uint8_t led_matrix_init(void)
led_animation_breathe_cur = BREATHE_MIN_STEP;
breathe_step = 1;
breathe_dir = 1;
+ led_animation_circular = 0;
gcr_min_counter = 0;
v_5v_cat_hit = 0;
diff --git a/tmk_core/protocol/arm_atsam/led_matrix.h b/tmk_core/protocol/arm_atsam/led_matrix.h
index cedea8a856..f0d4528348 100644
--- a/tmk_core/protocol/arm_atsam/led_matrix.h
+++ b/tmk_core/protocol/arm_atsam/led_matrix.h
@@ -129,6 +129,7 @@ extern uint8_t led_animation_orientation;
extern uint8_t led_animation_breathing;
extern uint8_t led_animation_breathe_cur;
extern uint8_t breathe_dir;
+extern uint8_t led_animation_circular;
extern const uint8_t led_setups_count;
extern void *led_setups[];