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

cleanup

Browse Source
pull/54/head
alanbjohnston 5 years ago committed by GitHub
parent af3c8b1bd0
commit a13e3cbceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File

72
afsk/main.c
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Transmits CubeSat Telemetry at 434.9MHz in AO-7 format * Transmits CubeSat Telemetry at 434.9MHz in AFSK, FSK, or BPSK format
* *
* Copyright Alan B. Johnston * Copyright Alan B. Johnston
* *
@ -17,9 +17,6 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* INA219 Raspberry Pi wiringPi code is based on Adafruit Arduino wire code
* from https://github.com/adafruit/Adafruit_INA219.
*/ */
#include <fcntl.h> #include <fcntl.h>
@ -111,11 +108,6 @@ int nrd;
void write_to_buffer(int i, int symbol, int val); void write_to_buffer(int i, int symbol, int val);
void write_wave(int i, short int *buffer); void write_wave(int i, short int *buffer);
//#define BUF_LEN (FRAME_CNT * (SYNC_BITS + 10 * (8 + 6 * DATA_LEN + 96)) * SAMPLES)
//#define BUF_LEN (FRAME_CNT * (SYNC_BITS + 10 * (HEADER_LEN + RS_FRAMES * (RS_FRAME_LEN + PARITY_LEN))) * SAMPLES)
//short int buffer[BUF_LEN];
//short int data10[HEADER_LEN + RS_FRAMES * (RS_FRAME_LEN + PARITY_LEN)];
//short int data8[HEADER_LEN + RS_FRAMES * (RS_FRAME_LEN + PARITY_LEN)];
int reset_count; int reset_count;
float uptime_sec; float uptime_sec;
long int uptime; long int uptime;
@ -287,7 +279,7 @@ int main(int argc, char *argv[]) {
onLedOff = LOW; onLedOff = LOW;
transmit = TRUE; transmit = TRUE;
} }
} }
} }
} }
pinMode (txLed, OUTPUT); pinMode (txLed, OUTPUT);
@ -301,9 +293,6 @@ int main(int argc, char *argv[]) {
printf("Power LED On\n"); printf("Power LED On\n");
#endif #endif
// if ((cycle == ON) && !ax5043) // don't cycle modes if using AX5043
// mode = (reset_count) % 3; // alternate between the three modes
config_file = fopen("sim.cfg","w"); config_file = fopen("sim.cfg","w");
fprintf(config_file, "%s %d", call, reset_count); fprintf(config_file, "%s %d", call, reset_count);
fclose(config_file); fclose(config_file);
@ -334,7 +323,7 @@ else
batteryThreshold = 8.0; batteryThreshold = 8.0;
} }
strcpy(pythonStr, pythonCmd); strcpy(pythonStr, pythonCmd);
strcat(pythonStr, busStr); strcat(pythonStr, busStr);
strcat(pythonConfigStr, pythonStr); strcat(pythonConfigStr, pythonStr);
strcat(pythonConfigStr, " c"); strcat(pythonConfigStr, " c");
@ -399,7 +388,6 @@ else
while (loop-- != 0) while (loop-- != 0)
{ {
frames_sent++; frames_sent++;
// float batteryVoltage = read_sensor_data(sensor[BAT]).voltage;
#ifdef DEBUG_LOGGING #ifdef DEBUG_LOGGING
fprintf(stderr,"INFO: Battery voltage: %f V Battery Threshold %f V\n", batteryVoltage, batteryThreshold); fprintf(stderr,"INFO: Battery voltage: %f V Battery Threshold %f V\n", batteryVoltage, batteryThreshold);
@ -568,11 +556,10 @@ for (int j = 0; j < frameCnt; j++)
char *token; char *token;
char cmdbuffer[1000]; char cmdbuffer[1000];
// FILE *file = popen("python3 /home/pi/CubeSatSim/python/voltcurrent.py 1 11", "r"); FILE* file = popen(pythonStr, "r");
FILE* file = popen(pythonStr, "r"); fgets(cmdbuffer, 1000, file);
fgets(cmdbuffer, 1000, file); // printf("result: %s\n", cmdbuffer);
// printf("result: %s\n", cmdbuffer); pclose(file);
pclose(file);
const char space[2] = " "; const char space[2] = " ";
token = strtok(cmdbuffer, space); token = strtok(cmdbuffer, space);
@ -593,12 +580,14 @@ for (int j = 0; j < frameCnt; j++)
if (token != NULL) if (token != NULL)
{ {
current[count1] = atof(token); current[count1] = atof(token);
if ((current[count1] < 0) && (current[count1] > -0.5))
current[count1] *= (-1.0);
#ifdef DEBUG_LOGGING #ifdef DEBUG_LOGGING
printf("current: %f\n", current[count1]); printf("current: %f\n", current[count1]);
#endif #endif
token = strtok(NULL, space); token = strtok(NULL, space);
} }
} }
} }
tlm[1][A] = (int)(voltage[map[BUS]] /15.0 + 0.5) % 100; // Current of 5V supply to Pi tlm[1][A] = (int)(voltage[map[BUS]] /15.0 + 0.5) % 100; // Current of 5V supply to Pi
@ -697,23 +686,12 @@ for (int j = 0; j < frameCnt; j++)
#ifdef DEBUG_LOGGING #ifdef DEBUG_LOGGING
printf("Tx LED On\n"); printf("Tx LED On\n");
#endif #endif
//printf("Before cmd\n"); if (mode == CW)
//printf("CW telem String: %s\n", cw_str2);
// FILE* f;
if (mode == CW)
system(cw_str2); system(cw_str2);
// printf("File %d \n", f);
// printf("close: %d \n", pclose(f)); // execute command and wait for termination before continuing
//printf("After command\n");
// sleep(7);
//printf("Before Write\n");
digitalWrite (txLed, txLedOn); digitalWrite (txLed, txLedOn);
#ifdef DEBUG_LOGGING #ifdef DEBUG_LOGGING
printf("Tx LED On\n"); printf("Tx LED On\n");
#endif #endif
//printf("After Write\n");
//}
//printf("Done CW!\n");
if (ax5043) if (ax5043)
{ {
@ -770,24 +748,18 @@ for (int j = 0; j < frameCnt; j++)
printf("Tx LED On\n"); printf("Tx LED On\n");
#endif #endif
} }
//digitalWrite (txLed, txLedOff);
} }
//printf("End of get_tlm and rpitx =========================================================\n"); digitalWrite (txLed, txLedOff);
#ifdef DEBUG_LOGGING
digitalWrite (txLed, txLedOff); printf("Tx LED Off\n");
#ifdef DEBUG_LOGGING #endif
printf("Tx LED Off\n");
#endif
return; return;
} }
int get_tlm_fox() { int get_tlm_fox() {
// memset(b, 0, 64);
// Reading I2C voltage and current sensors // Reading I2C voltage and current sensors
@ -867,11 +839,10 @@ if (firstTime != ON)
char *token; char *token;
char cmdbuffer[1000]; char cmdbuffer[1000];
// FILE *file = popen("python3 /home/pi/CubeSatSim/python/voltcurrent.py 1 11", "r"); FILE* file = popen(pythonStr, "r");
FILE* file = popen(pythonStr, "r"); fgets(cmdbuffer, 1000, file);
fgets(cmdbuffer, 1000, file); // printf("result: %s\n", cmdbuffer);
// printf("result: %s\n", cmdbuffer); pclose(file);
pclose(file);
const char space[2] = " "; const char space[2] = " ";
token = strtok(cmdbuffer, space); token = strtok(cmdbuffer, space);
@ -892,7 +863,8 @@ if (firstTime != ON)
if (token != NULL) if (token != NULL)
{ {
current[count1] = atof(token); current[count1] = atof(token);
#ifdef DEBUG_LOGGING if ((current[count1] < 0) && (current[count1] > -0.5))
current[count1] *= (-1.0); #ifdef DEBUG_LOGGING
printf("current: %f\n", current[count1]); printf("current: %f\n", current[count1]);
#endif #endif
token = strtok(NULL, space); token = strtok(NULL, space);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.