Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Branko Vukelic committed Sep 7, 2016
2 parents 3b1dded + dff50e8 commit f986a39
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
8 changes: 7 additions & 1 deletion bin/demod.sh
Expand Up @@ -22,9 +22,15 @@ get_radio() {
[ "$nradios" = 1 ] && echo "$radios"
}

delmod() {
modname="$1"
echo "Attempting to remove driver '$modname'"
sudo rmmmod -f "$modname"
}

killmod() {
modname="$1"
lsmod | grep -q "$modname" && rmmod -f "$modname"
lsmod | grep -q "$modname" && delmod "$modname"
}

rtlsdr_demod() {
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Expand Up @@ -60,7 +60,7 @@
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
release = '1.0a6'
release = '1.0a7'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions docs/source/intro.rst
@@ -1,9 +1,9 @@
Introduction
============

The files that are datacast by Outernet are encoded, modulated, and sent to
The files that are datacast by Outernet are encoded, modulated, and uplinked to
several Inmarsat satellites. These satellites transmit the radio waves in the
`L band frequency range <https://en.wikipedia.org/wiki/L_band>`_. The waves are
`L-band frequency range <https://en.wikipedia.org/wiki/L_band>`_. The waves are
received by a radio on your receiver and then passed on to the software
demodulator. The demodulator turns the analog signal into bits and then passes
them onto the decoder, which extracts the file information from the data and
Expand Down Expand Up @@ -37,5 +37,5 @@ to you as an exercise.
In a proper Outernet receiver, there are usually a few more components, like
the web-based user interface software. Since the purpose of such software is to
provide access to files from outside the receiver, they will not be covered in
this guide. It is assumed that, on a regular desktop Linux, user will have
this guide. It is assumed that, on regular desktop Linux, the user will have
enough options for getting access to files locally.
4 changes: 2 additions & 2 deletions docs/source/requirements.rst
Expand Up @@ -7,8 +7,8 @@ virtual machine.
In order to follow this guide, you will need:

- RTL-SDR USB dongle
- LNA
- patch antenna
- LNA (low noise amplifier)
- Patch antenna
- Internet connection
- Basic familiarity with the Linux command line shell

Expand Down
2 changes: 1 addition & 1 deletion installer.sh
Expand Up @@ -8,7 +8,7 @@ RULES="/etc/udev/rules.d/99-sdr.rules"
ONDD_VERSION=2.2.0
SDR100_VERSION=1.0.4
INST_STYLE="normal"
VERSION="1.0a6"
VERSION="1.0a7"

inst_file() {
mode="$1"
Expand Down

0 comments on commit f986a39

Please sign in to comment.