diff --git a/afsk/send_afsk.c b/afsk/send_afsk.c index 9f4fa128..ab4d11c6 100644 --- a/afsk/send_afsk.c +++ b/afsk/send_afsk.c @@ -34,9 +34,21 @@ void config_x25(); void trans_x25(); extern int upper_digit(int number); extern int lower_digit(int number); - + +int config_afsk() { + + init_rf(); + + printf("INFO: Initiating radio for X.25\n"); + + ax25_init(&hax25, (uint8_t *) "CQ", '2', (uint8_t *) "DX", '2', + AX25_PREAMBLE_LEN, + AX25_POSTAMBLE_LEN); + return(1); + +} int send_afsk(int tlm[][5]) { - printf("INFO: Configuring radio for X.25\n"); + printf("INFO: Configuring rf for X.25\n"); // setSpiChannel(SPI_CHANNEL); // setSpiSpeed(SPI_SPEED); @@ -55,12 +67,6 @@ int send_afsk(int tlm[][5]) { // send X.25 packet - init_rf(); - - ax25_init(&hax25, (uint8_t *) "CQ", '2', (uint8_t *) "DX", '2', - AX25_PREAMBLE_LEN, - AX25_POSTAMBLE_LEN); - printf("INFO: Preparing X.25 packet\n"); char str[1000]; @@ -106,9 +112,11 @@ int send_afsk(int tlm[][5]) { } static void init_rf() { + printf("INFO: Before rf init\n"); int ret; ret = ax5043_init(&hax5043, XTAL_FREQ_HZ, VCO_INTERNAL); - if (ret != PQWS_SUCCESS) { + printf("INFO: After rf init\n"); + if (ret != PQWS_SUCCESS) { fprintf(stderr, "ERROR: Failed to initialize AX5043 with error code %d\n", ret); exit(EXIT_FAILURE); diff --git a/cw/cw_main.c b/cw/cw_main.c index 0b7362f4..789a202c 100644 --- a/cw/cw_main.c +++ b/cw/cw_main.c @@ -74,6 +74,7 @@ int add_dot(uint8_t *msg, int number); int add_space(uint8_t *msg); int get_tlm(int tlm[7][5]); int tempSensor, xPlusSensor, yPlusSensor, zPlusSensor, battCurrentSensor; +extern int config_afsk(); int main(int argc, char *argv[]) { @@ -103,6 +104,7 @@ int main(int argc, char *argv[]) // } } + send_cw_tlm = FALSE; uint8_t retVal; int tlm[7][5]; int i, j; @@ -127,7 +129,14 @@ int main(int argc, char *argv[]) setSpiSpeed(SPI_SPEED); initializeSpi(); // printf("1\n"); + + config_afsk(); + while(1) { + get_tlm(tlm); + send_afsk(tlm); + + } // Initialize the AX5043 retVal = axradio_init(); // printf("2\n");