Forráskód Böngészése

add NOGPS mode for acquisition

Pierre Bourdin 6 napja
szülő
commit
b3dd9b3abb
3 módosított fájl, 57 hozzáadás és 20 törlés
  1. 51 19
      acquisition_process/1_capture
  2. 3 1
      setup.sh
  3. 3 0
      variables.sh

+ 51 - 19
acquisition_process/1_capture

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ~/BallonSonde/variables.sh
+
 CONVERTLL_PATH="/home/pi/BallonSonde/convert_ll_dec.py"
 READ_NMEA_PATH="/home/pi/BallonSonde/read_nmea.py"
 
@@ -7,18 +9,11 @@ rm -rf /ramfs/*.jpg
 
 echo "=> Acquisition on !"
 DATE=$(date +%y%m%d_%H%M%S)
-$READ_NMEA_PATH > /ramfs/.out
 
-cat /ramfs/.out | grep "Pas de signal GPS"
-if [[ $? -eq 0 ]]; then
-  echo "Pas de signal GPS"
-  echo "Don't have GPS datas, continue without these datas"
-  GPS_SIGNAL="KO"
-else
-  echo "Signal GPS OK"
-fi
 
-acquire() {
+
+
+acquire_with_gps() {
 
 DATA=$(cat /ramfs/.out)
 NS=$(echo $DATA| tr ' ' '\n' | grep NS | cut -d'=' -f2 | cut -d',' -f1)
@@ -63,24 +58,61 @@ fi
 
 echo "Picz $DATE.jpg saved in RAM"
 cp /ramfs/$DATE.jpg ~/_Pictures
-#mv /ramfs/$DATE.jpg /ramfs/$DATE.jp_
-#rm -rf /ramfs/*.jpg
-#mv /ramfs/$DATE.jp_ /ramfs/$DATE.jpg
-
-echo "Picz $DATE.jpg saved to SDCARD"
-
 echo "$DATE.jpg" > /ramfs/.canbeconvert
 echo "Sleeping... zzzZZZzzZZZzzz..."
-
 sleep 5
 }
 
+acquire_without_gps() {
 
+echo "Picz $DATE.jpg saved in RAM (without GPS Datas)"
+cp /ramfs/$DATE.jpg ~/_Pictures
+echo "$DATE.jpg" > /ramfs/.canbeconvert
+echo "Sleeping... zzzZZZzzZZZzzz..."
+sleep 5
+}
 
 raspistill -o /ramfs/$DATE.jpg
 if [ $? -eq 0 ]; then
-  acquire
+
+    if [[ $HAVEGPS == 1 ]]
+    then
+        $READ_NMEA_PATH > /ramfs/.out
+        cat /ramfs/.out | grep "Pas de signal GPS"
+
+        if [[ $? -eq 0 ]]; then
+            echo "Pas de signal GPS"
+	    acquire_without_gps
+        else
+            echo "Signal GPS OK"
+	    acquire_with_gps
+        fi
+
+    else
+        acquire_without_gps
+    fi
+
+# pour le raspistille
 else
-  echo "Command failed"
+  echo "Picz failed to be acquired..."
   /home/pi/BallonSonde/tx_process/4_tx_file /home/pi/BallonSonde/sound/error_camera.wav
 fi
+
+
+
+if [[ $HAVEGPS == 1 ]]
+then
+    $READ_NMEA_PATH > /ramfs/.out
+    cat /ramfs/.out | grep "Pas de signal GPS"
+
+    if [[ $? -eq 0 ]]; then
+        echo "Pas de signal GPS"
+        echo "Don't have GPS datas, continue without these datas"
+        GPS_SIGNAL="KO"
+    else
+        echo "Signal GPS OK"
+    fi
+
+else
+    GPS_SIGNAL="KO"
+fi

+ 3 - 1
setup.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-sudo apt install exiftool
+sudo apt install exiftool imagemagick 
+
+
 # Setup the basic configurations
 sudo cp -r sysconfig/config.txt /boot/
 sudo cp -r sysconfig/cmdline.txt /boot/

+ 3 - 0
variables.sh

@@ -15,3 +15,6 @@ GPIO_PTT="22"
 # Selon comment on cable le transistor pour le PTT
 # Peux être à 1 pour activer le PTT ou 0
 LOGICPTT=1
+
+# don't try to put GPS position on pictures and exif infos.
+HAVE_GPS=0