Diff: src/main.cpp

Revision:

42:3ae73b61f657

Parent:

41:bd54c88e3334

Child:

43:291bbdba48f3

--- a/src/main.cpp	Sat Mar 09 19:55:05 2019 +0000
+++ b/src/main.cpp	Sat Mar 09 21:01:45 2019 +0000
@@ -27,17 +27,36 @@
 //-------------------------------------------------------------------------------
 
 #include "mbed.h"
-#include "PortOut.h"
+#include "math.h"
+#include "globals.h"
+#include "parameters.h"
 #include "all_io.h"
-
+#include "stdio.h"
+#include "stdlib.h"
+#include "serial.h"
+#include "adc.h"
+#include "adc_defs.h"
+#include "menu.h"
+#include "boards.h"
+#include "command.h"
+#include "clocks.h"
 
 
 //DigitalOut myled(LED1);
 Ticker slowClk;
 Ticker fastClk;
 
-#define TRUE  1
-#define FALSE 0
+unsigned short my12=0;
+volatile bool updateReady = FALSE;
+unsigned int loopTime = 0;
+bool raw = FALSE;
+bool running = FALSE;
+bool testing = FALSE;
+bool buck = TRUE;
+
+double CURRENT_48_OFFSET = 33940;
+double CURRENT_24_OFFSET = 33580;
+double CURRENT_12_OFFSET = 33256;
 
 volatile bool dosFlip = FALSE;
 volatile bool dofFlip = FALSE;
@@ -50,132 +69,6 @@
     dofFlip = TRUE;
 }
 
-void initOut(void){
-    ec2  = 1;
-    ec15 = 1;
-    ec26 = 1;
-    ec6  = 1;
-    ec12 = 1;
-    ec25 = 1;
-    ec36 = 1;
-    ec31 = 1;
-    ec9  = 1;
-    ec5  = 1;
-    ec24 = 1;
-    ec11 = 1;
-    ec1  = 1;
-    ec10 = 1;
-    ec23 = 1;
-    ec7  = 1;
-    ec18 = 1;
-    ec14 = 1;
-    ec27 = 1;
-    ec19 = 1;
-    ec32 = 1;
-    ec35 = 1;
-    ec21 = 1;
-    ec30 = 1;
-    ec33 = 1;
-    ec20 = 1;
-    ec34 = 1;
-    ec29 = 1;
-    ec8  = 1;
-    ec4  = 1;
-    ec17 = 1;
-    ec13 = 1;
-    ec26 = 1;
-    ec22 = 1;
-}
-
-void flipSlow(void){
-    dosFlip = FALSE;
-    if(!ILR_enable){
-        ec2 = !ec2;
-        ec15 = !ec15;
-        ec26 = !ec26;
-        ec6 = !ec6;
-        ec12 = !ec12;
-        ec25 = !ec25;
-        ec36 = !ec36;
-        ec31 = !ec31;
-        ec9 = !ec9;
-        ec5 = !ec5;
-        ec24 = !ec24;
-        ec11 = !ec11;
-        ec1 = !ec1;
-        ec10 = !ec10;
-        ec23 = !ec23;
-        ec7 = !ec7;
-        ec18 = !ec18;
-        ec14 = !ec14;
-        ec27 = !ec27;
-        ec19 = !ec19;
-        ec32 = !ec32;
-        ec35 = !ec35;
-        ec21 = !ec21;
-        ec30 = !ec30;
-        ec33 = !ec33;
-        ec20 = !ec20;
-        ec34 = !ec34;
-        ec29 = !ec29;
-        ec8 = !ec8;
-        ec4 = !ec4;
-        ec17 = !ec17;
-        ec13 = !ec13;
-        ec26 = !ec26;
-        ec22 = !ec22;
-    }
-}
-
-void flipFast(void){
-    dofFlip = FALSE;
-    if(ILR_enable){
-        ec2 = !ec2;
-        ec15 = !ec15;
-        ec26 = !ec26;
-        ec6 = !ec6;
-        ec12 = !ec12;
-        ec25 = !ec25;
-        ec36 = !ec36;
-        ec31 = !ec31;
-        ec9 = !ec9;
-        ec5 = !ec5;
-        ec24 = !ec24;
-        ec11 = !ec11;
-        ec1 = !ec1;
-        ec10 = !ec10;
-        ec23 = !ec23;
-        ec7 = !ec7;
-        ec18 = !ec18;
-        ec14 = !ec14;
-        ec27 = !ec27;
-        ec19 = !ec19;
-        ec32 = !ec32;
-        ec35 = !ec35;
-        ec21 = !ec21;
-        ec30 = !ec30;
-        ec33 = !ec33;
-        ec20 = !ec20;
-        ec34 = !ec34;
-        ec29 = !ec29;
-        ec8 = !ec8;
-        ec4 = !ec4;
-        ec17 = !ec17;
-        ec13 = !ec13;
-        ec26 = !ec26;
-        ec22 = !ec22;
-    }
-}
-
-void checkFlip(void){
-    if(dosFlip){
-        flipSlow();
-    }
-    if(dofFlip){
-        flipFast();
-    }
-}
-
 int main() {
     
     initOut();