Diff: main.cpp

Revision:

99:9d0849f5fcd7

Parent:

98:81db9332212d

--- a/main.cpp	Mon May 20 18:57:23 2019 +0000
+++ b/main.cpp	Fri Jun 28 13:59:11 2019 +0000
@@ -1,6 +1,9 @@
 #include "mbed.h"
 #include "StaticDefs.hpp"
 
+//Raspberry Pi reset pin set high at beginning of code
+DigitalOut reset_pin(p11,1);
+
 ////////////////////////////////////////////////////////////////// NEW TICKER
 Ticker systemTicker;
 bool setup_complete = false;
@@ -124,6 +127,13 @@
     }
 }
 
+void reset_Pi(){
+    reset_pin = 0;
+    wait_ms(20);
+    reset_pin = 1;
+    xbee().printf("\n\rWaking up Raspberry PI\n\r");
+}
+
 void setup() {
     //  xbee().baud(115200);  // comment out so default is 9600 for USB communications
     xbee().printf("\n\n\r 2018-11-08 FSG PCB XBee\n\n\r");
@@ -164,6 +174,7 @@
         
     configFileIO().load_BCE_config();       // load the buoyancy engine parameters from the file "bce.txt"
     configFileIO().load_BATT_config();      // load the battery mass mover parameters from the file "batt.txt"
+    configFileIO().load_ALT_config();       // load the altimeter filter parameters from the file "altimeter.txt"  // edit by CAM
     
     configFileIO().load_DEPTH_config();     // load the depth control loop parameters from the file "depth.txt" (contains neutral position)
     configFileIO().load_PITCH_config();     // load the depth control loop parameters from the file "pitch.txt" (contains neutral position)
@@ -274,8 +285,8 @@
     
     mbedLogger().appendLogFile(current_state, 1);   //write the idle state, then close
                 //sdLogger().appendLogFile(current_state, 1);     //write the idle state, then close
-                
-                mbedLogger().appendLogFile(current_state, 0);    //close log file  added jcw nov 9 2018 for test
+    
+    mbedLogger().appendLogFile(current_state, 0);    //close log file  added jcw nov 9 2018 for test
                 //sdLogger().appendLogFile(current_state, 0);    //close log file
     //sdLogger().initializeLogFile(); // works 10/23/18
     
@@ -283,22 +294,22 @@
 }
 
 void cycle_logfiles(int logversion, int diagversion) {
-   //int logversion;
-   //int diagversion;
-   char bufx[256];
-   sprintf(bufx, "\n\n\r in cycle_logfiles(%d, %d):  starting new diag file. Will add 1 to these values \n\n\r", logversion, diagversion);
-  mbedLogger().appendDiagFile(bufx,0);
- mbedLogger().appendLogFile(current_state, 0);  //both files are now closed
-       //use the present values and increment
-  //logversion =  configFileIO().logFilesStruct.logversion  + 1;  
-  //diagversion = configFileIO().logFilesStruct.diagversion  + 1;
-  configFileIO().saveLogVersData(logversion+1, diagversion+1);   // updates the file logvers.txt
-  configFileIO().load_LogVers_config(0);    // now read them back into the structure
-  mbedLogger().initializeDiagFile(0);      //don't print before initializing
+    //int logversion;
+    //int diagversion;
+    char bufx[256];
+    sprintf(bufx, "\n\n\r in cycle_logfiles(%d, %d):  starting new diag file. Will add 1 to these values \n\n\r", logversion, diagversion);
+    mbedLogger().appendDiagFile(bufx,0);
+    mbedLogger().appendLogFile(current_state, 0);  //both files are now closed
+    //use the present values and increment
+    //logversion =  configFileIO().logFilesStruct.logversion  + 1;  
+    //diagversion = configFileIO().logFilesStruct.diagversion  + 1;
+    configFileIO().saveLogVersData(logversion+1, diagversion+1);   // updates the file logvers.txt
+    configFileIO().load_LogVers_config(0);    // now read them back into the structure
+    mbedLogger().initializeDiagFile(0);      //don't print before initializing
   
   
-  mbedLogger().initializeLogFile();
-  mbedLogger().initializeDiagFile(1);
+    mbedLogger().initializeLogFile();
+    mbedLogger().initializeDiagFile(1);
    
 }  
 
@@ -445,7 +456,7 @@
                     diagnum = configFileIO().logFilesStruct.diagversion;
                     sprintf(buf, "cycle log file names at tnow=%d at  seconds. This message should be in old diag file\n\n\r", tNow);
                     mbedLogger().appendDiagFile(buf,3);
-                  cycle_logfiles(vernum,diagnum);
+                    cycle_logfiles(vernum,diagnum);
                     sprintf(buf, "cycled log files at tNow = %d at seconds, This message should be in a NEW diag file\n\n\r", tNow);
                     mbedLogger().appendDiagFile(buf,3);
                     //  close the log and diagnostics files
@@ -487,5 +498,6 @@
     mbedLogger().appendDiagFile(buf,0);
     led1()=0; led2()=0; led3()= 0 ;led4()=0;
     configFileIO().save_FinalTime();   // saves last time before closing shop
+    reset_Pi();
     exit(0);
 }  // end main()
\ No newline at end of file