From ab53352c11864c81faa6212975ba75b98ee32328 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 26 Oct 2018 15:10:30 -0400 Subject: [PATCH 1/4] config_afsk and send_afsk working --- afsk/send_afsk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/afsk/send_afsk.c b/afsk/send_afsk.c index ab4d11c6..4c551b50 100644 --- a/afsk/send_afsk.c +++ b/afsk/send_afsk.c @@ -48,7 +48,7 @@ int config_afsk() { } int send_afsk(int tlm[][5]) { - printf("INFO: Configuring rf for X.25\n"); +// printf("INFO: Configuring rf for X.25\n"); // setSpiChannel(SPI_CHANNEL); // setSpiSpeed(SPI_SPEED); From 7a89ac295b0941569f28abbb8646e5fc5ca76444 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 26 Oct 2018 15:12:31 -0400 Subject: [PATCH 2/4] argv parameter skips cw --- cw/cw_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cw/cw_main.c b/cw/cw_main.c index e029d9a4..609f7964 100644 --- a/cw/cw_main.c +++ b/cw/cw_main.c @@ -129,7 +129,8 @@ int main(int argc, char *argv[]) setSpiSpeed(SPI_SPEED); initializeSpi(); // printf("1\n"); - + +if (send_cw_tlm) { // Send one frame of CW Telem // Initialize the AX5043 retVal = axradio_init(); @@ -183,7 +184,8 @@ int main(int argc, char *argv[]) } usleep(200000); - + } + config_afsk(); // Now switch to AFSK Telem while(1) { From e87c5cacd582c9bf2a428feaa05afd436d633614 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 26 Oct 2018 15:17:43 -0400 Subject: [PATCH 3/4] backed out --- cw/cw_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cw/cw_main.c b/cw/cw_main.c index 609f7964..1ed4b518 100644 --- a/cw/cw_main.c +++ b/cw/cw_main.c @@ -130,7 +130,6 @@ int main(int argc, char *argv[]) initializeSpi(); // printf("1\n"); -if (send_cw_tlm) { // Send one frame of CW Telem // Initialize the AX5043 retVal = axradio_init(); @@ -184,8 +183,7 @@ if (send_cw_tlm) { } usleep(200000); - } - + config_afsk(); // Now switch to AFSK Telem while(1) { From 31ebe4247a3a4d4fe6a27c06533795eebcf600bc Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Fri, 26 Oct 2018 15:22:50 -0400 Subject: [PATCH 4/4] restored --- cw/cw_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cw/cw_main.c b/cw/cw_main.c index 1ed4b518..ffd63602 100644 --- a/cw/cw_main.c +++ b/cw/cw_main.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) setSpiSpeed(SPI_SPEED); initializeSpi(); // printf("1\n"); - + // Send one frame of CW Telem // Initialize the AX5043 retVal = axradio_init(); @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) } usleep(200000); - + config_afsk(); // Now switch to AFSK Telem while(1) { @@ -213,10 +213,10 @@ int main(int argc, char *argv[]) config_cw(); // allocate space for the buffer - static uint8_t packet[MAX_MESSAGE_LENGTH + 1]; + //static uint8_t packet[MAX_MESSAGE_LENGTH + 1]; - int channel; // AO-7 telemetry format has 6 channels, 4 sub channels in each - int msg_length; + //int channel; // AO-7 telemetry format has 6 channels, 4 sub channels in each + //int msg_length; while(1) { // loop forever for (channel = 0; channel < 7; channel++) {