Merge branch 'batc_staging' into master

pull/61/head
Dave Crump 2016-12-31 18:19:10 +00:00 zatwierdzone przez GitHub
commit 06d3daf8bb
6 zmienionych plików z 9 dodań i 16 usunięć

Wyświetl plik

@ -3,7 +3,7 @@
**rpidatv** is a digital television transmitter for Raspberry Pi (B,B+,PI2,PI3,Pizero) which outputs directly to GPIO. This version has been developed for use with an external synthesized oscillator and modulator/filter board.
*(Created by Evariste Courjaud F5OEO. Code is GPL)*
# Installation for BATC Version
# Installation for BATC Portsdown Transmitter Version
The preferred installation method only needs a Windows PC connected to the same (internet-connected) network as your Raspberry Pi.
@ -22,7 +22,7 @@ The preferred installation method only needs a Windows PC connected to the same
- Log in (user: pi/password: raspberry) then cut and paste the following code in, one line at a time:
```sh
wget https://raw.githubusercontent.com/davecrump/rpidatv/master/install.sh
wget https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/install.sh
chmod +x install.sh
./install.sh
```

Wyświetl plik

@ -1,7 +0,0 @@
#rpidatv Quick install
```sh
$ wget https://raw.githubusercontent.com/F5OEO/rpidatv/master/install.sh
$ chmod +x install.sh
$ ./install.sh
```

Wyświetl plik

@ -1,6 +1,6 @@
#!/bin/bash
# Updated by davecrump on 20161208
# Updated by davecrump on 20161221
set -e # Don't report errors....
@ -17,7 +17,7 @@ sudo rpi-update
# Get the source software and copy to the Pi
cd /home/pi
wget https://github.com/davecrump/rpidatv/archive/master.zip
wget https://github.com/BritishAmateurTelevisionClub/rpidatv/archive/master.zip
unzip -o master.zip
mv rpidatv-master rpidatv
rm master.zip

Wyświetl plik

@ -3,7 +3,7 @@
## Download the latest_version file and convert it to a variable
cd /home/pi/rpidatv/scripts
rm /home/pi/rpidatv/scripts/latest_version.txt >/dev/null 2>/dev/null
wget -q https://raw.githubusercontent.com/davecrump/rpidatv/master/scripts/latest_version.txt
wget -q https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/scripts/latest_version.txt
LATESTVERSION=$(head -c 9 latest_version.txt)
rm /home/pi/rpidatv/scripts/latest_version.txt >/dev/null 2>/dev/null
@ -29,7 +29,7 @@ then
printf "\nUpgrading now...\n"
cd /home/pi
rm update.sh >/dev/null 2>/dev/null
wget -q https://raw.githubusercontent.com/davecrump/rpidatv/master/update.sh
wget -q https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/update.sh
chmod +x update.sh
source /home/pi/update.sh
exit

Wyświetl plik

@ -1 +1 @@
201612310
201612310

Wyświetl plik

@ -1,6 +1,6 @@
#!/bin/bash
# Updated by davecrump 20161220
# Updated by davecrump 20161221
# Modified to overwrite ~/rpidatv/scripts and
# ~/rpidatv/src, then compile
@ -27,7 +27,7 @@ fi
# ---------- Update rpidatv -----------
cd /home/pi
wget -q https://github.com/davecrump/rpidatv/archive/master.zip -O master.zip
wget -q https://github.com/BritishAmateurTelevisionClub/rpidatv/archive/master.zip -O master.zip
unzip -o master.zip
# cp -f -r rpidatv-master/bin rpidatv
# cp -f -r rpidatv-master/doc rpidatv