implemented shell in application,

improved logging of multisplitflap
main
Jonas Arnold 4 years ago
parent fbf20eda5f
commit 9aa6aaa1ef
  1. 20
      ADIS_tinyK22_SplitFlap/source/application.c
  2. 8
      ADIS_tinyK22_SplitFlap/source/multi-splitflap.c

@ -16,6 +16,7 @@
#include "splitflap.h" #include "splitflap.h"
#include "multi-splitflap.h" #include "multi-splitflap.h"
#include "McuLog.h" #include "McuLog.h"
#include "shell.h"
/* blue led pins */ /* blue led pins */
#define LED_BLUE_GPIO GPIOC #define LED_BLUE_GPIO GPIOC
@ -67,6 +68,25 @@ static void App_Task(void* pv){
((SF_t*)splitflap1)->state = SF_STATE_READY; ((SF_t*)splitflap1)->state = SF_STATE_READY;
#endif #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 // wait before moving
vTaskDelay(pdMS_TO_TICKS(2000)); vTaskDelay(pdMS_TO_TICKS(2000));

@ -42,9 +42,9 @@ void MultiSplitFlap_Deinit(void){
/* PUBLIC FUNCTIONS */ /* PUBLIC FUNCTIONS */
/**********************/ /**********************/
void MultiSplitFlap_AddFlap(SF_Handle_t splitflap){ 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); 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++; addedFlaps++;
} }
@ -92,7 +92,7 @@ bool MultiSplitFlap_Display(char sentence[]){
char letter_move[] = " "; char letter_move[] = " ";
letter_move[0] = letter; letter_move[0] = letter;
SF_MoveToFlapAsync(sfHandle, letter_move); 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 vTaskDelay(pdMS_TO_TICKS(100)); // delay loop
} }
@ -150,7 +150,7 @@ void initFlapKeys(uint8_t numberOfFlaps){
flapKeys[i] = pvPortMalloc(sizeof(BYTES_PER_KEY)); flapKeys[i] = pvPortMalloc(sizeof(BYTES_PER_KEY));
#else #else
if((flapKeys[i] = malloc(BYTES_PER_KEY)) == NULL){ 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); sprintf(flapKeys[i], "%i", i);
#endif #endif

Loading…
Cancel
Save