ALPAKA/TACOS
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/TACOS.git synced 2025-06-12 01:25:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compiler errors

Browse Source
This commit is contained in:
CarlWachter 2023-09-22 19:56:19 +02:00
parent 7981931155
commit 118a829420
12 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.cproject
View File

@ -216,20 +216,20 @@
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration"> <storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.660690966;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.339781191">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.323762911;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.929924471">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1659917731;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.591136640"> <scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1659917731;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.591136640">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1954145070;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1159787455"> <scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1954145070;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1159787455">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1080703744.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.323762911;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.929924471">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.395810276.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.660690966;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.339781191">
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule> </storageModule>
<storageModule moduleId="refreshScope"/>
</cproject> </cproject>

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-647300400575309416" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1785896503931683991" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-647300400575309416" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1785896503931683991" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

4
.settings/stm32cubeide.project.prefs
View File

@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=C96BA6CC9F20E1205A6EBDFF40205165 635E684B79701B039C64EA45C3F84D30=C96BA6CC9F20E1205A6EBDFF40205165
66BE74F758C12D739921AEA421D593D3=4 66BE74F758C12D739921AEA421D593D3=4
8DF89ED150041C4CBC7CB9A9CAA90856=D6E44E0C9E8538D2672E3627575EB9A7 8DF89ED150041C4CBC7CB9A9CAA90856=C37D8D153607683CBCB65A289104E87E
DC22A860405A8BF2F2C095E5B6529F12=D6E44E0C9E8538D2672E3627575EB9A7 DC22A860405A8BF2F2C095E5B6529F12=D2A4E69D593A17CDA189062ADCC0CBF3
eclipse.preferences.version=1 eclipse.preferences.version=1

1
App/Inc/tasks/dummy.hpp
View File

@ -15,6 +15,7 @@ namespace demo
class DummyTask : public sta::tacos::TacosThread { class DummyTask : public sta::tacos::TacosThread {
public: public:
DummyTask(const char* name); DummyTask(const char* name);
~DummyTask() override;
void init() override; void init() override;

2
App/Src/tasks/dummy.cpp
View File

@ -19,6 +19,8 @@ namespace demo
} }
DummyTask::~DummyTask(){}
void DummyTask::init() void DummyTask::init()
{ {
STA_DEBUG_PRINTLN("Initialized dummy task!"); STA_DEBUG_PRINTLN("Initialized dummy task!");

2
Libs/rtos2-utils

@ -1 +1 @@
Subproject commit ad6c4fd297865cb697037052d3b354b6d2405fe1 Subproject commit f813e7b6eacdde978bf77ed9a1bce7fb38ab4c1d

2
Libs/sta-core

@ -1 +1 @@
Subproject commit 8e93db18174937562f246af4b1e8d99bd6bbf632 Subproject commit 1498bcc449bd1c0756aaa1b1e33251288091f9ab

31
Tacos/include/sta/tacos/manager.hpp
View File

@ -48,27 +48,13 @@ namespace sta
void func() override; void func() override;
private:
class CGuard
{
public:
~CGuard()
{
if( NULL != Manager::_instance )
{
delete Manager::_instance;
Manager::_instance = NULL;
}
}
};
static Manager* _instance; static Manager* _instance;
private:
Manager(); Manager();
Manager(const Manager&); Manager(const Manager&);
~Manager() {} //~Manager();
void updateThreads(); void updateThreads();
@ -77,6 +63,19 @@ namespace sta
void stopThreads(uint16_t state); void stopThreads(uint16_t state);
std::set<TacosThread> threads_[STA_TACOS_NUM_STATES]; std::set<TacosThread> threads_[STA_TACOS_NUM_STATES];
class CGuard
{
public:
~CGuard()
{
if( NULL != Manager::_instance )
{
delete Manager::_instance;
Manager::_instance = NULL;
}
}
};
}; };
} // namespace tacos } // namespace tacos
} // namespace sta } // namespace sta

4
Tacos/include/sta/tacos/thread.hpp
View File

@ -25,6 +25,8 @@ namespace sta
*/ */
TacosThread(const char* name, osPriority_t prio); TacosThread(const char* name, osPriority_t prio);
TacosThread();
virtual ~TacosThread(); virtual ~TacosThread();
/** /**
@ -62,7 +64,9 @@ namespace sta
* @brief The body of the thread's loop. Has to be implemented by the user. * @brief The body of the thread's loop. Has to be implemented by the user.
*/ */
virtual void func(); virtual void func();
private: private:
/** /**
* @brief Static function to pass to RTOS to run as a thread. Calls the loop function implemented here. * @brief Static function to pass to RTOS to run as a thread. Calls the loop function implemented here.
*/ */

4
Tacos/src/manager.cpp
View File

@ -93,6 +93,10 @@ namespace sta
} }
//Manager::~Manager(){}
Manager* Manager::_instance = nullptr;
} // namespace tacos } // namespace tacos
} // namespace sta } // namespace sta

5
Tacos/src/statemachine.cpp
View File

@ -11,6 +11,8 @@ namespace sta
{ {
namespace tacos namespace tacos
{ {
Statemachine::Statemachine(){}
void Statemachine::init() void Statemachine::init()
{ {
@ -25,6 +27,9 @@ namespace sta
{ {
return currentState_; return currentState_;
} }
Statemachine* Statemachine::_instance = nullptr;
} // namespace tacos } // namespace tacos
} // namespace sta } // namespace sta

14
Tacos/src/thread.cpp
View File

@ -20,11 +20,13 @@ namespace sta
TacosThread::TacosThread(const char* name, osPriority_t prio) TacosThread::TacosThread(const char* name, osPriority_t prio)
: RtosThread(RtosHandle<osThreadId_t>(Handle::Deferred(&instance_))), : RtosThread(RtosHandle<osThreadId_t>(Handle::Deferred(&instance_))),
attribs_{ .name = name, .priority = prio } attribs_{ .name = name, .priority = prio }
{ {}
} TacosThread::TacosThread()
: RtosThread(RtosHandle<osThreadId_t>(Handle::Deferred(&instance_)))
{}
static void entry_point(void* arg) void TacosThread::entry_point(void* arg)
{ {
STA_ASSERT(arg != nullptr); STA_ASSERT(arg != nullptr);
@ -81,6 +83,12 @@ namespace sta
{ {
return std::strcmp(this->getName(), other.getName()) < 0; return std::strcmp(this->getName(), other.getName()) < 0;
} }
void TacosThread::init(){}
void TacosThread::func(){}
TacosThread::~TacosThread(){}
} // namespace tacos } // namespace tacos
} // namespace sta } // namespace sta