From 4df22cd86a329659481a19f2ad4d8ad727a66bf5 Mon Sep 17 00:00:00 2001 From: Marcelo Li Gonzales Date: Sat, 6 May 2023 10:59:36 -0600 Subject: [PATCH 01/18] ported SOARProto from AvionicsSoftware --- .gitmodules | 3 + Components/SoarProtocol/DMBProtocolTask.cpp | 126 ++++++++++++++++++++ Components/SoarProtocol/DMBProtocolTask.hpp | 43 +++++++ Components/SoarProtocol/SoarProto | 1 + 4 files changed, 173 insertions(+) create mode 100644 .gitmodules create mode 100644 Components/SoarProtocol/DMBProtocolTask.cpp create mode 100644 Components/SoarProtocol/DMBProtocolTask.hpp create mode 160000 Components/SoarProtocol/SoarProto diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..097ebac --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Components/SoarProtocol/SoarProto"] + path = Components/SoarProtocol/SoarProto + url = git@github.com:StudentOrganisationForAerospaceResearch/SoarProto.git diff --git a/Components/SoarProtocol/DMBProtocolTask.cpp b/Components/SoarProtocol/DMBProtocolTask.cpp new file mode 100644 index 0000000..55ac826 --- /dev/null +++ b/Components/SoarProtocol/DMBProtocolTask.cpp @@ -0,0 +1,126 @@ +/** + ****************************************************************************** + * File Name : DMBProtocolTask.hpp + * Description : Protocol task, specific to DMB + ****************************************************************************** +*/ +#include "DMBProtocolTask.hpp" + +#include "FlightTask.hpp" +#include "ReadBufferFixedSize.h" + +/** + * @brief Initialize the DMBProtocolTask + */ +void DMBProtocolTask::InitTask() +{ + // Make sure the task is not already initialized + SOAR_ASSERT(rtTaskHandle == nullptr, "Cannot initialize Protocol task twice"); + + // Start the task + BaseType_t rtValue = + xTaskCreate((TaskFunction_t)DMBProtocolTask::RunTask, + (const char*)"ProtocolTask", + (uint16_t)TASK_PROTOCOL_STACK_DEPTH_WORDS, + (void*)this, + (UBaseType_t)TASK_PROTOCOL_PRIORITY, + (TaskHandle_t*)&rtTaskHandle); + + //Ensure creation succeded + SOAR_ASSERT(rtValue == pdPASS, "ProtocolTask::InitTask - xTaskCreate() failed"); +} + +/** + * @brief Default constructor + */ +DMBProtocolTask::DMBProtocolTask() : ProtocolTask(Proto::Node::NODE_DMB) +{ +} + +/** + * @brief Handle a command message + */ +void DMBProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer) +{ + Proto::CommandMessage msg; + msg.deserialize(readBuffer); + + // Verify the source and target nodes, if they aren't as expected, do nothing + if (msg.get_source() != Proto::Node::NODE_RCU || msg.get_target() != Proto::Node::NODE_DMB) + return; + + // If the message does not have a DMB command, do nothing + if (!msg.has_dmb_command()) + return; + + SOAR_PRINT("PROTO-INFO: Received DMB Command Message"); + + // Process the db command + switch (msg.get_dmb_command().get_command_enum()) + { + case Proto::DMBCommand::Command::RSC_ANY_TO_ABORT: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ANY_TO_ABORT)); + break; + case Proto::DMBCommand::Command::RSC_OPEN_VENT: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_OPEN_VENT)); + break; + case Proto::DMBCommand::Command::RSC_CLOSE_VENT: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_CLOSE_VENT)); + break; + case Proto::DMBCommand::Command::RSC_OPEN_DRAIN: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_OPEN_DRAIN)); + break; + case Proto::DMBCommand::Command::RSC_CLOSE_DRAIN: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_CLOSE_DRAIN)); + break; + case Proto::DMBCommand::Command::RSC_MEV_CLOSE: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_MEV_CLOSE)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_FILL: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_FILL)); + break; + case Proto::DMBCommand::Command::RSC_ARM_CONFIRM_1: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ARM_CONFIRM_1)); + break; + case Proto::DMBCommand::Command::RSC_ARM_CONFIRM_2: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ARM_CONFIRM_2)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_ARM: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_ARM)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_PRELAUNCH: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_PRELAUNCH)); + break; + case Proto::DMBCommand::Command::RSC_POWER_TRANSITION_ONBOARD: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_POWER_TRANSITION_ONBOARD)); + break; + case Proto::DMBCommand::Command::RSC_POWER_TRANSITION_EXTERNAL: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_POWER_TRANSITION_EXTERNAL)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_IGNITION: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_IGNITION)); + break; + case Proto::DMBCommand::Command::RSC_IGNITION_TO_LAUNCH: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_IGNITION_TO_LAUNCH)); + break; + default: + break; + } + +} + +/** + * @brief Handle a control message + */ +void DMBProtocolTask::HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer) +{ + +} + +/** + * @brief Handle a telemetry message + */ +void DMBProtocolTask::HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer) +{ + +} diff --git a/Components/SoarProtocol/DMBProtocolTask.hpp b/Components/SoarProtocol/DMBProtocolTask.hpp new file mode 100644 index 0000000..1314280 --- /dev/null +++ b/Components/SoarProtocol/DMBProtocolTask.hpp @@ -0,0 +1,43 @@ +/** + ****************************************************************************** + * File Name : DMBProtocolTask.hpp + * Description : Protocol task, specific to DMB + ****************************************************************************** +*/ +#ifndef SOAR_DMBPROTOCOL_HPP_ +#define SOAR_DMBPROTOCOL_HPP_ +#include "ProtocolTask.hpp" +#include "Task.hpp" +#include "SystemDefines.hpp" +#include "UARTTask.hpp" + +/* Enums ------------------------------------------------------------------*/ + +/* Class ------------------------------------------------------------------*/ +class DMBProtocolTask : public ProtocolTask +{ +public: + static DMBProtocolTask& Inst() { + static DMBProtocolTask inst; + return inst; + } + + void InitTask(); + +protected: + static void RunTask(void* pvParams) { DMBProtocolTask::Inst().Run(pvParams); } // Static Task Interface, passes control to the instance Run(); + + // These handlers will receive a buffer and size corresponding to a decoded message + void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); + void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer); + void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); + + // Member variables + +private: + DMBProtocolTask(); // Private constructor + DMBProtocolTask(const DMBProtocolTask&); // Prevent copy-construction + DMBProtocolTask& operator=(const DMBProtocolTask&); // Prevent assignment +}; + +#endif // SOAR_DMBPROTOCOL_HPP_ diff --git a/Components/SoarProtocol/SoarProto b/Components/SoarProtocol/SoarProto new file mode 160000 index 0000000..7b9e5ff --- /dev/null +++ b/Components/SoarProtocol/SoarProto @@ -0,0 +1 @@ +Subproject commit 7b9e5ff9de3bdf6597c4b099f99d5177aeb3280c From 7873765cf95fb2a30ea3dcc2eccaf6bcb7ca5e31 Mon Sep 17 00:00:00 2001 From: Marcelo Li Gonzales Date: Thu, 1 Jun 2023 18:43:47 -0600 Subject: [PATCH 02/18] port RCUProtocolTask --- .settings/language.settings.xml | 4 +- Components/Core/Inc/Command.hpp.orig | 82 ------------- Components/SoarDebug/DebugTask.cpp | 2 + Components/SoarProtocol/DMBProtocolTask.cpp | 126 -------------------- Components/SoarProtocol/DMBProtocolTask.hpp | 43 ------- Components/SoarProtocol/SoarProto | 2 +- 6 files changed, 5 insertions(+), 254 deletions(-) delete mode 100644 Components/Core/Inc/Command.hpp.orig delete mode 100644 Components/SoarProtocol/DMBProtocolTask.cpp delete mode 100644 Components/SoarProtocol/DMBProtocolTask.hpp diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 0c5e147..9ee286a 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/Components/Core/Inc/Command.hpp.orig b/Components/Core/Inc/Command.hpp.orig deleted file mode 100644 index db6f637..0000000 --- a/Components/Core/Inc/Command.hpp.orig +++ /dev/null @@ -1,82 +0,0 @@ -/** - ****************************************************************************** - * File Name : Command.hpp - * Description : Command is a unique object used to communicate information - * to and between tasks. - ****************************************************************************** -*/ -#ifndef AVIONICS_INCLUDE_SOAR_CORE_COMMAND_H -#define AVIONICS_INCLUDE_SOAR_CORE_COMMAND_H -/* Includes ------------------------------------------------------------------*/ -#include - -#include "cmsis_os.h" - -/* Macros --------------------------------------------------------------------*/ - -/* Enums -----------------------------------------------------------------*/ -enum GLOBAL_COMMANDS : uint8_t -{ - COMMAND_NONE = 0, // No command, packet can probably be ignored - TASK_SPECIFIC_COMMAND, // Runs a task specific command when given this object - DATA_COMMAND, // Data command, used to send data to a task. Target is stored in taskCommand -<<<<<<< HEAD - REQUEST_COMMAND // Request command -======= - CONTROL_ACTION, // Control actions, used in Rocket State Machine, direct translation to RCU<->DMB Protocol ->>>>>>> 2d2f772e10fb3a9675398877e8bf01f5059d80ef -}; - -/* Class -----------------------------------------------------------------*/ - -/** - * @brief Command class - * - * Each Command object contains one set of commands, a GLOBAL_COMMANDS and a task command that can be task specific. - * - * Note, this class must be able to be treated as 'Plain-Old-Data' as it will be handled with raw-copy in RTOS queues -*/ -class Command -{ -public: - Command(void); - Command(GLOBAL_COMMANDS command); - Command(uint16_t taskCommand); - Command(GLOBAL_COMMANDS command, uint16_t taskCommand); - - //~Command(); // We can't handle memory like this, since the object would be 'destroyed' after copying to the RTOS queue - - // Functions - bool AllocateData(uint16_t dataSize); // Dynamically allocates data for the command - bool CopyDataToCommand(uint8_t* dataSrc, uint16_t size); // Copies the data into the command, into newly allocated memory - bool SetCommandToStaticExternalBuffer(uint8_t* existingPtr, uint16_t size); // Set data pointer to a pre-allocated buffer, if bFreeMemory is set to true, responsibility for freeing memory will fall on Command - - void Reset(); // Reset the command, equivalent of a destructor that must be called, counts allocations and deallocations, asserts an error if the allocation count is too high - - // Getters - uint16_t GetDataSize() const; - uint8_t* GetDataPointer() const { return data; } - GLOBAL_COMMANDS GetCommand() const { return command; } - uint16_t GetTaskCommand() const { return taskCommand; } - - // Setters - void SetTaskCommand(uint16_t taskCommand) { this->taskCommand = taskCommand; } - - -protected: - // Data -- note each insertion and removal from a queue will do a full copy of this object, so this data should be as small as possible - GLOBAL_COMMANDS command; // General GLOBAL command, each task must be able to handle these types of commands - uint16_t taskCommand; // Task specific command, the task this command event is sent to needs to handle this - - uint8_t* data; // Pointer to optional data - uint16_t dataSize; // Size of optional data - -private: - bool bShouldFreeData; // Should the Command handle freeing the data pointer (necessary to enable Command object to handle static memory ptrs) - - static std::atomic statAllocationCounter; // Static allocation counter shared by all command objects - - Command(const Command&); // Prevent copy-construction -}; - -#endif /* AVIONICS_INCLUDE_SOAR_CORE_COMMAND_H */ \ No newline at end of file diff --git a/Components/SoarDebug/DebugTask.cpp b/Components/SoarDebug/DebugTask.cpp index 15ecc2d..a29554e 100644 --- a/Components/SoarDebug/DebugTask.cpp +++ b/Components/SoarDebug/DebugTask.cpp @@ -36,6 +36,8 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef* huart) { if (huart->Instance == SystemHandles::UART_Debug->Instance) DebugTask::Inst().InterruptRxData(); + else if (huart->Instance == SystemHandles::UART_Protocol->Instance) + RCUProtocolTask::Inst().InterruptRxData(); } /* Functions -----------------------------------------------------------------*/ diff --git a/Components/SoarProtocol/DMBProtocolTask.cpp b/Components/SoarProtocol/DMBProtocolTask.cpp deleted file mode 100644 index 55ac826..0000000 --- a/Components/SoarProtocol/DMBProtocolTask.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/** - ****************************************************************************** - * File Name : DMBProtocolTask.hpp - * Description : Protocol task, specific to DMB - ****************************************************************************** -*/ -#include "DMBProtocolTask.hpp" - -#include "FlightTask.hpp" -#include "ReadBufferFixedSize.h" - -/** - * @brief Initialize the DMBProtocolTask - */ -void DMBProtocolTask::InitTask() -{ - // Make sure the task is not already initialized - SOAR_ASSERT(rtTaskHandle == nullptr, "Cannot initialize Protocol task twice"); - - // Start the task - BaseType_t rtValue = - xTaskCreate((TaskFunction_t)DMBProtocolTask::RunTask, - (const char*)"ProtocolTask", - (uint16_t)TASK_PROTOCOL_STACK_DEPTH_WORDS, - (void*)this, - (UBaseType_t)TASK_PROTOCOL_PRIORITY, - (TaskHandle_t*)&rtTaskHandle); - - //Ensure creation succeded - SOAR_ASSERT(rtValue == pdPASS, "ProtocolTask::InitTask - xTaskCreate() failed"); -} - -/** - * @brief Default constructor - */ -DMBProtocolTask::DMBProtocolTask() : ProtocolTask(Proto::Node::NODE_DMB) -{ -} - -/** - * @brief Handle a command message - */ -void DMBProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer) -{ - Proto::CommandMessage msg; - msg.deserialize(readBuffer); - - // Verify the source and target nodes, if they aren't as expected, do nothing - if (msg.get_source() != Proto::Node::NODE_RCU || msg.get_target() != Proto::Node::NODE_DMB) - return; - - // If the message does not have a DMB command, do nothing - if (!msg.has_dmb_command()) - return; - - SOAR_PRINT("PROTO-INFO: Received DMB Command Message"); - - // Process the db command - switch (msg.get_dmb_command().get_command_enum()) - { - case Proto::DMBCommand::Command::RSC_ANY_TO_ABORT: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ANY_TO_ABORT)); - break; - case Proto::DMBCommand::Command::RSC_OPEN_VENT: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_OPEN_VENT)); - break; - case Proto::DMBCommand::Command::RSC_CLOSE_VENT: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_CLOSE_VENT)); - break; - case Proto::DMBCommand::Command::RSC_OPEN_DRAIN: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_OPEN_DRAIN)); - break; - case Proto::DMBCommand::Command::RSC_CLOSE_DRAIN: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_CLOSE_DRAIN)); - break; - case Proto::DMBCommand::Command::RSC_MEV_CLOSE: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_MEV_CLOSE)); - break; - case Proto::DMBCommand::Command::RSC_GOTO_FILL: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_FILL)); - break; - case Proto::DMBCommand::Command::RSC_ARM_CONFIRM_1: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ARM_CONFIRM_1)); - break; - case Proto::DMBCommand::Command::RSC_ARM_CONFIRM_2: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ARM_CONFIRM_2)); - break; - case Proto::DMBCommand::Command::RSC_GOTO_ARM: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_ARM)); - break; - case Proto::DMBCommand::Command::RSC_GOTO_PRELAUNCH: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_PRELAUNCH)); - break; - case Proto::DMBCommand::Command::RSC_POWER_TRANSITION_ONBOARD: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_POWER_TRANSITION_ONBOARD)); - break; - case Proto::DMBCommand::Command::RSC_POWER_TRANSITION_EXTERNAL: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_POWER_TRANSITION_EXTERNAL)); - break; - case Proto::DMBCommand::Command::RSC_GOTO_IGNITION: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_IGNITION)); - break; - case Proto::DMBCommand::Command::RSC_IGNITION_TO_LAUNCH: - FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_IGNITION_TO_LAUNCH)); - break; - default: - break; - } - -} - -/** - * @brief Handle a control message - */ -void DMBProtocolTask::HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer) -{ - -} - -/** - * @brief Handle a telemetry message - */ -void DMBProtocolTask::HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer) -{ - -} diff --git a/Components/SoarProtocol/DMBProtocolTask.hpp b/Components/SoarProtocol/DMBProtocolTask.hpp deleted file mode 100644 index 1314280..0000000 --- a/Components/SoarProtocol/DMBProtocolTask.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - ****************************************************************************** - * File Name : DMBProtocolTask.hpp - * Description : Protocol task, specific to DMB - ****************************************************************************** -*/ -#ifndef SOAR_DMBPROTOCOL_HPP_ -#define SOAR_DMBPROTOCOL_HPP_ -#include "ProtocolTask.hpp" -#include "Task.hpp" -#include "SystemDefines.hpp" -#include "UARTTask.hpp" - -/* Enums ------------------------------------------------------------------*/ - -/* Class ------------------------------------------------------------------*/ -class DMBProtocolTask : public ProtocolTask -{ -public: - static DMBProtocolTask& Inst() { - static DMBProtocolTask inst; - return inst; - } - - void InitTask(); - -protected: - static void RunTask(void* pvParams) { DMBProtocolTask::Inst().Run(pvParams); } // Static Task Interface, passes control to the instance Run(); - - // These handlers will receive a buffer and size corresponding to a decoded message - void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); - void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer); - void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); - - // Member variables - -private: - DMBProtocolTask(); // Private constructor - DMBProtocolTask(const DMBProtocolTask&); // Prevent copy-construction - DMBProtocolTask& operator=(const DMBProtocolTask&); // Prevent assignment -}; - -#endif // SOAR_DMBPROTOCOL_HPP_ diff --git a/Components/SoarProtocol/SoarProto b/Components/SoarProtocol/SoarProto index 7b9e5ff..f190bdd 160000 --- a/Components/SoarProtocol/SoarProto +++ b/Components/SoarProtocol/SoarProto @@ -1 +1 @@ -Subproject commit 7b9e5ff9de3bdf6597c4b099f99d5177aeb3280c +Subproject commit f190bddf5cf9df9318a724169c8d4bdd05dc0def From 3724f0edc9495d3937885a5008e6384cc2e6d5ab Mon Sep 17 00:00:00 2001 From: Marcelo Li Gonzales Date: Thu, 1 Jun 2023 18:44:15 -0600 Subject: [PATCH 03/18] actually port protocol task --- Components/SoarProtocol/RCUProtocolTask.cpp | 125 ++++++++++++++++++++ Components/SoarProtocol/RCUProtocolTask.hpp | 43 +++++++ 2 files changed, 168 insertions(+) create mode 100644 Components/SoarProtocol/RCUProtocolTask.cpp create mode 100644 Components/SoarProtocol/RCUProtocolTask.hpp diff --git a/Components/SoarProtocol/RCUProtocolTask.cpp b/Components/SoarProtocol/RCUProtocolTask.cpp new file mode 100644 index 0000000..8104b0f --- /dev/null +++ b/Components/SoarProtocol/RCUProtocolTask.cpp @@ -0,0 +1,125 @@ +/** + ****************************************************************************** + * File Name : RCUProtocolTask.hpp + * Description : Protocol task, specific to RCU + ****************************************************************************** +*/ +#include +#include "FlightTask.hpp" +#include "ReadBufferFixedSize.h" + +/** + * @brief Initialize the RCUProtocolTask + */ +void RCUProtocolTask::InitTask() +{ + // Make sure the task is not already initialized + SOAR_ASSERT(rtTaskHandle == nullptr, "Cannot initialize Protocol task twice"); + + // Start the task + BaseType_t rtValue = + xTaskCreate((TaskFunction_t)RCUProtocolTask::RunTask, + (const char*)"ProtocolTask", + (uint16_t)TASK_PROTOCOL_STACK_DEPTH_WORDS, + (void*)this, + (UBaseType_t)TASK_PROTOCOL_PRIORITY, + (TaskHandle_t*)&rtTaskHandle); + + //Ensure creation succeded + SOAR_ASSERT(rtValue == pdPASS, "ProtocolTask::InitTask - xTaskCreate() failed"); +} + +/** + * @brief Default constructor + */ +RCUProtocolTask::RCUProtocolTask() : ProtocolTask(Proto::Node::NODE_RCU) +{ +} + +/** + * @brief Handle a command message + */ +void RCUProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer) +{ + Proto::CommandMessage msg; + msg.deserialize(readBuffer); + + // Verify the source and target nodes, echo it if it does not have RCU as the target + if (msg.get_source() != Proto::Node::NODE_RCU || msg.get_target() != Proto::Node::NODE_RCU) + return; + + // If the message does not have a RCU command, do nothing + if (!msg.has_rcu_command()) + return; + + SOAR_PRINT("PROTO-INFO: Received RCU Command Message"); + + // Process the db command + switch (msg.get_rcu_command().get_command_enum()) + { + case Proto::DMBCommand::Command::RSC_ANY_TO_ABORT: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ANY_TO_ABORT)); + break; + case Proto::DMBCommand::Command::RSC_OPEN_VENT: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_OPEN_VENT)); + break; + case Proto::DMBCommand::Command::RSC_CLOSE_VENT: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_CLOSE_VENT)); + break; + case Proto::DMBCommand::Command::RSC_OPEN_DRAIN: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_OPEN_DRAIN)); + break; + case Proto::DMBCommand::Command::RSC_CLOSE_DRAIN: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_CLOSE_DRAIN)); + break; + case Proto::DMBCommand::Command::RSC_MEV_CLOSE: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_MEV_CLOSE)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_FILL: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_FILL)); + break; + case Proto::DMBCommand::Command::RSC_ARM_CONFIRM_1: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ARM_CONFIRM_1)); + break; + case Proto::DMBCommand::Command::RSC_ARM_CONFIRM_2: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_ARM_CONFIRM_2)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_ARM: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_ARM)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_PRELAUNCH: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_PRELAUNCH)); + break; + case Proto::DMBCommand::Command::RSC_POWER_TRANSITION_ONBOARD: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_POWER_TRANSITION_ONBOARD)); + break; + case Proto::DMBCommand::Command::RSC_POWER_TRANSITION_EXTERNAL: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_POWER_TRANSITION_EXTERNAL)); + break; + case Proto::DMBCommand::Command::RSC_GOTO_IGNITION: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_GOTO_IGNITION)); + break; + case Proto::DMBCommand::Command::RSC_IGNITION_TO_LAUNCH: + FlightTask::Inst().SendCommand(Command(CONTROL_ACTION, (uint16_t)RSC_IGNITION_TO_LAUNCH)); + break; + default: + break; + } + +} + +/** + * @brief Handle a control message + */ +void RCUProtocolTask::HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer) +{ + +} + +/** + * @brief Handle a telemetry message + */ +void RCUProtocolTask::HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer) +{ + +} diff --git a/Components/SoarProtocol/RCUProtocolTask.hpp b/Components/SoarProtocol/RCUProtocolTask.hpp new file mode 100644 index 0000000..b51457b --- /dev/null +++ b/Components/SoarProtocol/RCUProtocolTask.hpp @@ -0,0 +1,43 @@ +/** + ****************************************************************************** + * File Name : RCUProtocolTask.hpp + * Description : Protocol task, specific to RCU + ****************************************************************************** +*/ +#ifndef SOAR_RCUPROTOCOL_HPP_ +#define SOAR_RCUPROTOCOL_HPP_ +#include "ProtocolTask.hpp" +#include "Task.hpp" +#include "SystemDefines.hpp" +#include "UARTTask.hpp" + +/* Enums ------------------------------------------------------------------*/ + +/* Class ------------------------------------------------------------------*/ +class RCUProtocolTask : public ProtocolTask +{ +public: + static RCUProtocolTask& Inst() { + static RCUProtocolTask inst; + return inst; + } + + void InitTask(); + +protected: + static void RunTask(void* pvParams) { RCUProtocolTask::Inst().Run(pvParams); } // Static Task Interface, passes control to the instance Run(); + + // These handlers will receive a buffer and size corresponding to a decoded message + void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); + void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer); + void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); + + // Member variables + +private: + RCUProtocolTask(); // Private constructor + RCUProtocolTask(const RCUProtocolTask&); // Prevent copy-construction + RCUProtocolTask& operator=(const RCUProtocolTask&); // Prevent assignment +}; + +#endif // SOAR_RCUPROTOCOL_HPP_ From 7d5d6cc55a2975a976e0f5ae8d2f01fb5267eb45 Mon Sep 17 00:00:00 2001 From: MarceloLiGonzales Date: Thu, 1 Jun 2023 19:20:27 -0600 Subject: [PATCH 04/18] changed PI UART to use 115200 baud rate and 8 bit words --- .cproject | 6 ++++-- .settings/language.settings.xml | 4 ++-- .settings/stm32cubeide.project.prefs | 2 +- Components/Communication/Inc/UARTTask.hpp | 6 +++++- Components/Communication/UARTTask.cpp | 12 ++++++++++++ Core/Src/main.c | 4 ++-- RCU-STM.ioc | 8 ++++++++ STM32L431RBTX_FLASH.ld | 4 ++-- 8 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.cproject b/.cproject index debe4aa..8bb54c8 100644 --- a/.cproject +++ b/.cproject @@ -23,7 +23,8 @@ @@ -211,6 +236,11 @@ + + + + + @@ -233,10 +263,10 @@ - + - + diff --git a/.gitignore b/.gitignore index 698e13b..81e3c08 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ # Executables build/ +Debug/* *.exe *.out *.app diff --git a/.settings/stm32cubeide.project.prefs b/.settings/stm32cubeide.project.prefs index 248345a..9133943 100644 --- a/.settings/stm32cubeide.project.prefs +++ b/.settings/stm32cubeide.project.prefs @@ -1,4 +1,4 @@ 66BE74F758C12D739921AEA421D593D3=0 -8DF89ED150041C4CBC7CB9A9CAA90856=20DC75955B86F89F3643A2AE9216343C +8DF89ED150041C4CBC7CB9A9CAA90856=FC9055A67881517C9FBBF9ADE1A1E100 DC22A860405A8BF2F2C095E5B6529F12=FC9055A67881517C9FBBF9ADE1A1E100 eclipse.preferences.version=1 diff --git a/Components/SoarDebug/DebugTask.cpp b/Components/SoarDebug/DebugTask.cpp index 214fb61..a7095a1 100644 --- a/Components/SoarDebug/DebugTask.cpp +++ b/Components/SoarDebug/DebugTask.cpp @@ -15,6 +15,10 @@ #include "GPIO.hpp" #include "stm32l4xx_hal.h" +#include "PIRxProtocolTask.hpp" +#include "SOBRxRepeaterTask.hpp" +#include "DMBRxProtocolTask.hpp" + /* Macros --------------------------------------------------------------------*/ /* Structs -------------------------------------------------------------------*/ @@ -39,7 +43,7 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef* huart) else if (huart->Instance == SystemHandles::UART_Radio->Instance) DMBRxProtocolTask::Inst().InterruptRxData(); else if (huart->Instance == SystemHandles::UART_SOB->Instance) - SOBRxProtocolTask::Inst().InterruptRxData(); + SOBRxRepeaterTask::Inst().InterruptRxData(); else if (huart->Instance == SystemHandles::UART_PI->Instance) PIRxProtocolTask::Inst().InterruptRxData(); } diff --git a/Components/SoarProtocol/DMBRxProtocolTask.cpp b/Components/SoarProtocol/DMBRxProtocolTask.cpp index 5a7b9cf..116d7cf 100644 --- a/Components/SoarProtocol/DMBRxProtocolTask.cpp +++ b/Components/SoarProtocol/DMBRxProtocolTask.cpp @@ -8,7 +8,7 @@ #include "FlightTask.hpp" #include "ReadBufferFixedSize.h" #include "PIRxProtocolTask.hpp" -#include "SOBxProtocolTask.hpp" +#include "SOBRxRepeaterTask.hpp" #include "UARTTask.hpp" /** @@ -36,7 +36,7 @@ void DMBRxProtocolTask::InitTask() * @brief Default constructor */ DMBRxProtocolTask::DMBRxProtocolTask() : ProtocolTask(Proto::Node::NODE_RCU, - SystemHandles::UART_DMB, + SystemHandles::UART_Radio, UART_TASK_COMMAND_SEND_DMB) { } @@ -59,13 +59,10 @@ void DMBRxProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFi SOAR_PRINT("PROTO-INFO: Received DMBRx Command Message"); - // We repackage the message as a RCU Command message - Proto::CommandMessage msg; - EmbeddedProto::WriteBufferFixedSize writeBuffer; msg.serialize(writeBuffer); - SOBRxProtocolTask::SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); + SOBRxRepeaterTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); } /** @@ -95,5 +92,5 @@ void DMBRxProtocolTask::HandleProtobufTelemetryMessage(EmbeddedProto::ReadBuffer EmbeddedProto::WriteBufferFixedSize writeBuffer; msg.serialize(writeBuffer); - PIRxProtocolTask::SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_TELEMETRY); + PIRxProtocolTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_TELEMETRY); } diff --git a/Components/SoarProtocol/DMBRxProtocolTask.hpp b/Components/SoarProtocol/DMBRxProtocolTask.hpp index 45dff54..5e350c8 100644 --- a/Components/SoarProtocol/DMBRxProtocolTask.hpp +++ b/Components/SoarProtocol/DMBRxProtocolTask.hpp @@ -24,13 +24,18 @@ class DMBRxProtocolTask : public ProtocolTask void InitTask(); + static void SendProtobufMessage(EmbeddedProto::WriteBufferFixedSize& writeBuffer, Proto::MessageID msgId) + { + Inst().ProtocolTask::SendProtobufMessage(writeBuffer, msgId); + } + protected: static void RunTask(void* pvParams) { DMBRxProtocolTask::Inst().Run(pvParams); } // Static Task Interface, passes control to the instance Run(); // These handlers will receive a buffer and size corresponding to a decoded message - void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); - void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer); - void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); + void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize& readBuffer); + void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize& readBuffer); + void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize& readBuffer); // Member variables diff --git a/Components/SoarProtocol/PIRxProtocolTask.cpp b/Components/SoarProtocol/PIRxProtocolTask.cpp index f8efd57..a44f1bc 100644 --- a/Components/SoarProtocol/PIRxProtocolTask.cpp +++ b/Components/SoarProtocol/PIRxProtocolTask.cpp @@ -7,7 +7,7 @@ #include "PIRxProtocolTask.hpp" #include "FlightTask.hpp" #include "ReadBufferFixedSize.h" -#include "SOBxProtocolTask.hpp" +#include "SOBRxRepeaterTask.hpp" #include "DMBRxProtocolTask.hpp" #include "UARTTask.hpp" @@ -53,12 +53,12 @@ void PIRxProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFix msg.serialize(writeBuffer); if(msg.get_target() == Proto::Node::NODE_DMB || msg.get_target() == Proto::Node::NODE_PBB) { - DMBRxProtocolTask::SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); + DMBRxProtocolTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); return; } if(msg.get_target() == Proto::Node::NODE_SOB) { - SOBRxProtocolTask::SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); + SOBRxRepeaterTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); return; } @@ -77,12 +77,12 @@ void PIRxProtocolTask::HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFi msg.serialize(writeBuffer); if(msg.get_target() == Proto::Node::NODE_DMB || msg.get_target() == Proto::Node::NODE_PBB) { - DMBRxProtocolTask::SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_CONTROL); + DMBRxProtocolTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_CONTROL); return; } if(msg.get_target() == Proto::Node::NODE_SOB) { - SOBRxProtocolTask::SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_CONTROL); + SOBRxRepeaterTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_CONTROL); return; } } diff --git a/Components/SoarProtocol/PIRxProtocolTask.hpp b/Components/SoarProtocol/PIRxProtocolTask.hpp index 8e27465..8f02db2 100644 --- a/Components/SoarProtocol/PIRxProtocolTask.hpp +++ b/Components/SoarProtocol/PIRxProtocolTask.hpp @@ -24,13 +24,18 @@ class PIRxProtocolTask : public ProtocolTask void InitTask(); + static void SendProtobufMessage(EmbeddedProto::WriteBufferFixedSize& writeBuffer, Proto::MessageID msgId) + { + Inst().ProtocolTask::SendProtobufMessage(writeBuffer, msgId); + } + protected: static void RunTask(void* pvParams) { PIRxProtocolTask::Inst().Run(pvParams); } // Static Task Interface, passes control to the instance Run(); // These handlers will receive a buffer and size corresponding to a decoded message - void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); - void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize readBuffer); - void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize readBuffer); + void HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFixedSize& readBuffer); + void HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize& readBuffer); + void HandleProtobufTelemetryMessage(EmbeddedProto::ReadBufferFixedSize& readBuffer); // Member variables diff --git a/Components/SoarProtocol/SoarProto b/Components/SoarProtocol/SoarProto index f190bdd..5fe4b86 160000 --- a/Components/SoarProtocol/SoarProto +++ b/Components/SoarProtocol/SoarProto @@ -1 +1 @@ -Subproject commit f190bddf5cf9df9318a724169c8d4bdd05dc0def +Subproject commit 5fe4b866d52ce4141f1e976329288495d5cf6247 diff --git a/Components/main_avionics.cpp b/Components/main_avionics.cpp index c8a7018..631a8c4 100644 --- a/Components/main_avionics.cpp +++ b/Components/main_avionics.cpp @@ -19,6 +19,10 @@ #include "FlightTask.hpp" #include "DebugTask.hpp" +#include "PIRxProtocolTask.hpp" +#include "SOBRxRepeaterTask.hpp" +#include "DMBRxProtocolTask.hpp" + /* Global Variables ------------------------------------------------------------------*/ Mutex Global::vaListMutex; @@ -32,9 +36,9 @@ void run_main() { FlightTask::Inst().InitTask(); UARTTask::Inst().InitTask(); DebugTask::Inst().InitTask(); - PIRxRepeaterTask::Inst().InitTask() - DMBRxRepeaterTask::Inst().InitTask() - SOBRxRepeaterTask::Inst().InitTask() + PIRxProtocolTask::Inst().InitTask(); + DMBRxProtocolTask::Inst().InitTask(); + SOBRxRepeaterTask::Inst().InitTask(); // Print System Boot Info : Warning, don't queue more than 10 prints before scheduler starts SOAR_PRINT("\n-- AVIONICS CORE --\n"); diff --git a/Debug/Components/Communication/subdir.mk b/Debug/Components/Communication/subdir.mk index e1498d6..b9c4957 100644 --- a/Debug/Components/Communication/subdir.mk +++ b/Debug/Components/Communication/subdir.mk @@ -15,13 +15,13 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Components/Communication/%.o Components/Communication/%.su: ../Components/Communication/%.cpp Components/Communication/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Components/Communication/%.o Components/Communication/%.su Components/Communication/%.cyclo: ../Components/Communication/%.cpp Components/Communication/subdir.mk + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-Communication clean-Components-2f-Communication: - -$(RM) ./Components/Communication/UARTTask.d ./Components/Communication/UARTTask.o ./Components/Communication/UARTTask.su + -$(RM) ./Components/Communication/UARTTask.cyclo ./Components/Communication/UARTTask.d ./Components/Communication/UARTTask.o ./Components/Communication/UARTTask.su .PHONY: clean-Components-2f-Communication diff --git a/Debug/Components/Core/subdir.mk b/Debug/Components/Core/subdir.mk index f83dd09..d7d15a5 100644 --- a/Debug/Components/Core/subdir.mk +++ b/Debug/Components/Core/subdir.mk @@ -24,13 +24,13 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Components/Core/%.o Components/Core/%.su: ../Components/Core/%.cpp Components/Core/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Components/Core/%.o Components/Core/%.su Components/Core/%.cyclo: ../Components/Core/%.cpp Components/Core/subdir.mk + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-Core clean-Components-2f-Core: - -$(RM) ./Components/Core/Command.d ./Components/Core/Command.o ./Components/Core/Command.su ./Components/Core/Mutex.d ./Components/Core/Mutex.o ./Components/Core/Mutex.su ./Components/Core/Queue.d ./Components/Core/Queue.o ./Components/Core/Queue.su ./Components/Core/Task.d ./Components/Core/Task.o ./Components/Core/Task.su + -$(RM) ./Components/Core/Command.cyclo ./Components/Core/Command.d ./Components/Core/Command.o ./Components/Core/Command.su ./Components/Core/Mutex.cyclo ./Components/Core/Mutex.d ./Components/Core/Mutex.o ./Components/Core/Mutex.su ./Components/Core/Queue.cyclo ./Components/Core/Queue.d ./Components/Core/Queue.o ./Components/Core/Queue.su ./Components/Core/Task.cyclo ./Components/Core/Task.d ./Components/Core/Task.o ./Components/Core/Task.su .PHONY: clean-Components-2f-Core diff --git a/Debug/Components/FlightControl/subdir.mk b/Debug/Components/FlightControl/subdir.mk index de18d6e..1154df7 100644 --- a/Debug/Components/FlightControl/subdir.mk +++ b/Debug/Components/FlightControl/subdir.mk @@ -15,13 +15,13 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Components/FlightControl/%.o Components/FlightControl/%.su: ../Components/FlightControl/%.cpp Components/FlightControl/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Components/FlightControl/%.o Components/FlightControl/%.su Components/FlightControl/%.cyclo: ../Components/FlightControl/%.cpp Components/FlightControl/subdir.mk + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-FlightControl clean-Components-2f-FlightControl: - -$(RM) ./Components/FlightControl/FlightTask.d ./Components/FlightControl/FlightTask.o ./Components/FlightControl/FlightTask.su + -$(RM) ./Components/FlightControl/FlightTask.cyclo ./Components/FlightControl/FlightTask.d ./Components/FlightControl/FlightTask.o ./Components/FlightControl/FlightTask.su .PHONY: clean-Components-2f-FlightControl diff --git a/Debug/Components/SoarDebug/subdir.mk b/Debug/Components/SoarDebug/subdir.mk index 55796d7..484168b 100644 --- a/Debug/Components/SoarDebug/subdir.mk +++ b/Debug/Components/SoarDebug/subdir.mk @@ -15,13 +15,13 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Components/SoarDebug/%.o Components/SoarDebug/%.su: ../Components/SoarDebug/%.cpp Components/SoarDebug/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Components/SoarDebug/%.o Components/SoarDebug/%.su Components/SoarDebug/%.cyclo: ../Components/SoarDebug/%.cpp Components/SoarDebug/subdir.mk + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-SoarDebug clean-Components-2f-SoarDebug: - -$(RM) ./Components/SoarDebug/DebugTask.d ./Components/SoarDebug/DebugTask.o ./Components/SoarDebug/DebugTask.su + -$(RM) ./Components/SoarDebug/DebugTask.cyclo ./Components/SoarDebug/DebugTask.d ./Components/SoarDebug/DebugTask.o ./Components/SoarDebug/DebugTask.su .PHONY: clean-Components-2f-SoarDebug diff --git a/Debug/Components/subdir.mk b/Debug/Components/subdir.mk index 35fb094..3beccb9 100644 --- a/Debug/Components/subdir.mk +++ b/Debug/Components/subdir.mk @@ -18,13 +18,13 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Components/%.o Components/%.su: ../Components/%.cpp Components/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Components/%.o Components/%.su Components/%.cyclo: ../Components/%.cpp Components/subdir.mk + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components clean-Components: - -$(RM) ./Components/Utils.d ./Components/Utils.o ./Components/Utils.su ./Components/main_avionics.d ./Components/main_avionics.o ./Components/main_avionics.su + -$(RM) ./Components/Utils.cyclo ./Components/Utils.d ./Components/Utils.o ./Components/Utils.su ./Components/main_avionics.cyclo ./Components/main_avionics.d ./Components/main_avionics.o ./Components/main_avionics.su .PHONY: clean-Components diff --git a/Debug/Core/Src/subdir.mk b/Debug/Core/Src/subdir.mk index 2abf89d..d886653 100644 --- a/Debug/Core/Src/subdir.mk +++ b/Debug/Core/Src/subdir.mk @@ -36,13 +36,13 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Core/Src/%.o Core/Src/%.su: ../Core/Src/%.c Core/Src/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Core-2f-Src clean-Core-2f-Src: - -$(RM) ./Core/Src/freertos.d ./Core/Src/freertos.o ./Core/Src/freertos.su ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/stm32l4xx_hal_msp.d ./Core/Src/stm32l4xx_hal_msp.o ./Core/Src/stm32l4xx_hal_msp.su ./Core/Src/stm32l4xx_hal_timebase_tim.d ./Core/Src/stm32l4xx_hal_timebase_tim.o ./Core/Src/stm32l4xx_hal_timebase_tim.su ./Core/Src/stm32l4xx_it.d ./Core/Src/stm32l4xx_it.o ./Core/Src/stm32l4xx_it.su ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32l4xx.d ./Core/Src/system_stm32l4xx.o ./Core/Src/system_stm32l4xx.su + -$(RM) ./Core/Src/freertos.cyclo ./Core/Src/freertos.d ./Core/Src/freertos.o ./Core/Src/freertos.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/stm32l4xx_hal_msp.cyclo ./Core/Src/stm32l4xx_hal_msp.d ./Core/Src/stm32l4xx_hal_msp.o ./Core/Src/stm32l4xx_hal_msp.su ./Core/Src/stm32l4xx_hal_timebase_tim.cyclo ./Core/Src/stm32l4xx_hal_timebase_tim.d ./Core/Src/stm32l4xx_hal_timebase_tim.o ./Core/Src/stm32l4xx_hal_timebase_tim.su ./Core/Src/stm32l4xx_it.cyclo ./Core/Src/stm32l4xx_it.d ./Core/Src/stm32l4xx_it.o ./Core/Src/stm32l4xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32l4xx.cyclo ./Core/Src/system_stm32l4xx.d ./Core/Src/system_stm32l4xx.o ./Core/Src/system_stm32l4xx.su .PHONY: clean-Core-2f-Src diff --git a/Debug/Core/Startup/subdir.mk b/Debug/Core/Startup/subdir.mk index e047815..eed47fa 100644 --- a/Debug/Core/Startup/subdir.mk +++ b/Debug/Core/Startup/subdir.mk @@ -16,7 +16,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Core/Startup/%.o: ../Core/Startup/%.s Core/Startup/subdir.mk - arm-none-eabi-gcc -mcpu=cortex-m4 -g3 -DDEBUG -c -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/shiva/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include/etl" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m4 -g3 -DDEBUG -c -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include/etl" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" "$<" clean: clean-Core-2f-Startup diff --git a/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk b/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk index dd3c537..0e5a199 100644 --- a/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk +++ b/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk @@ -87,13 +87,13 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Drivers/STM32L4xx_HAL_Driver/Src/%.o Drivers/STM32L4xx_HAL_Driver/Src/%.su: ../Drivers/STM32L4xx_HAL_Driver/Src/%.c Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Drivers/STM32L4xx_HAL_Driver/Src/%.o Drivers/STM32L4xx_HAL_Driver/Src/%.su Drivers/STM32L4xx_HAL_Driver/Src/%.cyclo: ../Drivers/STM32L4xx_HAL_Driver/Src/%.c Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Drivers-2f-STM32L4xx_HAL_Driver-2f-Src clean-Drivers-2f-STM32L4xx_HAL_Driver-2f-Src: - -$(RM) ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.su + -$(RM) ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_adc_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_crc_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_exti.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_flash_ramfunc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_i2c_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_spi_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.su ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.cyclo ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.d ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.o ./Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.su .PHONY: clean-Drivers-2f-STM32L4xx_HAL_Driver-2f-Src diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk index fc10dbb..bd7420f 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk @@ -15,13 +15,13 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.o Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.su: ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.c Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.o Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.su Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.c Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-CMSIS_RTOS clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-CMSIS_RTOS: - -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.d ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.o ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.su + -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.d ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.o ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.su .PHONY: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-CMSIS_RTOS diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk index 2094f8e..fb0cba3 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk @@ -15,13 +15,13 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.o Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.su: ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.c Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.o Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.su Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.c Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-GCC-2f-ARM_CM4F clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-GCC-2f-ARM_CM4F: - -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.d ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.o ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.su + -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.d ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.o ./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.su .PHONY: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-GCC-2f-ARM_CM4F diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk index 35f5249..a8874e6 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk @@ -15,13 +15,13 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.o Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.su: ../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.c Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.o Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.su Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.c Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-MemMang clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-MemMang: - -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.d ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.o ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.su + -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.d ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.o ./Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.su .PHONY: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-MemMang diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk index e3ebe8a..52d702e 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk @@ -33,13 +33,13 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes -Middlewares/Third_Party/FreeRTOS/Source/%.o Middlewares/Third_Party/FreeRTOS/Source/%.su: ../Middlewares/Third_Party/FreeRTOS/Source/%.c Middlewares/Third_Party/FreeRTOS/Source/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/shiva/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/shiva/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" +Middlewares/Third_Party/FreeRTOS/Source/%.o Middlewares/Third_Party/FreeRTOS/Source/%.su Middlewares/Third_Party/FreeRTOS/Source/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/%.c Middlewares/Third_Party/FreeRTOS/Source/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source: - -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/croutine.d ./Middlewares/Third_Party/FreeRTOS/Source/croutine.o ./Middlewares/Third_Party/FreeRTOS/Source/croutine.su ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.d ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.o ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.su ./Middlewares/Third_Party/FreeRTOS/Source/list.d ./Middlewares/Third_Party/FreeRTOS/Source/list.o ./Middlewares/Third_Party/FreeRTOS/Source/list.su ./Middlewares/Third_Party/FreeRTOS/Source/queue.d ./Middlewares/Third_Party/FreeRTOS/Source/queue.o ./Middlewares/Third_Party/FreeRTOS/Source/queue.su ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.d ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.o ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.su ./Middlewares/Third_Party/FreeRTOS/Source/tasks.d ./Middlewares/Third_Party/FreeRTOS/Source/tasks.o ./Middlewares/Third_Party/FreeRTOS/Source/tasks.su ./Middlewares/Third_Party/FreeRTOS/Source/timers.d ./Middlewares/Third_Party/FreeRTOS/Source/timers.o ./Middlewares/Third_Party/FreeRTOS/Source/timers.su + -$(RM) ./Middlewares/Third_Party/FreeRTOS/Source/croutine.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/croutine.d ./Middlewares/Third_Party/FreeRTOS/Source/croutine.o ./Middlewares/Third_Party/FreeRTOS/Source/croutine.su ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.d ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.o ./Middlewares/Third_Party/FreeRTOS/Source/event_groups.su ./Middlewares/Third_Party/FreeRTOS/Source/list.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/list.d ./Middlewares/Third_Party/FreeRTOS/Source/list.o ./Middlewares/Third_Party/FreeRTOS/Source/list.su ./Middlewares/Third_Party/FreeRTOS/Source/queue.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/queue.d ./Middlewares/Third_Party/FreeRTOS/Source/queue.o ./Middlewares/Third_Party/FreeRTOS/Source/queue.su ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.d ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.o ./Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.su ./Middlewares/Third_Party/FreeRTOS/Source/tasks.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/tasks.d ./Middlewares/Third_Party/FreeRTOS/Source/tasks.o ./Middlewares/Third_Party/FreeRTOS/Source/tasks.su ./Middlewares/Third_Party/FreeRTOS/Source/timers.cyclo ./Middlewares/Third_Party/FreeRTOS/Source/timers.d ./Middlewares/Third_Party/FreeRTOS/Source/timers.o ./Middlewares/Third_Party/FreeRTOS/Source/timers.su .PHONY: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source diff --git a/Debug/makefile b/Debug/makefile index 1759883..60652c9 100644 --- a/Debug/makefile +++ b/Debug/makefile @@ -17,6 +17,9 @@ RM := rm -rf -include Core/Startup/subdir.mk -include Core/Src/subdir.mk -include Core/subdir.mk +-include Components/SoarProtocol/SoarProto/_EmbeddedProtoLib/subdir.mk +-include Components/SoarProtocol/SoarProto/subdir.mk +-include Components/SoarProtocol/subdir.mk -include Components/SoarDebug/subdir.mk -include Components/FlightControl/subdir.mk -include Components/Core/subdir.mk @@ -85,8 +88,8 @@ all: main-build main-build: RCU-STM.elf secondary-outputs # Tool invocations -RCU-STM.elf RCU-STM.map: $(OBJS) $(USER_OBJS) C:\Users\shiva\Desktop\RCU-STM\STM32L431RBTX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) - arm-none-eabi-g++ -o "RCU-STM.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\shiva\Desktop\RCU-STM\STM32L431RBTX_FLASH.ld" --specs=nosys.specs -Wl,-Map="RCU-STM.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -lstdc++ -lsupc++ -Wl,--end-group +RCU-STM.elf RCU-STM.map: $(OBJS) $(USER_OBJS) C:\Users\marce\Desktop\RCU-STM\STM32L431RBTX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) + arm-none-eabi-g++ -o "RCU-STM.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\marce\Desktop\RCU-STM\STM32L431RBTX_FLASH.ld" --specs=nosys.specs -Wl,-Map="RCU-STM.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -lstdc++ -lsupc++ -Wl,--end-group @echo 'Finished building target: $@' @echo ' ' diff --git a/Debug/objects.list b/Debug/objects.list index da44074..68e8710 100644 --- a/Debug/objects.list +++ b/Debug/objects.list @@ -5,6 +5,14 @@ "./Components/Core/Task.o" "./Components/FlightControl/FlightTask.o" "./Components/SoarDebug/DebugTask.o" +"./Components/SoarProtocol/DMBRxProtocolTask.o" +"./Components/SoarProtocol/PIRxProtocolTask.o" +"./Components/SoarProtocol/SoarProto/ProtocolTask.o" +"./Components/SoarProtocol/SoarProto/RepeaterTask.o" +"./Components/SoarProtocol/SoarProto/cobs.o" +"./Components/SoarProtocol/SoarProto/_EmbeddedProtoLib/Fields.o" +"./Components/SoarProtocol/SoarProto/_EmbeddedProtoLib/MessageInterface.o" +"./Components/SoarProtocol/SoarProto/_EmbeddedProtoLib/ReadBufferSection.o" "./Components/Utils.o" "./Components/main_avionics.o" "./Core/RunInterface.o" diff --git a/Debug/sources.mk b/Debug/sources.mk index c51a392..6055b6e 100644 --- a/Debug/sources.mk +++ b/Debug/sources.mk @@ -14,6 +14,7 @@ C_SRCS := CPP_SRCS := S_UPPER_SRCS := O_SRCS := +CYCLO_FILES := OBJDUMP_LIST := C_UPPER_DEPS := S_DEPS := @@ -35,6 +36,9 @@ Components/Communication \ Components/Core \ Components/FlightControl \ Components/SoarDebug \ +Components/SoarProtocol \ +Components/SoarProtocol/SoarProto \ +Components/SoarProtocol/SoarProto/_EmbeddedProtoLib \ Components \ Core \ Core/Src \ From dbe077b661d2983d803f8b8e9aee08ffcecb501e Mon Sep 17 00:00:00 2001 From: MarceloLiGonzales Date: Thu, 1 Jun 2023 23:29:24 -0600 Subject: [PATCH 14/18] updated SoarProto submodule commit pointer --- Components/SoarProtocol/SoarProto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Components/SoarProtocol/SoarProto b/Components/SoarProtocol/SoarProto index 5fe4b86..9a2efaa 160000 --- a/Components/SoarProtocol/SoarProto +++ b/Components/SoarProtocol/SoarProto @@ -1 +1 @@ -Subproject commit 5fe4b866d52ce4141f1e976329288495d5cf6247 +Subproject commit 9a2efaa94049fac479a787a76f846b82ae47053b From 67e586d6db5bc401e6dd000b4d4d902ab023ef5f Mon Sep 17 00:00:00 2001 From: Marcelo Li Gonzales Date: Fri, 2 Jun 2023 18:01:36 -0600 Subject: [PATCH 15/18] changed baudrate to 57600 because 115200 is not working for some reason --- .cproject | 8 ++++---- .settings/language.settings.xml | 4 ++-- Core/Src/main.c | 2 +- Debug/Components/Communication/subdir.mk | 2 +- Debug/Components/Core/subdir.mk | 2 +- Debug/Components/FlightControl/subdir.mk | 2 +- Debug/Components/SoarDebug/subdir.mk | 2 +- Debug/Components/subdir.mk | 2 +- Debug/Core/Src/subdir.mk | 2 +- Debug/Core/Startup/subdir.mk | 2 +- Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk | 2 +- .../Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk | 2 +- .../FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk | 2 +- .../FreeRTOS/Source/portable/MemMang/subdir.mk | 2 +- Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk | 2 +- Debug/makefile | 4 ++-- RCU-STM.ioc | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.cproject b/.cproject index c22fb73..b3d16e5 100644 --- a/.cproject +++ b/.cproject @@ -132,10 +132,10 @@ - - + + @@ -263,10 +263,10 @@ - - + + diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 69d80ab..9ee286a 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/Core/Src/main.c b/Core/Src/main.c index e7631a3..9672502 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -367,7 +367,7 @@ static void MX_LPUART1_UART_Init(void) /* USER CODE END LPUART1_Init 1 */ hlpuart1.Instance = LPUART1; - hlpuart1.Init.BaudRate = 115200; + hlpuart1.Init.BaudRate = 57600; hlpuart1.Init.WordLength = UART_WORDLENGTH_8B; hlpuart1.Init.StopBits = UART_STOPBITS_1; hlpuart1.Init.Parity = UART_PARITY_NONE; diff --git a/Debug/Components/Communication/subdir.mk b/Debug/Components/Communication/subdir.mk index b9c4957..96b3c18 100644 --- a/Debug/Components/Communication/subdir.mk +++ b/Debug/Components/Communication/subdir.mk @@ -16,7 +16,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes Components/Communication/%.o Components/Communication/%.su Components/Communication/%.cyclo: ../Components/Communication/%.cpp Components/Communication/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-Communication diff --git a/Debug/Components/Core/subdir.mk b/Debug/Components/Core/subdir.mk index d7d15a5..e2b06a5 100644 --- a/Debug/Components/Core/subdir.mk +++ b/Debug/Components/Core/subdir.mk @@ -25,7 +25,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes Components/Core/%.o Components/Core/%.su Components/Core/%.cyclo: ../Components/Core/%.cpp Components/Core/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-Core diff --git a/Debug/Components/FlightControl/subdir.mk b/Debug/Components/FlightControl/subdir.mk index 1154df7..cc0822c 100644 --- a/Debug/Components/FlightControl/subdir.mk +++ b/Debug/Components/FlightControl/subdir.mk @@ -16,7 +16,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes Components/FlightControl/%.o Components/FlightControl/%.su Components/FlightControl/%.cyclo: ../Components/FlightControl/%.cpp Components/FlightControl/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-FlightControl diff --git a/Debug/Components/SoarDebug/subdir.mk b/Debug/Components/SoarDebug/subdir.mk index 484168b..314d2cc 100644 --- a/Debug/Components/SoarDebug/subdir.mk +++ b/Debug/Components/SoarDebug/subdir.mk @@ -16,7 +16,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes Components/SoarDebug/%.o Components/SoarDebug/%.su Components/SoarDebug/%.cyclo: ../Components/SoarDebug/%.cpp Components/SoarDebug/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components-2f-SoarDebug diff --git a/Debug/Components/subdir.mk b/Debug/Components/subdir.mk index 3beccb9..8880347 100644 --- a/Debug/Components/subdir.mk +++ b/Debug/Components/subdir.mk @@ -19,7 +19,7 @@ CPP_DEPS += \ # Each subdirectory must supply rules for building sources it contributes Components/%.o Components/%.su Components/%.cyclo: ../Components/%.cpp Components/subdir.mk - arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-g++ "$<" -mcpu=cortex-m4 -std=gnu++20 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti -fno-use-cxa-atexit -Wall -Wno-volatile -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Components diff --git a/Debug/Core/Src/subdir.mk b/Debug/Core/Src/subdir.mk index d886653..3a7936b 100644 --- a/Debug/Core/Src/subdir.mk +++ b/Debug/Core/Src/subdir.mk @@ -37,7 +37,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Core-2f-Src diff --git a/Debug/Core/Startup/subdir.mk b/Debug/Core/Startup/subdir.mk index eed47fa..83b6780 100644 --- a/Debug/Core/Startup/subdir.mk +++ b/Debug/Core/Startup/subdir.mk @@ -16,7 +16,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Core/Startup/%.o: ../Core/Startup/%.s Core/Startup/subdir.mk - arm-none-eabi-gcc -mcpu=cortex-m4 -g3 -DDEBUG -c -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Desktop/RCU-STM/Components/_Libraries/embedded-template-library/include/etl" -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m4 -g3 -DDEBUG -c -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/_Libraries/embedded-template-library/include/etl" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" "$<" clean: clean-Core-2f-Startup diff --git a/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk b/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk index 0e5a199..5da6aa0 100644 --- a/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk +++ b/Debug/Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk @@ -88,7 +88,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Drivers/STM32L4xx_HAL_Driver/Src/%.o Drivers/STM32L4xx_HAL_Driver/Src/%.su Drivers/STM32L4xx_HAL_Driver/Src/%.cyclo: ../Drivers/STM32L4xx_HAL_Driver/Src/%.c Drivers/STM32L4xx_HAL_Driver/Src/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Drivers-2f-STM32L4xx_HAL_Driver-2f-Src diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk index bd7420f..d6a527a 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk @@ -16,7 +16,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.o Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.su Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/%.c Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-CMSIS_RTOS diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk index fb0cba3..99ef87d 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk @@ -16,7 +16,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.o Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.su Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/%.c Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-GCC-2f-ARM_CM4F diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk index a8874e6..165c615 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk @@ -16,7 +16,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.o Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.su Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/%.c Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source-2f-portable-2f-MemMang diff --git a/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk b/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk index 52d702e..d35807e 100644 --- a/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk +++ b/Debug/Middlewares/Third_Party/FreeRTOS/Source/subdir.mk @@ -34,7 +34,7 @@ OBJS += \ # Each subdirectory must supply rules for building sources it contributes Middlewares/Third_Party/FreeRTOS/Source/%.o Middlewares/Third_Party/FreeRTOS/Source/%.su Middlewares/Third_Party/FreeRTOS/Source/%.cyclo: ../Middlewares/Third_Party/FreeRTOS/Source/%.c Middlewares/Third_Party/FreeRTOS/Source/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Desktop/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Desktop/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Desktop/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -g3 -DDEBUG -DUSE_HAL_DRIVER -DSTM32L431xx -c -I../Core/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc -I../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy -I../Drivers/CMSIS/Device/ST/STM32L4xx/Include -I../Drivers/CMSIS/Include -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Communication/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/Core/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/FlightControl/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarDebug/Inc" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components" -I../Middlewares/Third_Party/FreeRTOS/Source/include -I../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS -I../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_EmbeddedProtoLib" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/EmbeddedProto/src" -I"C:/Users/marce/Downloads/SOAR/RCU/RCU-STM/Components/SoarProtocol/SoarProto/_C++" -O0 -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -o "$@" clean: clean-Middlewares-2f-Third_Party-2f-FreeRTOS-2f-Source diff --git a/Debug/makefile b/Debug/makefile index 60652c9..006cca9 100644 --- a/Debug/makefile +++ b/Debug/makefile @@ -88,8 +88,8 @@ all: main-build main-build: RCU-STM.elf secondary-outputs # Tool invocations -RCU-STM.elf RCU-STM.map: $(OBJS) $(USER_OBJS) C:\Users\marce\Desktop\RCU-STM\STM32L431RBTX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) - arm-none-eabi-g++ -o "RCU-STM.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\marce\Desktop\RCU-STM\STM32L431RBTX_FLASH.ld" --specs=nosys.specs -Wl,-Map="RCU-STM.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -lstdc++ -lsupc++ -Wl,--end-group +RCU-STM.elf RCU-STM.map: $(OBJS) $(USER_OBJS) C:\Users\marce\Downloads\SOAR\RCU\RCU-STM\STM32L431RBTX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) + arm-none-eabi-g++ -o "RCU-STM.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\marce\Downloads\SOAR\RCU\RCU-STM\STM32L431RBTX_FLASH.ld" --specs=nosys.specs -Wl,-Map="RCU-STM.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -lstdc++ -lsupc++ -Wl,--end-group @echo 'Finished building target: $@' @echo ' ' diff --git a/RCU-STM.ioc b/RCU-STM.ioc index dfbf7dd..03639b2 100644 --- a/RCU-STM.ioc +++ b/RCU-STM.ioc @@ -20,7 +20,7 @@ GPIO.groupedBy=Group By Peripherals I2C1.IPParameters=Timing I2C1.Timing=0x10707DBC KeepUserPlacement=false -LPUART1.BaudRate=115200 +LPUART1.BaudRate=57600 LPUART1.IPParameters=BaudRate,WordLength LPUART1.WordLength=UART_WORDLENGTH_8B Mcu.CPN=STM32L431RBT6 From 9c902f3115fe9383cceffe83308cce52f6038b01 Mon Sep 17 00:00:00 2001 From: Marcelo Li Gonzales Date: Fri, 2 Jun 2023 18:33:36 -0600 Subject: [PATCH 16/18] changed SUART3 to not have hardware control and to use 57600 baudrate --- Core/Src/main.c | 4 ++-- RCU-STM.ioc | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index 9672502..b035055 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -471,7 +471,7 @@ static void MX_USART3_UART_Init(void) /* USER CODE END USART3_Init 1 */ huart3.Instance = USART3; - huart3.Init.BaudRate = 115200; + huart3.Init.BaudRate = 57600; huart3.Init.WordLength = UART_WORDLENGTH_8B; huart3.Init.StopBits = UART_STOPBITS_1; huart3.Init.Parity = UART_PARITY_NONE; @@ -480,7 +480,7 @@ static void MX_USART3_UART_Init(void) huart3.Init.OverSampling = UART_OVERSAMPLING_16; huart3.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; huart3.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; - if (HAL_RS485Ex_Init(&huart3, UART_DE_POLARITY_HIGH, 0, 0) != HAL_OK) + if (HAL_UART_Init(&huart3) != HAL_OK) { Error_Handler(); } diff --git a/RCU-STM.ioc b/RCU-STM.ioc index 03639b2..9e82c06 100644 --- a/RCU-STM.ioc +++ b/RCU-STM.ioc @@ -255,7 +255,6 @@ PC9.GPIO_Label=RELAY3 PC9.Locked=true PC9.Signal=GPIO_Output PD2.Locked=true -PD2.Mode=Hardware Flow Control (RS485) PD2.Signal=USART3_DE PH0-OSC_IN\ (PH0).Mode=HSE-External-Oscillator PH0-OSC_IN\ (PH0).Signal=RCC_OSC_IN @@ -363,9 +362,9 @@ USART1.IPParameters=VirtualMode-Asynchronous USART1.VirtualMode-Asynchronous=VM_ASYNC USART2.IPParameters=VirtualMode-Asynchronous USART2.VirtualMode-Asynchronous=VM_ASYNC -USART3.IPParameters=VirtualMode-Asynchronous,VirtualMode-Hardware Flow Control (RS485) +USART3.BaudRate=57600 +USART3.IPParameters=VirtualMode-Asynchronous,BaudRate USART3.VirtualMode-Asynchronous=VM_ASYNC -USART3.VirtualMode-Hardware\ Flow\ Control\ (RS485)=VM_ASYNC VP_CRC_VS_CRC.Mode=CRC_Activate VP_CRC_VS_CRC.Signal=CRC_VS_CRC VP_FREERTOS_VS_CMSIS_V1.Mode=CMSIS_V1 From d822ef1db85a418949bbee7a090fae1db70a7a68 Mon Sep 17 00:00:00 2001 From: Marcelo Li Gonzales Date: Fri, 2 Jun 2023 23:40:18 -0600 Subject: [PATCH 17/18] fixed the dumbest bug in existance, right wrap it gals this is rock bottom --- Components/SoarProtocol/DMBRxProtocolTask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Components/SoarProtocol/DMBRxProtocolTask.cpp b/Components/SoarProtocol/DMBRxProtocolTask.cpp index 116d7cf..9d8823b 100644 --- a/Components/SoarProtocol/DMBRxProtocolTask.cpp +++ b/Components/SoarProtocol/DMBRxProtocolTask.cpp @@ -71,7 +71,7 @@ void DMBRxProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFi void DMBRxProtocolTask::HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFixedSize& readBuffer) { //rewrap into a write buffer var because readBuffer and writeBuffer are not interchangeable - Proto::TelemetryMessage msg; + Proto::ControlMessage msg; msg.deserialize(readBuffer); EmbeddedProto::WriteBufferFixedSize writeBuffer; From ffcf0fa2d880ebc0ee7b98b5eb8dec43e93cb5ee Mon Sep 17 00:00:00 2001 From: MarceloLiGonzales Date: Sat, 3 Jun 2023 01:06:27 -0600 Subject: [PATCH 18/18] added minor comments --- Components/SoarProtocol/DMBRxProtocolTask.cpp | 1 + Components/SoarProtocol/PIRxProtocolTask.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Components/SoarProtocol/DMBRxProtocolTask.cpp b/Components/SoarProtocol/DMBRxProtocolTask.cpp index 9d8823b..2bdb801 100644 --- a/Components/SoarProtocol/DMBRxProtocolTask.cpp +++ b/Components/SoarProtocol/DMBRxProtocolTask.cpp @@ -59,6 +59,7 @@ void DMBRxProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFi SOAR_PRINT("PROTO-INFO: Received DMBRx Command Message"); + //Send SOB command EmbeddedProto::WriteBufferFixedSize writeBuffer; msg.serialize(writeBuffer); diff --git a/Components/SoarProtocol/PIRxProtocolTask.cpp b/Components/SoarProtocol/PIRxProtocolTask.cpp index a44f1bc..24dfe2d 100644 --- a/Components/SoarProtocol/PIRxProtocolTask.cpp +++ b/Components/SoarProtocol/PIRxProtocolTask.cpp @@ -52,6 +52,7 @@ void PIRxProtocolTask::HandleProtobufCommandMessage(EmbeddedProto::ReadBufferFix EmbeddedProto::WriteBufferFixedSize writeBuffer; msg.serialize(writeBuffer); + //Send to relevant destination if(msg.get_target() == Proto::Node::NODE_DMB || msg.get_target() == Proto::Node::NODE_PBB) { DMBRxProtocolTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_COMMAND); return; @@ -76,6 +77,7 @@ void PIRxProtocolTask::HandleProtobufControlMesssage(EmbeddedProto::ReadBufferFi EmbeddedProto::WriteBufferFixedSize writeBuffer; msg.serialize(writeBuffer); + //Send to relevant destination if(msg.get_target() == Proto::Node::NODE_DMB || msg.get_target() == Proto::Node::NODE_PBB) { DMBRxProtocolTask::Inst().SendProtobufMessage(writeBuffer, Proto::MessageID::MSG_CONTROL); return;