1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-22 23:43:43 +02:00

atrf-txrx: new option -r to select data rate

- atrf-txrx.c (set_rate, main): allow setting a non-standard high data
  rate on the AT86RF231
- atrf-txrx.c (usage, main): added option -r to select the data rate
This commit is contained in:
Werner Almesberger 2011-01-20 19:32:40 -03:00
parent f16224f575
commit 705864d076

View File

@ -125,6 +125,23 @@ static void set_channel(struct atrf_dsc *dsc, int channel)
} }
static void set_rate(struct atrf_dsc *dsc, uint8_t rate)
{
if (!rate)
return;
switch (atrf_identify(dsc)) {
case artf_at86rf230:
fprintf(stderr, "AT86RF230 only supports 250 kbps\n");
break;
case artf_at86rf231:
atrf_reg_write(dsc, REG_TRX_CTRL_2, rate);
break;
default:
abort();
}
}
static void set_power(struct atrf_dsc *dsc, double power, int crc) static void set_power(struct atrf_dsc *dsc, double power, int crc)
{ {
const double *tx_pwr; const double *tx_pwr;
@ -568,13 +585,14 @@ static void usage(const char *name)
" wave in MHz: -2, -0.5, or +0.5\n" " wave in MHz: -2, -0.5, or +0.5\n"
" command shell command to run while transmitting (default: wait for\n" " command shell command to run while transmitting (default: wait for\n"
" SIGINT instead)\n\n" " SIGINT instead)\n\n"
" common options: [-c channel|-f freq] [-C mhz] [-o file] [-p power] " " common options: [-c channel|-f freq] [-C mhz] [-o file] [-p power]\n"
"[-t trim]\n" " [-r rate] [-t trim]\n"
" -c channel channel number, 11 to 26 (default %d)\n" " -c channel channel number, 11 to 26 (default %d)\n"
" -C mhz output clock at 1, 2, 4, 8, or 16 MHz (default: off)\n" " -C mhz output clock at 1, 2, 4, 8, or 16 MHz (default: off)\n"
" -f freq frequency in MHz, 2405 to 2480 (default %d)\n" " -f freq frequency in MHz, 2405 to 2480 (default %d)\n"
" -o file write received data to a file in pcap format\n" " -o file write received data to a file in pcap format\n"
" -p power transmit power, -17.2 to 3.0 dBm (default %.1f)\n" " -p power transmit power, -17.2 to 3.0 dBm (default %.1f)\n"
" -r rate data rate, 250k, 500k, 1M, or 2M (default: 250k)\n"
" -t trim trim capacitor, 0 to 15 (default 0)\n" " -t trim trim capacitor, 0 to 15 (default 0)\n"
, name, name, name, name, , name, name, name, name,
DEFAULT_CHANNEL, 2405+5*(DEFAULT_CHANNEL-11), DEFAULT_POWER); DEFAULT_CHANNEL, 2405+5*(DEFAULT_CHANNEL-11), DEFAULT_POWER);
@ -592,6 +610,7 @@ int main(int argc, char *const *argv)
} mode = mode_msg; } mode = mode_msg;
int channel = DEFAULT_CHANNEL; int channel = DEFAULT_CHANNEL;
double power = DEFAULT_POWER; double power = DEFAULT_POWER;
uint8_t rate = OQPSK_DATA_RATE_250;
int trim = 0, times = 1; int trim = 0, times = 1;
uint8_t cont_tx = 0; uint8_t cont_tx = 0;
double pause_s = 0; double pause_s = 0;
@ -602,7 +621,7 @@ int main(int argc, char *const *argv)
const char *pcap_file = NULL; const char *pcap_file = NULL;
struct atrf_dsc *dsc; struct atrf_dsc *dsc;
while ((c = getopt(argc, argv, "c:C:f:o:p:E:Pt:T:")) != EOF) while ((c = getopt(argc, argv, "c:C:f:o:p:r:E:Pt:T:")) != EOF)
switch (c) { switch (c) {
case 'c': case 'c':
channel = strtoul(optarg, &end, 0); channel = strtoul(optarg, &end, 0);
@ -629,6 +648,18 @@ int main(int argc, char *const *argv)
if (*end) if (*end)
usage(*argv); usage(*argv);
break; break;
case 'r':
if (!strcmp(optarg, "250k"))
rate = OQPSK_DATA_RATE_250;
else if (!strcmp(optarg, "500k"))
rate = OQPSK_DATA_RATE_500;
else if (!strcmp(optarg, "1M"))
rate = OQPSK_DATA_RATE_1000;
else if (!strcmp(optarg, "2M"))
rate = OQPSK_DATA_RATE_2000;
else
usage(*argv);
break;
case 't': case 't':
trim = strtoul(optarg, &end, 0); trim = strtoul(optarg, &end, 0);
if (*end) if (*end)
@ -677,6 +708,7 @@ int main(int argc, char *const *argv)
case 0: case 0:
dsc = init_txrx(trim, clkm); dsc = init_txrx(trim, clkm);
set_channel(dsc, channel); set_channel(dsc, channel);
set_rate(dsc, rate);
switch (mode) { switch (mode) {
case mode_msg: case mode_msg:
receive(dsc, pcap_file); receive(dsc, pcap_file);
@ -716,6 +748,7 @@ int main(int argc, char *const *argv)
case 1: case 1:
dsc = init_txrx(trim, clkm); dsc = init_txrx(trim, clkm);
set_channel(dsc, channel); set_channel(dsc, channel);
set_rate(dsc, rate);
switch (mode) { switch (mode) {
case mode_msg: case mode_msg:
set_power(dsc, power, 1); set_power(dsc, power, 1);