From df7d8990cbcef3fe25e3d2438308a80c69c29df0 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Sun, 21 Oct 2018 10:54:26 -0400 Subject: [PATCH] tlm array passed around --- afsk/send_afsk.c | 20 +++++++++++--------- cw/cw_main.c | 13 ++++++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/afsk/send_afsk.c b/afsk/send_afsk.c index e7e1135a..dacdcc0b 100644 --- a/afsk/send_afsk.c +++ b/afsk/send_afsk.c @@ -32,7 +32,9 @@ ax25_conf_t hax25; static void init_rf(); void config_x25(); void trans_x25(); - +extern int upper_digit(int number); +extern int lower_digit(int number); + int send_afsk(int tlm[][5]) { setSpiChannel(SPI_CHANNEL); @@ -66,14 +68,14 @@ int send_afsk(int tlm[][5]) { int channel; for (channel = 1; channel < 7; channel++) { - printf("%d %d %d %d \n", tlm[channel][1], tlm[channel][2], tlm[channel][3], tlm[channel][4]); - sprintf(tlm_str, "%d%d%d %d%d%d %d%d%d %d%d%d ", - channel, upper_digit(tlm[channel][1]), lower_digit(tlm[channel][1]), - channel, upper_digit(tlm[channel][2]), lower_digit(tlm[channel][2]), - channel, upper_digit(tlm[channel][3]), lower_digit(tlm[channel][3]), - channel, upper_digit(tlm[channel][4]), lower_digit(tlm[channel][4])); - printf("%s \n",tlm_str); - strcat(str, tlm_str); +// printf("%d %d %d %d \n", tlm[channel][1], tlm[channel][2], tlm[channel][3], tlm[channel][4]); + sprintf(tlm_str, "%d%d%d %d%d%d %d%d%d %d%d%d ", + channel, upper_digit(tlm[channel][1]), lower_digit(tlm[channel][1]), + channel, upper_digit(tlm[channel][2]), lower_digit(tlm[channel][2]), + channel, upper_digit(tlm[channel][3]), lower_digit(tlm[channel][3]), + channel, upper_digit(tlm[channel][4]), lower_digit(tlm[channel][4])); +// printf("%s \n",tlm_str); + strcat(str, tlm_str); } printf("INFO: Transmitting X.25 packet\n"); diff --git a/cw/cw_main.c b/cw/cw_main.c index 5c685b48..a74df259 100644 --- a/cw/cw_main.c +++ b/cw/cw_main.c @@ -122,7 +122,7 @@ int main(void) get_tlm(tlm); printf("TLM Received 1a: %d 2b: %d\n", tlm[1][1], tlm[2][2]); - int tlm_3a = 0, tlm_1b = 0; +// int tlm_3a = 0, tlm_1b = 0; msg_length = encode_tlm(&packet[0], channel, // add a channel with dummy data to buffer // tlm_3a, tlm_1b, channel+2, channel+3, @@ -182,6 +182,9 @@ int encode_header(uint8_t *buffer, int avail) { count += add_space(&buffer[count]); count += add_space(&buffer[count]); + if (count > avail) + printf("ERROR: encode_header count > avail \n"); + return count; } @@ -372,11 +375,11 @@ void config_cw() { ax5043WriteReg(0x161,0); ax5043WriteReg(0x162,0x20); - long txRate; - txRate = ax5043ReadReg(0x167) + 256 * ax5043ReadReg(0x166) + 65536 * ax5043ReadReg(0x165); +// long txRate; +// txRate = ax5043ReadReg(0x167) + 256 * ax5043ReadReg(0x166) + 65536 * ax5043ReadReg(0x165); // printf("Tx Rate %x %x %x \n", ax5043ReadReg(0x165), ax5043ReadReg(0x166), ax5043ReadReg(0x167)); - long fskDev; - fskDev = ax5043ReadReg(0x163) + 256 * ax5043ReadReg(0x162) + 65536 * ax5043ReadReg(0x161); +// long fskDev; +// fskDev = ax5043ReadReg(0x163) + 256 * ax5043ReadReg(0x162) + 65536 * ax5043ReadReg(0x161); ax5043WriteReg(0x37,(uint8_t)((ax5043ReadReg(0x37) + 4))); // Increase FREQA