Diff: MbedLogger/MbedLogger.hpp

Revision:

74:d281aaef9766

Parent:

73:f6f378311c8d

Child:

79:3688c3a0d7f4

diff -r f6f378311c8d -r d281aaef9766 MbedLogger/MbedLogger.hpp
--- a/MbedLogger/MbedLogger.hpp	Mon Jul 30 16:48:48 2018 +0000
+++ b/MbedLogger/MbedLogger.hpp	Tue Aug 14 21:06:48 2018 +0000
@@ -24,7 +24,11 @@
     COMMAND_ONE,
     COMMAND_TWO,
     HEADER_1E,
-    HEADER_1F
+    HEADER_1F,
+    PACKET_NO_1,
+    PACKET_NO_2,
+    END_TX_1,
+    END_TX_2
 };
 
 class MbedLogger {
@@ -47,9 +51,6 @@
     //print the current MBED log file
     void printCurrentLogFile();
     
-    //open file for transmit
-    void openFileForTransmit();
-    
     //transmit data when receive confirmation
     void transmitCurrentLogFileLine(bool next_line);
     
@@ -147,14 +148,13 @@
     
     string _received_filename;                  //testing
     
+    void receiveSequenceFile();
     void receiveMissionDataWithFSM();           //for use in Finite State Machine
     
     void openReceiveFile(string filename);      //create a file with an input filename
     
     void setTransmissionComplete(bool transmit_complete_status);
     
-    void sendStatus();
-    
     void intCreateDataPacket(int data_buffer[],int payload_length);
     
     int getLogSize();   //used in state machine
@@ -209,7 +209,7 @@
     
     bool _file_transmission;        //breaks out of loop in State Machine
     
-    float _data_log[16];            //for logging all of the data from the outer and inner loops and so on (changed to 16 items on 7/16/18)
+    float _data_log[37];            //for logging all of the data from the outer and inner loops and so on
     
     int _confirmed_packet_number;
     
@@ -239,6 +239,8 @@
     bool _fsm_transmit_complete;
     
     bool _end_transmit_packet;
+    
+    bool _end_sequence_transmission;
 };
  
 #endif
\ No newline at end of file