Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GPIO5 activation during TX #43

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

GPIO5 activation during TX #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3055fac
Update wspr.cpp
IZ7BOJ Mar 1, 2021
9ea269f
Update wxpr.cpp
IZ7BOJ Mar 2, 2021
b82dd37
Fix compile error in GCC7.1
IZ7BOJ Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mailbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/stat.h>

#include <sys/sysmacros.h>
#include "mailbox.h"

#define PAGE_SIZE (4*1024)
Expand Down
45 changes: 40 additions & 5 deletions wspr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ volatile unsigned *peri_base_virt = NULL;

// The following are all bus addresses.
#define GPIO_BUS_BASE (0x7E200000)
//added for TX SWITCH
#define GPIO_SET_BASE (0x7E20001c)
#define GPIO_CLR_BASE (0x7E200028)
#define CM_GP0CTL_BUS (0x7e101070)
#define CM_GP0DIV_BUS (0x7e101074)
#define PADS_GPIO_0_27_BUS (0x7e10002c)
Expand Down Expand Up @@ -317,6 +320,12 @@ void txon() {
SETBIT_BUS_ADDR(GPIO_BUS_BASE , 14);
CLRBIT_BUS_ADDR(GPIO_BUS_BASE , 13);
CLRBIT_BUS_ADDR(GPIO_BUS_BASE , 12);

//GPIO 5 USED FOR TX SWITCH
//SET AS OUTPUT
CLRBIT_BUS_ADDR(GPIO_BUS_BASE , 17);
CLRBIT_BUS_ADDR(GPIO_BUS_BASE , 16);
SETBIT_BUS_ADDR(GPIO_BUS_BASE , 15);

// Set GPIO drive strength, more info: http://www.scribd.com/doc/101830961/GPIO-Pads-Control2
//ACCESS_BUS_ADDR(PADS_GPIO_0_27_BUS) = 0x5a000018 + 0; //2mA -3.4dBm
Expand All @@ -336,13 +345,18 @@ void txon() {
// Enable clock.
setupword = {6/*SRC*/, 1, 0, 0, 0, 3,0x5a};
ACCESS_BUS_ADDR(CM_GP0CTL_BUS) = *((int*)&setupword);

// TX SWITCH HIGH
SETBIT_BUS_ADDR(GPIO_SET_BASE , 5);
}

// Turn transmitter on
// Turn transmitter off
void txoff() {
//struct GPCTL setupword = {6/*SRC*/, 0, 0, 0, 0, 1,0x5a};
//ACCESS_BUS_ADDR(CM_GP0CTL_BUS) = *((int*)&setupword);
disable_clock();
//TX SWITCH LOW
SETBIT_BUS_ADDR(GPIO_CLR_BASE , 5);
}

// Transmit symbol sym for tsym seconds.
Expand Down Expand Up @@ -731,6 +745,7 @@ void print_usage() {
std::cout << " Do not use NTP to correct frequency error of RPi crystal." << std::endl;
std::cout << " -r --repeat" << std::endl;
std::cout << " Repeatedly, and in order, transmit on all the specified command line freqs." << std::endl;
std::cout << " -d --txdelay <msec> delay time in msec from GPIO 5 activation and start of TX>" << std::endl;
std::cout << " -x --terminate <n>" << std::endl;
std::cout << " Terminate after n transmissions have been completed." << std::endl;
std::cout << " -o --offset" << std::endl;
Expand Down Expand Up @@ -765,6 +780,7 @@ void parse_commandline(
double & ppm,
bool & self_cal,
bool & repeat,
int & txdelay,
bool & random_offset,
double & test_tone,
bool & no_delay,
Expand All @@ -775,6 +791,7 @@ void parse_commandline(
ppm=0;
self_cal=true;
repeat=false;
txdelay=0;
random_offset=false;
test_tone=NAN;
no_delay=false;
Expand All @@ -787,7 +804,8 @@ void parse_commandline(
{"self-calibration", no_argument, 0, 's'},
{"free-running", no_argument, 0, 'f'},
{"repeat", no_argument, 0, 'r'},
{"terminate", required_argument, 0, 'x'},
{"txdelay", required_argument, 0, 'd'},
{"terminate", required_argument, 0, 'x'},
{"offset", no_argument, 0, 'o'},
{"test-tone", required_argument, 0, 't'},
{"no-delay", no_argument, 0, 'n'},
Expand All @@ -797,7 +815,7 @@ void parse_commandline(
while (true) {
/* getopt_long stores the option index here. */
int option_index = 0;
int c = getopt_long (argc, argv, "hp:sfrx:ot:n",
int c = getopt_long (argc, argv, "hp:sfrd:x:ot:n",
long_options, &option_index);
if (c == -1)
break;
Expand Down Expand Up @@ -830,7 +848,18 @@ void parse_commandline(
case 'r':
repeat=true;
break;
case 'x':
case 'd':
txdelay=strtol(optarg,&endp,10);
if ((optarg==endp)||(*endp!='\0')) {
std::cerr << "Error: could not parse txdelay value" << std::endl;
ABORT(-1);
}
if (txdelay<0) {
std::cerr << "Error: txdelay parameter must be >= 0" << std::endl;
ABORT(-1);
}
break;
case 'x':
terminate=strtol(optarg,&endp,10);
if ((optarg==endp)||(*endp!='\0')) {
std::cerr << "Error: could not parse termination argument" << std::endl;
Expand Down Expand Up @@ -987,6 +1016,9 @@ void parse_commandline(
}
if (random_offset) {
temp << " A small random frequency offset will be added to all transmissions" << std::endl;
}
if (txdelay>0) {
temp << " TX delay: " << txdelay << " milliseconds." << std::endl;
}
if (temp.str().length()) {
std::cout << "Extra options:" << std::endl;
Expand Down Expand Up @@ -1149,6 +1181,7 @@ int main(const int argc, char * const argv[]) {
double ppm;
bool self_cal;
bool repeat;
int txdelay;
bool random_offset;
double test_tone;
bool no_delay;
Expand All @@ -1164,6 +1197,7 @@ int main(const int argc, char * const argv[]) {
ppm,
self_cal,
repeat,
txdelay,
random_offset,
test_tone,
no_delay,
Expand Down Expand Up @@ -1299,7 +1333,8 @@ int main(const int argc, char * const argv[]) {
struct timeval sym_start;
struct timeval diff;
int bufPtr=0;
txon();
txon();
usleep(txdelay*1000);
for (int i = 0; i < 162; i++) {
gettimeofday(&sym_start,NULL);
timeval_subtract(&diff, &sym_start, &tvBegin);
Expand Down