mirror
/
adsb-receiver
kopia lustrzana https://github.com/jprochazka/adsb-receiver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Formatting updates to OGN and HAB decoders

pull/334/head
Romeo-Golf 2016-12-30 21:40:24 +00:00
rodzic 2629289681
commit 9269188071
1 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
bash/decoders/rtlsdr-ogn.sh
Wyświetl plik

@ -258,37 +258,37 @@ if [[ ${TUNER_COUNT} -gt 1 ]] ; then
if [[ -n ${OGN_DEVICE_SERIAL} ]] ; then if [[ -n ${OGN_DEVICE_SERIAL} ]] ; then
for DEVICE_ID in `seq 0 ${TUNER_COUNT}` ; do for DEVICE_ID in `seq 0 ${TUNER_COUNT}` ; do
if [[ `rtl_eeprom -d ${DEVICE_ID} 2>&1 | grep -c "Serial number:\s*${OGN_DEVICE_SERIAL}$" ` -eq 1 ]] ; then if [[ `rtl_eeprom -d ${DEVICE_ID} 2>&1 | grep -c "Serial number:\s*${OGN_DEVICE_SERIAL}$" ` -eq 1 ]] ; then
echo -en "\e[33m RTL-SDR with Serial \"${OGN_DEVICE_SERIAL}\" found at device \"${OGN_DEVICE_ID}\" and will be assigned to ${DECODER_NAME}...\e [97m" echo -en "\e[33m RTL-SDR with Serial \"${OGN_DEVICE_SERIAL}\" found at device \"${OGN_DEVICE_ID}\" and will be assigned to ${DECODER_NAME}...\e[97m\t"
OGN_DEVICE_ID=${DEVICE_ID} OGN_DEVICE_ID=${DEVICE_ID}
fi fi
done done
# If no match for this serial then assume the highest numbered tuner will be used. # If no match for this serial then assume the highest numbered tuner will be used.
if [[ -z ${OGN_DEVICE_ID} ]] ; then if [[ -z ${OGN_DEVICE_ID} ]] ; then
echo -en "\e[33m RTL-SDR with Serial \"${OGN_DEVICE_SERIAL}\" not found, assigning device \"${TUNER_COUNT}\" to ${DECODER_NAME}...\e [97m" echo -en "\e[33m RTL-SDR with Serial \"${OGN_DEVICE_SERIAL}\" not found, assigning device \"${TUNER_COUNT}\" to ${DECODER_NAME}...\e[97m\t"
OGN_DEVICE_ID=${TUNER_COUNT} OGN_DEVICE_ID=${TUNER_COUNT}
fi fi
# Or if a device has been specified by device ID then confirm this is currently detected. # Or if a device has been specified by device ID then confirm this is currently detected.
elif [[ -n ${OGN_DEVICE_ID} ]] ; then elif [[ -n ${OGN_DEVICE_ID} ]] ; then
if [[ `rtl_eeprom -d ${OGN_DEVICE_ID} 2>&1 | grep -c "^\s*${OGN_DEVICE_ID}:\s"` -eq 1 ]] ; then if [[ `rtl_eeprom -d ${OGN_DEVICE_ID} 2>&1 | grep -c "^\s*${OGN_DEVICE_ID}:\s"` -eq 1 ]] ; then
echo -en "\e[33m RTL-SDR device \"${OGN_DEVICE_ID}\" found and will be assigned to ${DECODER_NAME}...\e [97m" echo -en "\e[33m RTL-SDR device \"${OGN_DEVICE_ID}\" found and will be assigned to ${DECODER_NAME}...\e[97m\t"
# If no match for this serial then assume the highest numbered tuner will be used. # If no match for this serial then assume the highest numbered tuner will be used.
else else
echo -en "\e[33m RTL-SDR device \"${OGN_DEVICE_ID}\" not found, assigning device \"${TUNER_COUNT}\" to ${DECODER_NAME}...\e [97m" echo -en "\e[33m RTL-SDR device \"${OGN_DEVICE_ID}\" not found, assigning device \"${TUNER_COUNT}\" to ${DECODER_NAME}...\e[97m\t"
OGN_DEVICE_ID=${TUNER_COUNT} OGN_DEVICE_ID=${TUNER_COUNT}
fi fi
# Failing that configure it with device ID 0. # Failing that configure it with device ID 0.
else else
echo -en "\e[33m No RTL-SDR device specified, assigning device \"0\" to ${DECODER_NAME}...\e [97m" echo -en "\e[33m No RTL-SDR device specified, assigning device \"0\" to ${DECODER_NAME}...\e[97m\t"
OGN_DEVICE_ID=${TUNER_COUNT} OGN_DEVICE_ID=${TUNER_COUNT}
fi fi
# Single tuner present so assign device 0 and stop any other running decoders, or at least dump1090-mutablity for a default install. # Single tuner present so assign device 0 and stop any other running decoders, or at least dump1090-mutablity for a default install.
elif [[ ${TUNER_COUNT} -eq 1 ]] ; then elif [[ ${TUNER_COUNT} -eq 1 ]] ; then
echo -en "\e[33m Single RTL-SDR device \"0\" detected and assigned to ${DECODER_NAME}...\e [97m" echo -en "\e[33m Single RTL-SDR device \"0\" detected and assigned to ${DECODER_NAME}...\e[97m\t"
OGN_DEVICE_ID="0" OGN_DEVICE_ID="0"
sudo /etc/init.d/dump1090-mutability stop > /dev/null 2>&1 sudo /etc/init.d/dump1090-mutability stop > /dev/null 2>&1
# No tuners present so assign device 0 and stop any other running decoders, or at least dump1090-mutablity for a default install. # No tuners present so assign device 0 and stop any other running decoders, or at least dump1090-mutablity for a default install.
elif [[ ${TUNER_COUNT} -lt 1 ]] ; then elif [[ ${TUNER_COUNT} -lt 1 ]] ; then
echo -en "\e[33m No RTL-SDR device detected so ${DECODER_NAME} will be assigned device \"0\"...\e [97m" echo -en "\e[33m No RTL-SDR device detected so ${DECODER_NAME} will be assigned device \"0\"...\e[97m\t"
OGN_DEVICE_ID="0" OGN_DEVICE_ID="0"
sudo /etc/init.d/dump1090-mutability stop > /dev/null 2>&1 sudo /etc/init.d/dump1090-mutability stop > /dev/null 2>&1
fi fi