local control working

3 files changed, 21 insertions, 18 deletions

diff --git a/project/Core/Src/Project/local_control.c b/project/Core/Src/Project/local_control.c
index 5957e1a..c151226 100644
--- a/project/Core/Src/Project/local_control.c
+++ b/project/Core/Src/Project/local_control.c
@@ -12,11 +12,11 @@
 #include "GPIO.h"
 #include "project.h"
 #include "systick.h"
+#include "player_actions.h"
 
-int click_count = 0;
-uint32_t last_press = 0;
-uint32_t time_down = 0;
-int hold_pending = 0;
+static int click_count = 0;
+static uint32_t last_press = 0;
+static int hold_pending = 0;
 
 void handle_press(int pressed);
 
@@ -33,17 +33,23 @@ void local_control_init() {
  */
 void local_control_loop() {
 	uint32_t now = systick_get_count();
+
 	if (hold_pending) {
 		hold_pending = 0;
-		printf("Hold click action\r\n");
+		player_stop();
 	}
-	if (now - last_press > 10000) {
+	if (last_press && now - last_press > 1000) {
 		last_press = 0;
 		switch(click_count) {
 		case 1:
-			printf("Single click action\r\n"); break;
+			if (player_get_state() == PLAYING_STATE) {
+				player_pause();
+			} else {
+				player_play();
+			}
+			break;
 		case 2:
-			printf("Double click action\r\n"); break;
+			player_next(); break;
 		}
 		click_count = 0;
 	}
@@ -71,23 +77,21 @@ void EXTI9_5_IRQHandler() {
 
 /**
  * Logs button information
+ * @param pressed 1 if the button was just pressed, 0 if the button was just released
  */
 void handle_press(int pressed) {
+	static uint32_t time_down = 0;
 	uint32_t now = systick_get_count();
+
 	if (pressed) {
 		time_down = now;
 	} else {
-//		printf("now: %i, time_down: %i diff: %i\r\n", now, time_down, now - time_down);
-		if (/*(now - time_down) < 10 ||*/ !time_down) {
-			printf("ignored\r\n");
-//			printf("now: %i, time_down: %i diff: %i\r\n", now, time_down, now - time_down);
-		} else if ((now - time_down) < 10000) {
-//			printf("SHORT PRESS\r\n");
+		putchar(0); // I don't know why but without this it bounces
+		if ((now - time_down) < 1000) {
 			time_down = 0;
 			last_press = now;
 			click_count++;
 		} else {
-//			printf("LONG PRESS\r\n");
 			hold_pending = 1;
 			time_down = 0;
 		}
diff --git a/project/Core/Src/Project/player_actions.c b/project/Core/Src/Project/player_actions.c
index 2fe1732..72b8801 100644
--- a/project/Core/Src/Project/player_actions.c
+++ b/project/Core/Src/Project/player_actions.c
@@ -12,7 +12,6 @@
 #include "song_info.h"
 #include "song.h"
 #include "LED.h"
-#include "systick.h"
 
 static uint8_t state = STOPPED_STATE;
 
@@ -76,7 +75,6 @@ void player_play() {
  */
 void player_pause() {
 	state = PAUSED_STATE;
-	init_systick();
 }
 
 /**
diff --git a/project/Core/Src/Project/project.c b/project/Core/Src/Project/project.c
index 1bb685b..169a5fb 100644
--- a/project/Core/Src/Project/project.c
+++ b/project/Core/Src/Project/project.c
@@ -16,6 +16,7 @@
 #include "remote_control.h"
 #include "GPIO.h"
 #include "project.h"
+#include "systick.h"
 
 static uint8_t mode = REMOTE_MODE;
 
@@ -30,7 +31,7 @@ uint8_t project_get_mode() {
  * Runs the project
  */
 void project_run() {
-	HAL_Init();
+	init_systick();
 	local_control_init();
 	remote_control_init();