KB8PMY
/
CubeSatSim
mirror of https://github.com/alanbjohnston/CubeSatSim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tlm array passed around

Browse Source
pull/1/head
Alan Johnston 7 years ago
parent 1d1710e9e3
commit df7d8990cb
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File

20
afsk/send_afsk.c
Unescape View File

@ -32,7 +32,9 @@ ax25_conf_t hax25;
static void init_rf(); static void init_rf();
void config_x25(); void config_x25();
void trans_x25(); void trans_x25();
extern int upper_digit(int number);
extern int lower_digit(int number);
int send_afsk(int tlm[][5]) { int send_afsk(int tlm[][5]) {
setSpiChannel(SPI_CHANNEL); setSpiChannel(SPI_CHANNEL);
@ -66,14 +68,14 @@ int send_afsk(int tlm[][5]) {
int channel; int channel;
for (channel = 1; channel < 7; 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]); // 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 ", 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][1]), lower_digit(tlm[channel][1]),
channel, upper_digit(tlm[channel][2]), lower_digit(tlm[channel][2]), 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][3]), lower_digit(tlm[channel][3]),
channel, upper_digit(tlm[channel][4]), lower_digit(tlm[channel][4])); channel, upper_digit(tlm[channel][4]), lower_digit(tlm[channel][4]));
printf("%s \n",tlm_str); // printf("%s \n",tlm_str);
strcat(str, tlm_str); strcat(str, tlm_str);
} }
printf("INFO: Transmitting X.25 packet\n"); printf("INFO: Transmitting X.25 packet\n");

13
cw/cw_main.c
Unescape View File

@ -122,7 +122,7 @@ int main(void)
get_tlm(tlm); get_tlm(tlm);
printf("TLM Received 1a: %d 2b: %d\n", tlm[1][1], tlm[2][2]); 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 msg_length = encode_tlm(&packet[0], channel, // add a channel with dummy data to buffer
// tlm_3a, tlm_1b, channel+2, channel+3, // 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]);
count += add_space(&buffer[count]); count += add_space(&buffer[count]);
if (count > avail)
printf("ERROR: encode_header count > avail \n");
return count; return count;
} }
@ -372,11 +375,11 @@ void config_cw() {
ax5043WriteReg(0x161,0); ax5043WriteReg(0x161,0);
ax5043WriteReg(0x162,0x20); ax5043WriteReg(0x162,0x20);
long txRate; // long txRate;
txRate = ax5043ReadReg(0x167) + 256 * ax5043ReadReg(0x166) + 65536 * ax5043ReadReg(0x165); // txRate = ax5043ReadReg(0x167) + 256 * ax5043ReadReg(0x166) + 65536 * ax5043ReadReg(0x165);
// printf("Tx Rate %x %x %x \n", ax5043ReadReg(0x165), ax5043ReadReg(0x166), ax5043ReadReg(0x167)); // printf("Tx Rate %x %x %x \n", ax5043ReadReg(0x165), ax5043ReadReg(0x166), ax5043ReadReg(0x167));
long fskDev; // long fskDev;
fskDev = ax5043ReadReg(0x163) + 256 * ax5043ReadReg(0x162) + 65536 * ax5043ReadReg(0x161); // fskDev = ax5043ReadReg(0x163) + 256 * ax5043ReadReg(0x162) + 65536 * ax5043ReadReg(0x161);
ax5043WriteReg(0x37,(uint8_t)((ax5043ReadReg(0x37) + 4))); // Increase FREQA ax5043WriteReg(0x37,(uint8_t)((ax5043ReadReg(0x37) + 4))); // Increase FREQA

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.