Browse Source

added ppm error config

pull/131/head
Pascal 3 years ago
parent
commit
bc5d63d8be
3 changed files with 11 additions and 4 deletions
  1. +8
    -2
      receive.sh
  2. +1
    -1
      receive_meteor.sh
  3. +2
    -1
      test_reception.sh

+ 8
- 2
receive.sh View File

@@ -31,7 +31,7 @@ fi
# $7 = Satellite max elevation # $7 = Satellite max elevation


log "Starting rtl_fm record" "INFO" log "Starting rtl_fm record" "INFO"
timeout "${6}" /usr/local/bin/rtl_fm ${BIAS_TEE} -f "${2}"M -s 60k $GAIN -E wav -E deemp -F 9 - | /usr/bin/sox -t raw -e signed -c 1 -b 16 -r 60000 - "${RAMFS_AUDIO}/audio/${3}.wav" rate 11025
timeout "${6}" /usr/local/bin/rtl_fm ${BIAS_TEE} -f "${2}"M -s 60k $GAIN -p $PPM_ERROR -E wav -E deemp -F 9 - | /usr/bin/sox -t raw -e signed -c 1 -b 16 -r 60000 - "${RAMFS_AUDIO}/audio/${3}.wav" rate 11025


if [ "${SUN_ELEV}" -gt "${SUN_MIN_ELEV}" ]; then if [ "${SUN_ELEV}" -gt "${SUN_MIN_ELEV}" ]; then
ENHANCEMENTS="ZA MCIR MCIR-precip MSA MSA-precip HVC-precip HVCT-precip HVC HVCT" ENHANCEMENTS="ZA MCIR MCIR-precip MSA MSA-precip HVC-precip HVCT-precip HVC HVCT"
@@ -41,7 +41,7 @@ else
daylight="false" daylight="false"
fi fi


log "Bulding pass map" "INFO"
log "Bulding pass map wxtoimg " "INFO"
/usr/local/bin/wxmap -T "${1}" -H "${4}" -p 0 -l 0 -o "${PASS_START}" "${NOAA_HOME}/map/${3}-map.png" /usr/local/bin/wxmap -T "${1}" -H "${4}" -p 0 -l 0 -o "${PASS_START}" "${NOAA_HOME}/map/${3}-map.png"
for i in $ENHANCEMENTS; do for i in $ENHANCEMENTS; do
log "Decoding image" "INFO" log "Decoding image" "INFO"
@@ -50,6 +50,12 @@ for i in $ENHANCEMENTS; do
/usr/bin/convert -thumbnail 300 "${NOAA_OUTPUT}/images/${3}-$i.jpg" "${NOAA_OUTPUT}/images/thumb/${3}-$i.jpg" /usr/bin/convert -thumbnail 300 "${NOAA_OUTPUT}/images/${3}-$i.jpg" "${NOAA_OUTPUT}/images/thumb/${3}-$i.jpg"
done done


log "Building noaa-apt maps"
noaa-apt "${RAMFS_AUDIO}/audio/${3}.wav" -R auto -m yes -o "${NOAA_OUTPUT}/images/${3}-noaa-apt.png"
/usr/bin/convert -quality 98 -format jpg "${NOAA_OUTPUT}/images/${3}-noaa-apt.png" -undercolor black -fill yellow -pointsize 18 -annotate +20+20 "${1} $i ${START_DATE} Elev: $7°" "${NOAA_OUTPUT}/images/${3}-noaa-apt.jpg"
/usr/bin/convert -thumbnail 300 "${NOAA_OUTPUT}/images/${3}-noaa-apt.jpg" "${NOAA_OUTPUT}/images/thumb/${3}-noaa-apt.jpg"


rm "${NOAA_HOME}/map/${3}-map.png" rm "${NOAA_HOME}/map/${3}-map.png"


if [ "${SUN_ELEV}" -gt "${SUN_MIN_ELEV}" ]; then if [ "${SUN_ELEV}" -gt "${SUN_MIN_ELEV}" ]; then


+ 1
- 1
receive_meteor.sh View File

@@ -43,7 +43,7 @@ fi
# $7 = Satellite max elevation # $7 = Satellite max elevation


log "Starting rtl_fm record" "INFO" log "Starting rtl_fm record" "INFO"
timeout "${6}" /usr/local/bin/rtl_fm ${BIAS_TEE} -M raw -f "${2}"M -s 288k $GAIN | sox -t raw -r 288k -c 2 -b 16 -e s - -t wav "${RAMFS_AUDIO}/audio/${3}.wav" rate 96k
timeout "${6}" /usr/local/bin/rtl_fm ${BIAS_TEE} -p $PPM_ERROR -M raw -f "${2}"M -s 288k $GAIN | sox -t raw -r 288k -c 2 -b 16 -e s - -t wav "${RAMFS_AUDIO}/audio/${3}.wav" rate 96k


log "Demodulation in progress (QPSK)" "INFO" log "Demodulation in progress (QPSK)" "INFO"
[ $1 = "METEOR-M2 2"] && demod_extra="-m opsk" [ $1 = "METEOR-M2 2"] && demod_extra="-m opsk"


+ 2
- 1
test_reception.sh View File

@@ -40,6 +40,7 @@ echo "$(tput setaf 2)
$(tput sgr0) $(tput sgr0)
" "


rtl_fm ${BIAS_TEE} -f "$1M" -s 256k -g 48 -p 55 -E deemp -F 9 - \
echo "rtl_fm ${BIAS_TEE} -f "$1M" -s 256k $GAIN -p $PPM_ERROR -E deemp -F 9 -"
rtl_fm ${BIAS_TEE} -f "$1M" -s 256k $GAIN -p $PPM_ERROR -E deemp -F 9 - \
| sox -traw -r256k -es -b16 -c1 -V1 - -tmp3 - \ | sox -traw -r256k -es -b16 -c1 -V1 - -tmp3 - \
| socat -u - TCP-LISTEN:8073 1>/dev/null | socat -u - TCP-LISTEN:8073 1>/dev/null

Loading…
Cancel
Save