From 9aa6aaa1efcd46f75b2d550be39209325edfa2da Mon Sep 17 00:00:00 2001
From: Jonas Arnold <jonas.arnold@live.de>
Date: Fri, 21 Oct 2022 14:21:03 +0200
Subject: [PATCH] implemented shell in application, improved logging of
 multisplitflap

---
 ADIS_tinyK22_SplitFlap/source/application.c   | 20 +++++++++++++++++++
 .../source/multi-splitflap.c                  |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ADIS_tinyK22_SplitFlap/source/application.c b/ADIS_tinyK22_SplitFlap/source/application.c
index f03530e..807c063 100644
--- a/ADIS_tinyK22_SplitFlap/source/application.c
+++ b/ADIS_tinyK22_SplitFlap/source/application.c
@@ -16,6 +16,7 @@
 #include "splitflap.h"
 #include "multi-splitflap.h"
 #include "McuLog.h"
+#include "shell.h"
 
 /* blue led pins */
 #define LED_BLUE_GPIO GPIOC
@@ -67,6 +68,25 @@ static void App_Task(void* pv){
 	((SF_t*)splitflap1)->state = SF_STATE_READY;
 #endif
 
+	QueueHandle_t cmdQueueHandle = SHELL_GetShellCmdQueueHandle();;
+	Shell_cmd_s cmd;
+
+	while(1){
+		// if queue recieved something
+		if(xQueueReceive(cmdQueueHandle, &cmd, pdMS_TO_TICKS(20)) == pdPASS){
+			switch (cmd.shellCmd) {
+				case Shell_Identify_SF:
+				case Shell_Powerof_rpi:
+				default:
+					McuLog_error("Not implemented command recieved in App_Task. Command Id was <%i>", (int)cmd.shellCmd);
+					break;
+			}
+		}
+
+		vTaskDelay(pdMS_TO_TICKS(20));
+	}
+
+
 	// wait before moving
 	vTaskDelay(pdMS_TO_TICKS(2000));
 
diff --git a/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c b/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c
index 11551ad..f78f481 100644
--- a/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c
+++ b/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c
@@ -42,9 +42,9 @@ void MultiSplitFlap_Deinit(void){
 /* PUBLIC FUNCTIONS   */
 /**********************/
 void MultiSplitFlap_AddFlap(SF_Handle_t splitflap){
-	McuLog_info("Adding split flap to multi splitflap combination...\n");
+	McuLog_info("Adding split flap to multi splitflap combination...");
 	addItem(flapDict, flapKeys[addedFlaps], (SF_Handle_t*)splitflap);
-	McuLog_info("Added flap nr. %i/%i.\n", addedFlaps+1, NUM_FLAPS);
+	McuLog_info("Added flap nr. %i/%i.", addedFlaps+1, NUM_FLAPS);
 	addedFlaps++;
 }
 
@@ -92,7 +92,7 @@ bool MultiSplitFlap_Display(char sentence[]){
 		char letter_move[] = " ";
 		letter_move[0] = letter;
 		SF_MoveToFlapAsync(sfHandle, letter_move);
-		McuLog_info("Multi splitflap: Commanded Flap nr. %i to letter '%c'.\n", num+1, letter);
+		McuLog_info("Multi splitflap: Commanded Flap nr. %i to letter '%c'.", num+1, letter);
 		vTaskDelay(pdMS_TO_TICKS(100)); // delay loop
 	}
 
@@ -150,7 +150,7 @@ void initFlapKeys(uint8_t numberOfFlaps){
 		flapKeys[i] = pvPortMalloc(sizeof(BYTES_PER_KEY));
 #else
 		if((flapKeys[i] = malloc(BYTES_PER_KEY)) == NULL){
-			McuLog_error("Reserving memory for flap num. %i failed!:\n", i);
+			McuLog_error("Reserving memory for flap num. %i failed!:", i);
 		}
 		sprintf(flapKeys[i], "%i", i);
 #endif