corrigido o problema que impedia a execução da função delay() dentro do

carlosdelfino · carlosdelfino · commit 9814d55346da · 2012-11-03T19:49:51.000-02:00
setup().
Criei uma nova estrutura em main.c onde a função setup() passa a ser uma
tarefa executada uma unica vez antes de loop() que está em estado
suspenso até que setup() setup termine e seja posta em modo suspenso.
Para o arduino mega setup será removido quando loop() for iniciado.
Estarei verificando se é interessante ativar vTaskDelete() para outros
ATMega por questões de memoria.
diff --git a/arduino.DuinOS.AVR/DuinOS.h b/arduino.DuinOS.AVR/DuinOS.h
@@ -79,6 +79,9 @@ inline void delay(const portTickType ticks)
 	vTaskDelayUntil( &xLastWakeTime, ticks);
 }
 */
+#if INCLUDE_vTaskDelete
+	#define deleteTask(name) vTaskDelete(name);
+#endif
 
 //This macro is quiet different from setPriority, because this works even in those CPUs wich does not support
 //the set/getPriority macros (due to their small RAM memories). And, this only has effect if called in setup().
diff --git a/arduino.DuinOS.AVR/FreeRTOSConfig.h b/arduino.DuinOS.AVR/FreeRTOSConfig.h
@@ -231,7 +231,7 @@
 	#define INCLUDE_vTaskPrioritySet		1
 	#define INCLUDE_uxTaskPriorityGet		1
 	//##If the following value is set to 1, change the memory managment scheme to heap_2.c:
-	#define INCLUDE_vTaskDelete				0
+	#define INCLUDE_vTaskDelete				1
 	#define INCLUDE_vTaskCleanUpResources	0
 	#define INCLUDE_vTaskSuspend			1
 	#define INCLUDE_vTaskDelayUntil			1
diff --git a/arduino.DuinOS.AVR/main.cpp b/arduino.DuinOS.AVR/main.cpp
@@ -1,16 +1,32 @@
 #include <Arduino.h>
 
+
 unsigned portBASE_TYPE mainLoopPriority;
 
+xTaskHandle xHandleLoop;
+xTaskHandle xHandleSetup;
+
 void main_Task(void *pvParameters)
 {
+#if INCLUDE_vTaskDelete
+	vTaskDelete(xHandleSetup);
+#endif
 	for (;;) {
 		loop();
 		if (serialEventRun) serialEventRun();
 	}
 		
 } 
 
+void setup_Task(void *pvParameters)
+{
+
+	setup();
+	vTaskResume(xHandleLoop);
+	vTaskSuspend(NULL);
+
+}
+
 int main(void)
 {
 	mainLoopPriority = LOW_PRIORITY;
@@ -19,12 +35,16 @@ int main(void)
 #if defined(USBCON)
 	USBDevice.attach();
 #endif
-	
-	setup();
-    
-	xTaskCreate(main_Task, (signed portCHAR *) "main", configMINIMAL_STACK_SIZE, NULL, mainLoopPriority, NULL);
+
+//	setup();
+
+	xTaskCreate(setup_Task, (signed portCHAR *) "setup", configMINIMAL_STACK_SIZE, NULL, HIGH_PRIORITY, &xHandleSetup);
+
+	xTaskCreate(main_Task, (signed portCHAR *) "main", configMINIMAL_STACK_SIZE, NULL, mainLoopPriority, &xHandleLoop);
+	vTaskSuspend(xHandleLoop);
+
 	vTaskStartScheduler();
-    
+
 	for (;;);
         
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ inline void delay(const portTickType ticks)`
`79`	`79`	`vTaskDelayUntil( &xLastWakeTime, ticks);`
`80`	`80`	`}`
`81`	`81`	`*/`
	`82`	`+#if INCLUDE_vTaskDelete`
	`83`	`+ #define deleteTask(name) vTaskDelete(name);`
	`84`	`+#endif`
`82`	`85`
`83`	`86`	`//This macro is quiet different from setPriority, because this works even in those CPUs wich does not support`
`84`	`87`	`//the set/getPriority macros (due to their small RAM memories). And, this only has effect if called in setup().`