Ver Fonte

enh for peyrat le chateau

Pierre Bourdin há 10 meses atrás
pai
commit
ee4a9ac1fc

+ 15 - 1
acquisition_process/1_capture

@@ -6,7 +6,8 @@ READ_NMEA_PATH="/home/pi/BallonSonde/read_nmea.py"
 echo "=> Acquisition on !"
 DATE=$(date +%y%m%d_%H%M%S)
 $READ_NMEA_PATH > /ramfs/.out
-raspistill -o /ramfs/$DATE.jpg
+
+acquire() {
 
 DATA=$(cat /ramfs/.out)
 NS=$(echo $DATA| tr ' ' '\n' | grep NS | cut -d'=' -f2 | cut -d',' -f1)
@@ -55,3 +56,16 @@ echo "Picz $DATE.jpg saved to SDCARD"
 
 echo "$DATE.jpg" > /ramfs/.canbeconvert
 echo "Sleeping... zzzZZZzzZZZzzz..."
+
+}
+
+
+
+raspistill -o /ramfs/$DATE.jpg
+if [ $? -eq 0 ]; then
+  acquire
+else
+  echo "Command failed"
+  /home/pi/BallonSonde/tx_process/4_tx_file /home/pi/BallonSonde/sound/error_camera.wav
+fi
+

+ 70 - 0
acquisition_process/1_capture~

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+CONVERTLL_PATH="/home/pi/BallonSonde/convert_ll_dec.py"
+READ_NMEA_PATH="/home/pi/BallonSonde/read_nmea.py"
+
+echo "=> Acquisition on !"
+DATE=$(date +%y%m%d_%H%M%S)
+$READ_NMEA_PATH > /ramfs/.out
+
+acquire() {
+
+DATA=$(cat /ramfs/.out)
+NS=$(echo $DATA| tr ' ' '\n' | grep NS | cut -d'=' -f2 | cut -d',' -f1)
+EW=$(echo $DATA| tr ' ' '\n' | grep EW | cut -d'=' -f2 | cut -d',' -f1)
+
+LAT=$(echo $DATA| tr ' ' '\n' | grep 'lat=' | cut -d'=' -f2 | cut -d',' -f1)
+echo "Latitude $LAT"
+LATD=$($CONVERTLL_PATH $LAT | grep "d:" | cut -d':' -f2)
+LATM=$($CONVERTLL_PATH $LAT | grep "m:" | cut -d':' -f2)
+LATS=$($CONVERTLL_PATH $LAT | grep "s:" | cut -d':' -f2 | sed 's/\.//' )
+echo "$LATD $LATM $LATS"
+
+LON=$(echo $DATA| tr ' ' '\n' | grep 'lon=' | cut -d'=' -f2 | cut -d',' -f1)
+echo "Longitude : $LON"
+LOND=$($CONVERTLL_PATH $LON| grep "d:" | cut -d':' -f2)
+LONM=$($CONVERTLL_PATH $LON | grep "m:" | cut -d':' -f2)
+LONS=$($CONVERTLL_PATH $LON | grep "s:" | cut -d':' -f2 | sed 's/\.//')
+echo "$LOND $LONM $LONS"
+
+ALTITUDE=$(echo $DATA| tr ' ' '\n' | grep 'alt=' | cut -d'=' -f2 | cut -d',' -f1)
+echo "$ALTITUDE meters ! Wooo so hiiigh !"
+
+# Creation du script pour ajout des données Exif dans le JPG
+cat <<EOF > /ramfs/.conf_exif
+    # Ajouter aux metadatas les informations de geolocalisation
+    # 'add' pour ajouter les informations
+    # 'set' pour remplacer celles déjà exisante
+    # 'del' pour les supprimer (sans préciser de valeur)
+    add Exif.GPSInfo.GPSLatitudeRef ${NS}
+    add Exif.GPSInfo.GPSLatitude ${LATD}/1 ${LATM}/1 ${LATS}/10000
+    add Exif.GPSInfo.GPSLongitudeRef ${EW}
+    add Exif.GPSInfo.GPSLongitude ${LOND}/1 ${LONM}/1 ${LONS}/10000
+EOF
+
+echo $LAT
+if [ "$LAT" == "NO_DATA" ]; then
+	echo "Don't have GPS datas, continue without these datas"
+else
+	exiv2 -m /ramfs/.conf_exif /ramfs/$DATE.jpg
+	exiftool -GPSAltitude=$ALTITUDE /ramfs/$DATE.jpg -overwrite_original
+fi
+
+echo "Picz $DATE.jpg saved in RAM"
+mv /ramfs/$DATE.jpg ~/_Pictures
+echo "Picz $DATE.jpg saved to SDCARD"
+
+echo "$DATE.jpg" > /ramfs/.canbeconvert
+echo "Sleeping... zzzZZZzzZZZzzz..."
+
+}
+
+
+
+raspistill -o /ramfs/$DATE.jpg
+#if [ $? -eq 0 ]; then
+  acquire
+#else
+#  echo "Command failed"
+#fi
+#

BIN
sound/error_camera.wav


BIN
tx_process/.3_transmit.swp


+ 5 - 5
tx_process/0_txmire

@@ -7,16 +7,16 @@ cp /home/pi/BallonSonde/sound/mire.wav /ramfs/totx.wav
 # Setup the GPIO4 as output for Tx
 #raspi-gpio set 4 op && raspi-gpio set 4 dh
 
-#raspi-gpio set 4 dl
-#sleep 1
-#echo " => Playing WAV file"
+raspi-gpio set 4 dl
+sleep 1
+echo " => Playing WAV file"
 #cd ~/trxamadrmv3_7/linux
 #./txwfal 0
 #sleep 1
 #aplay ~/BallonSonde/sound/annonce_start.wav
 #sleep 1
-#aplay /ramfs/totx.wav
+aplay /home/pi/BallonSonde/sound/mire.wav 
 #sleep 1
 #aplay ~/BallonSonde/sound/annonce_stop.wav
-#raspi-gpio set 4 dh
+raspi-gpio set 4 dh
 #

+ 11 - 0
tx_process/easter1

@@ -0,0 +1,11 @@
+          _     _
+         /\`\ /`/\
+         \/\ V /\/
+           /6 6\
+          (= Y =)
+          /`"^"`\
+         / /   \ \
+        (_/     \_)
+         /       \o
+      ___\       /___
+     (((____/^\____)))

+ 12 - 0
tx_process/easter2

@@ -0,0 +1,12 @@
+
+          .=""=.
+         / _  _ \
+        |  d  b  |
+        \   /\   /             ,
+       ,/'-=\/=-'\,    |\   /\/ \/|   ,_
+      / /        \ \   ; \/`     '; , \_',
+     | /          \ |   \        /
+     \/ \        / \/    '.    .'    /`.
+         '.    .'          `~~` , /\ `"`
+         _|`~~`|_              .  `"
+         /|\  /|\

+ 12 - 0
tx_process/easter3

@@ -0,0 +1,12 @@
+
+      /`\   /`\
+     (/\ \-/ /\)
+        )6 6(
+      >{= Y =}<
+       /'-^-'\
+      (_)""-(_).
+     /*  ((*   *'.
+    |   *))  *   *\
+    | *  ((*   *  /
+     \  *))  *  .'
+      '-.((*_.-'

+ 12 - 0
tx_process/easter4

@@ -0,0 +1,12 @@
+           ___     ___
+          /::_\._./_::\
+       _={::(_>[_]<_)::}=_
+     _~   ^--~/:i:\~--^   ~_
+   .d^       /:/ \:\       ^b.
+  .d^       (;/   \;)       ^b.
+  i|  ,___                   |i
+  ii /  /^\  ,___    q&&&p   ii
+  ii \__), ^^ _, \  *+*+*+*  ii
+  |i    / @ @ \\_/ x=X=X=X=x i|
+  ||   { -.x.- }   pXoXoXoXq ||
+ /=============================\

+ 18 - 0
tx_process/easter5

@@ -0,0 +1,18 @@
+                ,@@SSSSs,     ,sSSSSSs,
+                @S;;;;sSs@SSS@sSs;;;;Ss
+                @SSSSSSSs@SSS@sSSSSsSSS        |_|  /| |~> |~> \ /
+             ,|||S@SSSSS'SsssS'SSSSSSS||,      | | /~| |~  |~   |
+          ,||||'' @@SS'.SSS^SSS.`SSSS``||||,
+        ,|||'      "" .SSSs sSSS. ""     `|||,    |_~  /| (~ ~|~ |_~ |~>
+      ,|||'          sSSSS' `SSSSs         `|||,  |__ /~| _)  |  |__ |~\
+     ,||'                                    `||,
+    |||',____                 ,____      ,____`|||   |_~ \ | |_~ |~> \ /
+   |||'/   /~\               /   /~\    /   /~\ |||  |__  \| |__ |~\  |
+   |||/   /   \  |\_/|___   /   /   \  /   /   \|||
+   |||\   )\,."~~|/~\|   \  \   )\,."~~~ ,/ \   )||   |_) | | |\| |\| \ / |
+   ||| ~~~ /  ^   ^ __,"  \  ~~~ /  ^   ^ \  ~~~|||   |_) |_| | | | |  |  .
+   |||    /   @   @  \ \   )    /   @   @  \    |||
+   |||   (      *     ) \__/   ( ^v^  *     )   |||
+   |||    \    ^v^   /."";      \   ^\|/^  /    |||
+   ============================."".=======."".=====
+

BIN
tx_process/filename.wav


+ 28 - 3
tx_process/qpsk31

@@ -1,10 +1,35 @@
 #!/bin/bash
 
 PSK="/home/pi/PSK31-Modulation-WAV-Generator/psk"
-
 GPS=$(/home/pi/BallonSonde/read_nmea.py)
 
-DATA="This is the EasterEGG ! We are actually located at : "$GPS" Please feedback something to me at f4iyq@pi3rrot.net ! <3 Peace !"
+DATA="
+-=-=-=-=-=-=-=-=-=-=-=-=-=
+F4KLN-AM F4KLN-AM
+This is the EasterEGG !
+EasterComputer say that we are approximatively here :
+"$GPS"
+"
+DATA=$DATA$(cat /home/pi/BallonSonde/tx_process/easter$((1 + $RANDOM % 5)))
+
+DATA=$DATA"
+From France, launched near Peyrat-le-Chateau.
+
+Send feedback or something else to me at f4iyq at pi3rrot.net !
+
+Want more ?
+
+Content-Transfer-Encoding: base64
+Q29uZ3JhdHMgZHVkZSAhIExldCdzIHRhbGsgYWJvdXQgbGlmZSwgdGhlIHVuaXZlcnNlIGFuZCB0
+aGUgcmVzdCBhdCBmNGl5cUBwaTNycm90Lm5ldC4gVGVsbCBtZSB0aGUgdW5pdmVyc2FsIGFuc3dl
+ciA7KSBPbmUgbW9yZSB0aW1lIGFuZCBpdCB3aWxsIGJlIHRoZSBsYXN0IC4uLiByZW5kZXIgdG8g
+Q2Flc2FyIHdoYXQgaXMgQ2Flc2FyJ3MgOiBRRUZQIEZQIFFFQiBETExBIFhLUFRCTyBaTEtET1hR
+UCBBUkFCIFZMUk8gUUVCIFlCUFEK
+
+<3 Peace, love, NO WAR !
+F4KLN-AM over.
+-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-$PSK -m qpsk -s 250 -f ~/BallonSonde/tx_process/filename.wav -t "$DATA"
+"
+$PSK -m qpsk -s 500 -f ~/BallonSonde/tx_process/filename.wav -t "$DATA"
 ~/BallonSonde/tx_process/4_tx_file ~/BallonSonde/tx_process/filename.wav