adc working

src/main.c

@@ -8,12 +8,14 @@
 #include <msp430g2553.h>
 #include <stdint.h>
 #include <intrinsics.h>
+#include <stdlib.h>
 
 #include "gpio.h"
 #include "time.h"
 #include "display.h"
 #include "PontCoopScheduler.h"
-#include "testTask.h"
+// #include "testTask.h"
+#include "measure.h"
 
 
 int main() {
@@ -32,13 +34,24 @@ int main() {
 
 	// interrupts are required for delay function in displayInit();
 	__enable_interrupt();
-	displayInit();
+	displayInit(NULL);
 	__disable_interrupt();
 
-	testTaskInit();
+//	tTestTaskHandle testTaskHandle1;
+//	testTaskInit(&testTaskHandle1, TESTPIN1);
+//
+//	tTestTaskHandle testTaskHandle2;
+//	testTaskInit(&testTaskHandle2, TESTPIN2);
 
-	// schAdd(displayExec, 0, 100);
-	schAdd(testTaskExec, 0, 100);
+	measureInit(NULL);
+
+
+	schAdd(displayExec, NULL, 0, 100);
+//	schAdd(testTaskExec, &testTaskHandle1, 0, 20);
+//	schAdd(testTaskExec, &testTaskHandle2, 2, 20);
+//	schAdd(measureStartConversion, NULL, 0, 1000);
+
+	__enable_interrupt();
 
 	while (1) {
 		schExec();