Diff: MbedLogger/MbedLogger.hpp

Revision:

73:f6f378311c8d

Parent:

69:919ac8d7e023

Child:

74:d281aaef9766

--- a/MbedLogger/MbedLogger.hpp	Mon Jul 02 14:28:22 2018 +0000
+++ b/MbedLogger/MbedLogger.hpp	Mon Jul 30 16:48:48 2018 +0000
@@ -7,6 +7,8 @@
 
 #include <vector>
 
+#include <fstream>
+
 enum {
     HEADER_117,
     HEADER_101,
@@ -20,7 +22,9 @@
     PACKET_CRC_TWO,
     RANDOM_CHAR,
     COMMAND_ONE,
-    COMMAND_TWO
+    COMMAND_TWO,
+    HEADER_1E,
+    HEADER_1F
 };
 
 class MbedLogger {
@@ -137,10 +141,6 @@
     int getFilePointerState();
     void testToggleFilePointer();
     
-    int getNumberOfPackets();
-    
-    void readTransmitPacketOneChar();
-    
     bool isTransmissionComplete();
     int currentPacketNumber();
     void eraseFile();
@@ -169,11 +169,19 @@
     
     void checkForPythonTransmitRequest();
     
-    bool fsmTransmitData();
+    void fsmTransmitData();
     
     void setTransmitPacketNumber(int packet_number);
     
     void createDataPacket(char line_buffer_sent[], int line_length_sent);
+    
+    bool endTransmitPacket();   //used to exit FSM with Python
+    
+    void blastData();
+    
+    void transmitOnePacket();
+    
+    void transmitMultiplePackets();
         
 private:
     int _file_number;
@@ -201,7 +209,7 @@
     
     bool _file_transmission;        //breaks out of loop in State Machine
     
-    float _data_log[14];            //for logging all of the data from the outer and inner loops and so on
+    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)
     
     int _confirmed_packet_number;
     
@@ -229,6 +237,8 @@
     int _transmit_packet_num;
     
     bool _fsm_transmit_complete;
+    
+    bool _end_transmit_packet;
 };
  
 #endif
\ No newline at end of file