diff options
author | AlejandroColomar <colomar.6.4.3@gmail.com> | 2019-01-15 03:06:09 +0100 |
---|---|---|
committer | AlejandroColomar <colomar.6.4.3@gmail.com> | 2019-01-15 03:06:09 +0100 |
commit | 2a7661c4d8bccb12774dbfbe6e6bf3f5d2ecbf1c (patch) | |
tree | 6fce5b8caf30867161ca367d77da95983db8fd06 | |
parent | 36d6ebbcd4eb32f32060f98d141ca350dce0169b (diff) |
Add button (exti13)
-rwxr-xr-x | src/actuators.c | 18 | ||||
m--------- | stm32l4-modules | 0 | ||||
-rwxr-xr-x | tmp/Makefile | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/actuators.c b/src/actuators.c index 1fa5dd1..680308c 100755 --- a/src/actuators.c +++ b/src/actuators.c @@ -26,6 +26,7 @@ #include "libalx/alx_math.h" + #include "stm32l4-modules/button.h" #include "stm32l4-modules/can.h" #include "stm32l4-modules/delay.h" #include "stm32l4-modules/errors.h" @@ -163,6 +164,7 @@ static int modules_init (void) { led_init(); + button_init(); if (delay_us_init()) { goto err_delay; } @@ -190,6 +192,7 @@ err_servo: err_can: delay_us_deinit(); err_delay: + button_deinit(); led_deinit(); return ERROR_NOK; @@ -213,6 +216,7 @@ static int modules_deinit (void) if (delay_us_deinit()) { status = ERROR_NOK; } + button_deinit(); led_deinit(); return status; @@ -222,20 +226,21 @@ static int proc_actuators_it (void) { while (true) { - __WFE(); -// __WFI(); +// __WFE(); + __WFI(); if (tim_timx_interrupt) { if (!proc_ref_read()) { - led_reset(); if (proc_actuators_set()) { return ERROR_NOK; } - } else { - led_set(); } tim_timx_interrupt = false; + } else if (button_interrupt) { + led_toggle(); + + button_interrupt = false; } } } @@ -247,12 +252,9 @@ static int proc_actuators_delay (void) delay_us(ACT_REFRESH_PERIOD_US); if (!proc_ref_read()) { - led_reset(); if (proc_actuators_set()) { return ERROR_NOK; } - } else { - led_set(); } } } diff --git a/stm32l4-modules b/stm32l4-modules -Subproject dd8271704fcdecbc4e44c3f790fd9efa485a6ef +Subproject 6c81a851a0df35b3a9109a343c6867a225f2bdc diff --git a/tmp/Makefile b/tmp/Makefile index a995be5..fd89f4b 100755 --- a/tmp/Makefile +++ b/tmp/Makefile @@ -98,6 +98,7 @@ CTRL_INC_DIRS = -I $(INC_DIR) \ ACT_INC_LIBALX = libalx/alx_math.h ACT_INC_MOD = \ + stm32l4-modules/button.h \ stm32l4-modules/can.h \ stm32l4-modules/delay.h \ stm32l4-modules/errors.h \ |