committing to switch branches

Author: jaredgibson510

SAMA_sampling.py

@@ -0,0 +1,126 @@
+# NAME: serial_write.py
+# AUTHOR: Matthew Miller
+# PURPOSE: Records data from iMet sensor into a file called IMETDATAXX.CSV.
+#			If the program detects that an ADC has been attached, the program
+#			will send ADC data, immediately followed by iMet data through the
+#			serial port. This is intended to be used with an xBee in coordination
+#			with a ground station computer. The ground station computer will be 
+#			set up to display a live graph of the data.
+
+#NOTE: all xbee communication lines have been commented out for the time being (serial initialization and a single write inside the while loop
+#										This was done on 6/7/21 for testing purposes)
+
+import os
+import time
+import serial
+import sys
+from gpiozero import LED, Button
+
+#check if Arduino ADC is connected via USB
+#if not used, program continues with only iMET recording
+try:
+    ser_ADC = serial.Serial(
+            port='/dev/ARD',
+            baudrate = 9600,
+            parity=serial.PARITY_NONE,
+            stopbits=serial.STOPBITS_ONE,
+            bytesize=serial.EIGHTBITS,
+            timeout=2
+    )
+    use_ADC = 1
+except: #error if no adc attached.
+    print("No ADC attached. Not using.\n")
+    use_ADC = 0
+
+      
+#ser_xBee = serial.Serial(
+#        port='/dev/ttyS0',
+#        baudrate = 9600,
+#        parity=serial.PARITY_NONE,
+#        stopbits=serial.STOPBITS_ONE,
+#        bytesize=serial.EIGHTBITS,
+#        timeout=1
+#)
+
+#check if iMet attached
+try:
+    ser_SAMA = serial.Serial(
+            port='/dev/ttyUSB1',
+            baudrate = 9600,
+            parity=serial.PARITY_NONE,
+            stopbits=serial.STOPBITS_ONE,
+            bytesize=serial.EIGHTBITS,
+            timeout=1
+	)
+except:
+        print("no iMET attached, cannot continue. \n")
+        exit()
+
+try:
+    collect_ADC = LED(27)
+    stop_button = Button(25, pull_up=False)
+
+    counter=0#potentially unneccessary
+
+#open iMET file
+#first get filename
+    config = "/home/pi/BC6B/CONFIG"
+    location = sys.argv[1]
+    init_SAMA_filename = "SAMADATA"
+    for i in range(100):
+        j = i-1
+        to_append = str(j)+".CSV" #TODO was i
+        config_to_append = str(i) + ".YML"
+        true_config = config + config_to_append
+        SAMA_appended = location + init_SAMA_filename + to_append
+        file_exists = os.path.isfile(true_config)
+        if file_exists == 0: #if file doesn't exist exit loop and create it
+			     #file is created in the following while loop
+            print("file created")
+            break
+
+    print("launching while loop \n")
+    
+    temp = 1
+    while(True):
+        if use_ADC == 1:
+            SAMA_file = open(SAMA_appended, "a+") #open new iMET file appending
+            data_SAMA = ser_SAMA.readline().decode()
+            collect_ADC.on() #tell arduino to grab data
+            collect_ADC.off()
+            data_ADC = ser_ADC.readline().decode()
+	    #data_all = data_ADC + data_iMET
+            #ser_xBee.write(data_all)
+            SAMA_file.write(data_SAMA)
+            SAMA_file.write("\n")
+            SAMA_file.close()
+		
+        else: 
+            SAMA_file = open(SAMA_appended, "a+") #open new iMET file appending
+            data_SAMA = ser_SAMA.readline().decode()
+            SAMA_file.write(data_SAMA)
+            SAMA_file.write("\n")
+            SAMA_file.close()
+            time.sleep(1)
+    
+#stop_button.wait_for_press()
+#print("aye bro the button was pressed")
+    """
+    time.sleep(1)
+    for x in range (10):
+             iMET_file = open(iMET_appended, "a+") #open new iMET file appending
+             data_iMET = ser_iMET.readline().decode()
+             print(data_iMET)
+             iMET_file.write(data_iMET)
+             iMET_file.write("\n")
+             iMET_file.close()
+    
+
+    print("done\n")
+    """
+except:
+    print("exception thrown")
+    if not SAMA_file.closed:
+        SAMA_file.close()
+		
+		

get_data.sh

@@ -65,7 +65,7 @@ while [ $RUN_N -lt 100 ]; do
     sleep 1
     sudo cp /home/pi/BC6B/DAQDATA$RUN_N.RAW /media/sda1/DAQDATA$RUN_N.RAW
     sleep 1
-    sudo cp /home/pi/BC6B/IMETDATA$RUN_N.CSV /media/sda1/IMETDATA$RUN_N.CSV
+    sudo cp /home/pi/BC6B/SAMADATA$RUN_N.CSV /media/sda1/SAMADATA$RUN_N.CSV #TODO: change SAMA to iMET
     sleep 5
     sudo cp /home/pi/BC6B/CONFIG$RUN_N.YML /media/sda1/CONFIG$RUN_N.YML
     sudo ./extract_all.sh $USB_PTH $RUN_N

iMET_sampling.py

@@ -46,7 +46,7 @@
 try:
     ser_iMET = serial.Serial(
             port='/dev/ttyUSB1',
-            baudrate = 57600,
+            baudrate = 57600,     
             parity=serial.PARITY_NONE,
             stopbits=serial.STOPBITS_ONE,
             bytesize=serial.EIGHTBITS,
@@ -76,6 +76,7 @@
         file_exists = os.path.isfile(true_config)
         if file_exists == 0: #if file doesn't exist exit loop and create it
 			     #file is created in the following while loop
+            print("file created")
             break
 
     print("launching while loop \n")
@@ -99,8 +100,10 @@
             iMET_file = open(iMET_appended, "a+") #open new iMET file appending
             data_iMET = ser_iMET.readline().decode()
             iMET_file.write(data_iMET)
+            print(data_iMET) #TODO
             iMET_file.write("\n")
             iMET_file.close()
+            time.sleep(1)
 
 #stop_button.wait_for_press()
 #print("aye bro the button was pressed")

src/main.cpp

@@ -302,12 +302,7 @@ int main(int argc, const char *argv[]) {
 	fifo.open(FIFOFILE, ios::out);
 	fifo << "GPS Acquired." << endl;	
 	fifo.close();
-<<<<<<< HEAD
 
-
-=======
-	
->>>>>>> 81498be71a3b1e96acd061e52768a61fcec12fe1
 	pthread_t vn_write_thread;
 	pthread_create(&vn_write_thread, NULL, vec_write, NULL);
 	vs.registerAsyncPacketReceivedHandler(NULL, vecnavBinaryEventHandle);
@@ -428,13 +423,7 @@ int main(int argc, const char *argv[]) {
 	pthread_cancel(timer_thread);
 	cout << "enter pressed, should be wrapping up" << endl;
 	stop_sampling = true; // this kills transmission and file writing threads.
-<<<<<<< HEAD
-	
-=======
-//	fifo.open(FIFOFILE, ios::out);
-//	fifo << "ending VN thread" << endl;
-//	fifo.close(); //TODO TODO
->>>>>>> 81498be71a3b1e96acd061e52768a61fcec12fe1
+
 	pthread_join(transmit_thread, NULL);
 	pthread_join(vn_write_thread, NULL);