From 3dbeeb67a807d2bc49b8df1cea1530d347122b9e Mon Sep 17 00:00:00 2001 From: Pascal Date: Sat, 30 Jan 2021 15:10:46 +0000 Subject: [PATCH] Perhaps Meteor M2-2 possible --- receive.sh | 2 +- receive_meteor.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/receive.sh b/receive.sh index bce8a50..76cee35 100755 --- a/receive.sh +++ b/receive.sh @@ -46,7 +46,7 @@ log "Bulding pass map" "INFO" for i in $ENHANCEMENTS; do log "Decoding image" "INFO" /usr/local/bin/wxtoimg -o -m "${NOAA_HOME}/map/${3}-map.png" -e "$i" "${RAMFS_AUDIO}/audio/${3}.wav" "${NOAA_OUTPUT}/images/${3}-$i.jpg" - /usr/bin/convert -quality 90 -format jpg "${NOAA_OUTPUT}/images/${3}-$i.jpg" -undercolor black -fill yellow -pointsize 18 -annotate +20+20 "${1} $i ${START_DATE} Elev: $7°" "${NOAA_OUTPUT}/images/${3}-$i.jpg" + /usr/bin/convert -quality 98 -format jpg "${NOAA_OUTPUT}/images/${3}-$i.jpg" -undercolor black -fill yellow -pointsize 18 -annotate +20+20 "${1} $i ${START_DATE} Elev: $7°" "${NOAA_OUTPUT}/images/${3}-$i.jpg" /usr/bin/convert -thumbnail 300 "${NOAA_OUTPUT}/images/${3}-$i.jpg" "${NOAA_OUTPUT}/images/thumb/${3}-$i.jpg" done diff --git a/receive_meteor.sh b/receive_meteor.sh index 12b5c0b..029b860 100755 --- a/receive_meteor.sh +++ b/receive_meteor.sh @@ -46,7 +46,8 @@ 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 log "Demodulation in progress (QPSK)" "INFO" -meteor_demod -B -o "${METEOR_OUTPUT}/${3}.qpsk" "${RAMFS_AUDIO}/audio/${3}.wav" +[ $1 = "METEOR-M2 2"] && demod_extra="-m opsk" +meteor_demod $demod_extra -B -o "${METEOR_OUTPUT}/${3}.qpsk" "${RAMFS_AUDIO}/audio/${3}.wav" if [ "$DELETE_AUDIO" = true ]; then log "Deleting audio files" "INFO" @@ -59,7 +60,8 @@ else fi log "Decoding in progress (QPSK to BMP)" "INFO" -medet_arm "${METEOR_OUTPUT}/${3}.qpsk" "${METEOR_OUTPUT}/${3}" -cd +[ $1 = "METEOR-M2 2"] && medet_extra="-diff" +medet_arm $medet_extra "${METEOR_OUTPUT}/${3}.qpsk" "${METEOR_OUTPUT}/${3}" -cd rm "${METEOR_OUTPUT}/${3}.qpsk"