diff --git a/DSTAT/src/main.c b/DSTAT/src/main.c index fff6eb3bccc43ae8c29418b25a439dea547b78e2..26c78bebfdee2d7582c2c9a84abfff9e8e9472c2 100644 --- a/DSTAT/src/main.c +++ b/DSTAT/src/main.c @@ -5,8 +5,12 @@ * Author: mdryden */ -#include "main.h" +#include "experiment.h" +#include "asf.h" #include "tcs.h" +#include <string.h> +#include <math.h> +#include <stdint.h> //Internal global variables int16_t p1, p2, p3, p4; diff --git a/DSTAT/src/main.h b/DSTAT/src/main.h deleted file mode 100644 index d4e411ba79140775b37fd93c35c023a33d6f288e..0000000000000000000000000000000000000000 --- a/DSTAT/src/main.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * main.h - * - * Created: 06/04/2012 1:19:58 AM - * Author: mdryden - */ -#ifndef MAIN_H -#define MAIN_H - -#include "asf.h" -#include <string.h> -#include <math.h> -#include <stdint.h> -//#include "ads1255.h" -//#include "max5443.h" -#include "experiment.h" - -#define ADS_F_2_5 0 -#define ADS_F_5 1 -#define ADS_F_10 2 -#define ADS_F_15 3 -#define ADS_F_25 4 -#define ADS_F_30 5 -#define ADS_F_50 6 -#define ADS_F_60 7 -#define ADS_F_100 8 -#define ADS_F_500 9 -#define ADS_F_1000 10 -#define ADS_F_2000 11 -#define ADS_F_3750 12 -#define ADS_F_7500 13 -#define ADS_F_15000 14 -#define ADS_F_30000 15 - -#endif \ No newline at end of file