From f0fce1e680d211c7e420c20b875a49674dd3bb5c Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Thu, 19 Jan 2017 23:34:12 +0000 Subject: [PATCH 01/11] Correct Typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ed71af..2e89637 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Then reboot, and try again. The comnmand asks your RPi to use Google's DNS, not ```sh /home/pi/rpidatv/scripts/menu.sh menu -... +``` When you reboot and log-in on the computer, the BATC logo should display on the Waveshare touchscreen and the Console Menu should be displayed on the computer. You do not need to load any touchscreen drivers- if the touchscreen does not work try powering off and on again. If your touchscreen appears as if the touch sense is 90 degrees out, try selecting the TonTec display in the Setup menu. From 23a8a6c1d465286beedb4015d002db5c9961deb6 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Fri, 20 Jan 2017 14:36:05 +0000 Subject: [PATCH 02/11] Add text about Security Warning from Putty --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e89637..0baecf3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The preferred installation method only needs a Windows PC connected to the same - Find the IP address of your Raspberry Pi using an IP Scanner (such as Advanced IP Scanner http://filehippo.com/download_advanced_ip_scanner/ for Windows, or Fing on an iPhone) to get the Pi's IP address -- From your windows PC use Putty (http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) to log in to the IP address that you noted earlier. +- From your windows PC use Putty (http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) to log in to the IP address that you noted earlier. You will get a Security warning the first time you try; this is normal. - Log in (user: pi/password: raspberry) then cut and paste the following code in, one line at a time: From 05132595b3c573ea1776fe84e96b05d4da47a6c5 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Tue, 24 Jan 2017 12:34:54 +0000 Subject: [PATCH 03/11] Add note about hidden extensions in Windows --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0baecf3..ed36fc2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The preferred installation method only needs a Windows PC connected to the same - Unzip the image and then transfer it to a Micro-SD Card using Win32diskimager https://sourceforge.net/projects/win32diskimager/ -- Before you remove the card from your Windows PC, look at the card with windows explorer; the volume should be labelled "boot". Create a new empty file called ssh in the top-level (root) directory by right-clicking, selecting New, Text Document, and then change the name to ssh (not ssh.txt). You should get a window warning about changing the filename extension. Click OK. If you do not get this warning, you have created a file called ssh.txt and you need to rename it ssh. +- Before you remove the card from your Windows PC, look at the card with windows explorer; the volume should be labelled "boot". Create a new empty file called ssh in the top-level (root) directory by right-clicking, selecting New, Text Document, and then change the name to ssh (not ssh.txt). You should get a window warning about changing the filename extension. Click OK. If you do not get this warning, you have created a file called ssh.txt and you need to rename it ssh. IMPORTANT NOTE: by default, Windows (all versions) hides the .txt extension on the ssh file. To change this, in Windows Explorer, select File, Options, click the View tab, and then untick "Hide extensions for known file types". Then click OK. - If you have a Pi Camera and/or touchscreen display, you can connect them now. Power up the Pi with the new card inserted, and a network connection. Do not connect a keyboard or HDMI display to the Raspberry Pi. From 32e407e1f29e43111002070cd8c4ab83a07db271 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Sat, 28 Jan 2017 16:41:40 +0000 Subject: [PATCH 04/11] Update Introduction to state RPi 3 Required --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ed36fc2..acdbd5b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ![rpidatv banner](/doc/img/spectreiq.jpg) # rpidatv -**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)* +**rpidatv** is a digital television transmitter for Raspberry Pi 3. The core of the transmitter was written by Evariste Courjaud F5OEO and is maintained by him. This version has been developed by a team of BATC members for use with an external synthesized oscillator and modulator/filter board to produce a signal suitable for driving a high power amateur television transmitter on the 146, 432 or 1296 MHz bands. The idea is that the design should be reproducible by someone who has never used Linux before. Detailed instructions on loading the software are listed below, and further details of the complete transmitter design and build are on the BATC Wiki at https://wiki.batc.tv/The_Portsdown_Transmitter. There is a Forum for discussion of the project here: http://www.batc.org.uk/forum/viewforum.php?f=103 + +Our thanks to Evariste and all the other contributors to this community project. All code within the project is GPL. # Installation for BATC Portsdown Transmitter Version @@ -19,7 +20,7 @@ The preferred installation method only needs a Windows PC connected to the same - From your windows PC use Putty (http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) to log in to the IP address that you noted earlier. You will get a Security warning the first time you try; this is normal. -- Log in (user: pi/password: raspberry) then cut and paste the following code in, one line at a time: +- 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/BritishAmateurTelevisionClub/rpidatv/master/install.sh From 9325a09f35014631285e34df8d4367fadc98706e Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Sat, 28 Jan 2017 16:45:07 +0000 Subject: [PATCH 05/11] 201701280 - Fix adf4351.c compile issue --- update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 09580d4..7c98f97 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Updated by davecrump 201701270 +# Updated by davecrump 201701280 # Modified to overwrite ~/rpidatv/scripts and # ~/rpidatv/src, then compile @@ -62,6 +62,7 @@ sudo make install #install adf4351 cd /home/pi/rpidatv/src/adf4351 +touch adf4351.c make cp adf4351 ../../bin/ cd /home/pi From e8bb41fdd9b6b7612d6a16760832128aaf7243a0 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Sat, 28 Jan 2017 16:48:48 +0000 Subject: [PATCH 06/11] 201701280 Correct adf4351 issue --- scripts/latest_version.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/latest_version.txt b/scripts/latest_version.txt index fd1a043..4e5bd59 100644 --- a/scripts/latest_version.txt +++ b/scripts/latest_version.txt @@ -1,2 +1 @@ -201701270 - +201701280 From 684926b51cf2fef48318668825f6ee4331cca0b4 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Sat, 28 Jan 2017 16:56:01 +0000 Subject: [PATCH 07/11] 20170128 Upgrade added --- version_history.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/version_history.txt b/version_history.txt index 5bca524..ddf27dc 100644 --- a/version_history.txt +++ b/version_history.txt @@ -1,3 +1,15 @@ +201701280 +Corrected a bug in the upgrade script that did not enable the new ADF4351 functionality + +201701270 +Changed ADF4351 control so that the reference frequency and power for each +band could be set from the advanced setup menu. +Ensured that band switching was activated at switch-on and frequency change. +Corrected the carrier and null-test mode selections. +Added more information about current selections to the top-level console menu +Added more detail to the Advanced set-up menu selections in preparation for future functionality. + + 20170123 Added Advanced Setup Menu to console Added script to display Micro-SD Card Details including serial number From 9b5933b29fe9414266ca5cf1e28aae286a472952 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Sat, 28 Jan 2017 16:59:45 +0000 Subject: [PATCH 08/11] 201701280 Correct ADF4351 Issue --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index af97e9e..1c60dab 100755 --- a/install.sh +++ b/install.sh @@ -50,6 +50,7 @@ sudo make install # Compile adf4351 cd /home/pi/rpidatv/src/adf4351 +touch adf4351.c make cp adf4351 ../../bin/ From a1837d081ab3bb3aa15ada1b5a77a263d13cd482 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Wed, 1 Feb 2017 10:22:04 +0000 Subject: [PATCH 09/11] Allow wget to echo errors --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 7c98f97..1f0aeef 100755 --- a/update.sh +++ b/update.sh @@ -27,7 +27,7 @@ fi # ---------- Update rpidatv ----------- cd /home/pi -wget -q https://github.com/BritishAmateurTelevisionClub/rpidatv/archive/master.zip -O master.zip +wget 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 From 8a002d4012bc2d60479f4b380bcddd353d344859 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Wed, 1 Feb 2017 10:24:57 +0000 Subject: [PATCH 10/11] Allow wget to echo errors --- scripts/check_for_update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/check_for_update.sh b/scripts/check_for_update.sh index 54f5a68..6e24200 100755 --- a/scripts/check_for_update.sh +++ b/scripts/check_for_update.sh @@ -3,7 +3,7 @@ ## Download the latest_version file cd /home/pi/rpidatv/scripts rm /home/pi/rpidatv/scripts/latest_version.txt >/dev/null 2>/dev/null -wget --timeout=2 -q https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/scripts/latest_version.txt +wget --timeout=2 https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/scripts/latest_version.txt ## Create the file if it doesn't exist if [ ! -f "latest_version.txt" ]; then @@ -51,7 +51,7 @@ then printf "\nUpgrading now...\n" cd /home/pi rm update.sh >/dev/null 2>/dev/null - wget -q https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/update.sh + wget https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/update.sh chmod +x update.sh source /home/pi/update.sh exit @@ -73,7 +73,7 @@ then printf "\nUpgrading now...\n" cd /home/pi rm update.sh >/dev/null 2>/dev/null - wget -q https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/update.sh + wget https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/master/update.sh chmod +x update.sh source /home/pi/update.sh exit From 5cb5f53e631b5174d566f9b9ec5ed3d9bc464ec4 Mon Sep 17 00:00:00 2001 From: Dave Crump Date: Thu, 2 Feb 2017 16:21:29 +0000 Subject: [PATCH 11/11] General information Update --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index acdbd5b..a532bd3 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,15 @@ Then reboot, and try again. The comnmand asks your RPi to use Google's DNS, not /home/pi/rpidatv/scripts/menu.sh menu ``` -When you reboot and log-in on the computer, the BATC logo should display on the Waveshare touchscreen and the Console Menu should be displayed on the computer. You do not need to load any touchscreen drivers- if the touchscreen does not work try powering off and on again. If your touchscreen appears as if the touch sense is 90 degrees out, try selecting the TonTec display in the Setup menu. +When you reboot and log-in on the computer, the BATC logo should display on the Waveshare touchscreen and the Console Menu should be displayed on the computer. You do not need to load any touchscreen drivers - if the touchscreen does not work try powering off and on again. If your touchscreen appears as if the touch sense is 90 degrees out, try selecting the TonTec display in the Setup menu. -I succeeded in generating a direct RF output (from GPIO pin 32) on 437 MHz at 333KS using the on-board camera as the source; it would not work reliably at higher SRs. +I succeeded in generating a direct RF output (from GPIO pin 32) on 437 MHz at 333KS using the on-board camera as the source; direct RF output does not work reliably at higher SRs. + +Advanced notes: To load the development and staging versions, use the following lines: +```sh +wget https://raw.githubusercontent.com/davecrump/rpidatv/master/install.sh #OR# +wget https://raw.githubusercontent.com/BritishAmateurTelevisionClub/rpidatv/batc_staging/install.sh +chmod +x install.sh +./install.sh -d #OR# +./install.sh -s +```