From 0b9952e40f12445d049e48ff4c5c08b4c5c9e725 Mon Sep 17 00:00:00 2001 From: Jonas Arnold Date: Fri, 21 Oct 2022 14:49:33 +0200 Subject: [PATCH] implemented two shell commands --- ADIS_tinyK22_SplitFlap/source/application.c | 8 ++++++++ ADIS_tinyK22_SplitFlap/source/multi-splitflap.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/ADIS_tinyK22_SplitFlap/source/application.c b/ADIS_tinyK22_SplitFlap/source/application.c index 807c063..def81fa 100644 --- a/ADIS_tinyK22_SplitFlap/source/application.c +++ b/ADIS_tinyK22_SplitFlap/source/application.c @@ -75,7 +75,15 @@ static void App_Task(void* pv){ // if queue recieved something if(xQueueReceive(cmdQueueHandle, &cmd, pdMS_TO_TICKS(20)) == pdPASS){ switch (cmd.shellCmd) { + case Shell_Init_All_SF: + MultiSplitFlap_MoveAllToZeroPosition(); + break; + case Shell_Identify_SF: + // params[0]=hwId, params[1]= setupId + MultiSplitFlap_SetHardwareIdentifier(cmd.params[1], cmd.params[0]); + break; + case Shell_Powerof_rpi: default: McuLog_error("Not implemented command recieved in App_Task. Command Id was <%i>", (int)cmd.shellCmd); diff --git a/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c b/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c index f78f481..0099817 100644 --- a/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c +++ b/ADIS_tinyK22_SplitFlap/source/multi-splitflap.c @@ -117,14 +117,17 @@ bool MultiSplitFlap_Display(char sentence[]){ bool MultiSplitFlap_SetHardwareIdentifier(SetupIdentifier_t id, HardwareIdentifier_t hwId){ // number too high (not that many split flaps can be added to the combination) if(id >= NUM_FLAPS){ + McuLog_error("MultiSplitFlap_SetHardwareIdentifier failed because splitflap with setup id <%i> cannot exist.", id); return false; } // number too high (not that many split flaps were added added to the combination) if(id >= MultiSplitFlap_GetAmountOfAddedSplitFlaps()){ + McuLog_error("MultiSplitFlap_SetHardwareIdentifier failed because splitflap with setup id <%i> was not yet added.", id); return false; } // number negative if(id < 0){ + McuLog_error("MultiSplitFlap_SetHardwareIdentifier failed because given setup id <%i> is negative.", id); return false; } @@ -132,6 +135,8 @@ bool MultiSplitFlap_SetHardwareIdentifier(SetupIdentifier_t id, HardwareIdentifi SF_Handle_t sfHandle = (SF_Handle_t)(getItem(*flapDict, flapKeys[id])); // set hardware identifier SF_SetHardwareIdentifier(sfHandle, hwId); + // log + McuLog_info("MultiSplitFlap_SetHardwareIdentifier successful. SetupId=%i HardwareId=%i.", id, hwId); return true; }