Commit a146b8d0 authored by Robin Mueller's avatar Robin Mueller
Browse files

Merge branch 'develop' into 'master'

Release v1.2

See merge request !5
parents 387a609f 894dc26e
......@@ -99,7 +99,7 @@ make NVM1=1 mission -j
```
4. It is recommended to install [Eclipse for C/C++ developers](https://www.eclipse.org/downloads/packages/) and also get
the Eclipse Embedded CDT. After setting the path to the installed ARM toolchain,
the Eclipse Embedded CDT plugin. After setting the path to the installed ARM toolchain,
the includes should be updated with ARM toolchain binaries after hitting Apply
inside the project settings.
......@@ -162,7 +162,7 @@ UART TTL → USB converter cable in addition to the USB connection used for f
## Setting up Eclipse for comfortable Debugging and remote Debugging
1. Install Eclipse for C/C++ using the installer. Install the Eclipse MCU plugin
1. Install Eclipse for C/C++ using the installer. Install the Eclipse Embedded CDT plugin
by going to Help → Eclipse Marketplace and searching and installing the plugin
2. The Windows Build Tools and the ARM toolchain should have been installed previously.
......@@ -170,7 +170,7 @@ UART TTL → USB converter cable in addition to the USB connection used for f
Packages installed with xpm should be recognized automatically.
3. It is recommended to use the pre-configured project files and launch configurations as a
starting point. Copy the files `.project` and `.cproject` inside the eclipse folder
starting point. Copy the files `.project` and `.cproject` inside the `eclipse` folder
into the root of the cloned folder.
4. Import the project now by going to File → Import → Existing Projects and selecting
......
......@@ -7,7 +7,7 @@
const char* const SW_NAME = "vorago";
const uint8_t SW_VERSION = 1;
const uint8_t SW_SUBVERSION = 1;
const uint8_t SW_SUBVERSION = 2;
//! Should be disabled for mission code.
#define VOR_ADD_TEST_TASKS 1
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>vorago_obsw</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>
......@@ -20,7 +20,6 @@ volatile uint32_t glob::secondTicks = 0;
void glob::produceObjects() {
#if VOR_ADD_TEST_TASKS == 1
glob::testTaskHandle = new TestTask("TEST_TASK", TEST_TASK_PERIOD);
glob::ledTaskHandle = new LedTask("LED_TASK", 200,
LedTask::LedModes::WAVE_UP);
glob::payloadTestTaskHandle = new PayloadPeriodicTask("PAYLOAD_TASK", 500);
......@@ -35,14 +34,6 @@ int glob::initializeObjects() {
int result = 0;
#if VOR_ADD_TEST_TASKS == 1
result = glob::testTaskHandle->initialize();
if(result != 0) {
initErrCounter++;
taskName = glob::testTaskHandle->getName();
VOR_CError("Object Initialization of Task %s failed\r\n", taskName);
}
glob::testTaskHandle->setInitialized();
result = glob::ledTaskHandle->initialize();
if(result != 0) {
initErrCounter++;
......
......@@ -23,7 +23,6 @@ int loop() {
// The core operation will run the periodic task handler with
// the period specified in the setup function.
#if VOR_ADD_TEST_TASKS == 1
glob::testTaskHandle->taskCoreOperation();
glob::ledTaskHandle->taskCoreOperation();
glob::payloadTestTaskHandle->taskCoreOperation();
#endif
......
......@@ -13,6 +13,7 @@ int PayloadPeriodicTask::performOneShotAction() {
}
int PayloadPeriodicTask::performPeriodicAction() {
//VOR_CInfo("Hallo Welt\n\r");
return 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment