From 62927a57d988dbb66fd0f3745214813c23d7dacc Mon Sep 17 00:00:00 2001
From: Terraneo Federico <fede.tft@hotmail.it>
Date: Thu, 30 Dec 2010 15:25:23 +0100
Subject: [PATCH] Forgot some minor cleanups
---
main.cpp | 35 -------------------
miosix_np_2/nbproject/configurations.xml | 7 +---
.../nbproject/private/configurations.xml | 1 +
testsuite.cpp | 1 -
4 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/main.cpp b/main.cpp
index 50b0ea93..6bb0660a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,42 +7,7 @@
using namespace std;
using namespace miosix;
-typedef Gpio<GPIOF_BASE,6> led1;
-typedef Gpio<GPIOF_BASE,9> led2;
-
-void blinkThread(void *argv)
-{
- const int period=static_cast<int>(TICK_FREQ*0.03);
- long long tick=getTick();
- for(;;)
- {
- long long prevTick=tick;
- tick+=period;
- Thread::setPriority(Priority(tick)); //Change deadline
- Thread::sleepUntil(prevTick); //Make sure the task is run periodically
- if(led2::value()) led2::low(); else led2::high();
- delayMs(14);
- if(getTick()>tick) iprintf("Deadline missed (A)\n");
- }
-}
-
int main()
{
//iprintf("Hello world, write your application here\n");
- led1::mode(Mode::OUTPUT);
- led2::mode(Mode::OUTPUT);
-
- Thread::create(blinkThread,2048);
- const int period=static_cast<int>(TICK_FREQ*0.05);
- long long tick=getTick();
- for(;;)
- {
- long long prevTick=tick;
- tick+=period;
- Thread::setPriority(Priority(tick)); //Change deadline
- Thread::sleepUntil(prevTick); //Make sure the task is run periodically
- if(led1::value()) led1::low(); else led1::high();
- delayMs(24);
- if(getTick()>tick) iprintf("Deadline missed (B)\n");
- }
}
diff --git a/miosix_np_2/nbproject/configurations.xml b/miosix_np_2/nbproject/configurations.xml
index 18c730d6..ec0b940e 100644
--- a/miosix_np_2/nbproject/configurations.xml
+++ b/miosix_np_2/nbproject/configurations.xml
@@ -69,11 +69,6 @@
</df>
</df>
<df name="config">
- <df name="alt-configs">
- <df name="minimum code size" kind="SOURCE_LOGICAL_FOLDER">
- <in>miosix_settings.h</in>
- </df>
- </df>
<in>miosix_settings.h</in>
</df>
<df name="interfaces">
@@ -150,7 +145,7 @@
<itemPath>miosix_np_2-Makefile.mk</itemPath>
</logicalFolder>
</logicalFolder>
- <sourceFolderFilter>^(nbproject|build|test|bootloaders|compiler|doc|temp)$</sourceFolderFilter>
+ <sourceFolderFilter>^(nbproject|build|test|bootloaders|compiler|doc|temp|alt-configs)$</sourceFolderFilter>
<sourceRootList>
<Elem>..</Elem>
</sourceRootList>
diff --git a/miosix_np_2/nbproject/private/configurations.xml b/miosix_np_2/nbproject/private/configurations.xml
index 023c313e..b730d14c 100644
--- a/miosix_np_2/nbproject/private/configurations.xml
+++ b/miosix_np_2/nbproject/private/configurations.xml
@@ -5,6 +5,7 @@
<confs>
<conf name="Default" type="0">
<gizmo_options version="3">
+ <configurationname>GizmoSimple</configurationname>
</gizmo_options>
<runprofile version="6">
<args></args>
diff --git a/testsuite.cpp b/testsuite.cpp
index eac2918b..268e3f8a 100644
--- a/testsuite.cpp
+++ b/testsuite.cpp
@@ -43,7 +43,6 @@
#include "config/miosix_settings.h"
#include "interfaces/console.h"
#include "board_settings.h"
-#include "config/alt-configs/minimum code size/miosix_settings.h"
using namespace miosix;
--
GitLab