Browse Source

fix things

Pierre Bourdin 1 năm trước cách đây
mục cha
commit
13a6e7cb93
2 tập tin đã thay đổi với 6 bổ sung3 xóa
  1. 1 1
      acquisition_process/1_capture
  2. 5 2
      convert_process/2_convert

+ 1 - 1
acquisition_process/1_capture

@@ -46,7 +46,7 @@ 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 
+	exiftool -GPSAltitude=$ALTITUDE /ramfs/$DATE.jpg -overwrite_original
 fi
 
 echo "Picz $DATE.jpg saved in RAM"

+ 5 - 2
convert_process/2_convert

@@ -25,11 +25,14 @@ echo "=> Converting to PD120 Format <long>x496"
 convert /ramfs/$IMG -resize 660x496^ /ramfs/lit-$IMG
 rm -rf /ramfs/$IMG
 echo "=> Adding annotaion"
-mogrify -format 'jpg' -font Liberation-Sans -fill white -undercolor '#00000080' -pointsize 26 -gravity NorthEast -annotate +10+10 " $(date) - F4KMH - 73 :o) " /ramfs/lit-$IMG
+mogrify -format 'jpg' -font Liberation-Sans -fill white -undercolor '#00000080' -pointsize 24 -gravity NorthEast -annotate +40+10 " Ballon Stratosphérique ENSIL - F4KMH " /ramfs/lit-$IMG
+mogrify -format 'jpg' -font Liberation-Sans -fill white -undercolor '#00000080' -pointsize 24 -gravity NorthEast -annotate +40+50 " $(date "+%a %d %b %y - %X")" /ramfs/lit-$IMG
 
 echo "=> Adding GPS Position"
 GPS_POS=$(exiftool /home/pi/_Pictures/$IMG | grep "GPS Position" | cut -d":" -f2)
-mogrify -format 'jpg' -font Liberation-Sans -fill white -undercolor '#00000080' -pointsize 26 -gravity NorthEast -annotate +20+450 "$GPS_POS" /ramfs/lit-$IMG
+ALTITUDE=$(exiftool /home/pi/_Pictures/$IMG | grep "GPS Altitude" | cut -d":" -f2)
+mogrify -format 'jpg' -font Liberation-Sans -fill white -undercolor '#00000080' -pointsize 24 -gravity NorthEast -annotate +40+410 "Altitude : $ALTITUDE" /ramfs/lit-$IMG
+mogrify -format 'jpg' -font Liberation-Sans -fill white -undercolor '#00000080' -pointsize 24 -gravity NorthEast -annotate +40+450 "$GPS_POS" /ramfs/lit-$IMG
 
 echo " => Converting image to WAV..."
 cd ~/PySSTV/