diff --git a/main.c b/main.c index 65502f4b..94fb00a1 100644 --- a/main.c +++ b/main.c @@ -643,6 +643,7 @@ int main(int argc, char * argv[]) { } if (payload == ON) { // moved to here +// if ((payload == ON) && (mode != BPSK)) { // moved to here STEMBoardFailure = 0; printf("get_payload_status: %d \n", get_payload_serial(FALSE)); // not debug fflush(stdout); @@ -1393,7 +1394,8 @@ void get_tlm_fox() { // while ((millis() - sampleTime) < (unsigned int)samplePeriod) int startSleep = millis(); if ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 250 100 500 for FSK - sleep(2.0); // 0.5); // 25); // initial period +// sleep(2.0); // 0.5); // 25); // initial period + sleep(1.0); // 0.5); // 25); // initial period while ((millis() - sampleTime) < ((unsigned int)frameTime - 250)) // was 250 100 sleep(0.1); // 25); // 0.5); // 25); // sleep((unsigned int)sleepTime); diff --git a/main.h b/main.h index 19079191..076c0523 100644 --- a/main.h +++ b/main.h @@ -134,7 +134,8 @@ unsigned int sampleTime = 0; int frames_sent = 0; int cw_id = ON; int vB4 = FALSE, vB5 = FALSE, vB3 = FALSE, ax5043 = FALSE, transmit = FALSE, onLed, onLedOn, onLedOff, txLed, txLedOn, txLedOff, payload = OFF; -float voltageThreshold = 3.6, batteryVoltage = 4.5, batteryCurrent = 0, currentThreshold = 100; +// float voltageThreshold = 3.6, batteryVoltage = 4.5, batteryCurrent = 0, currentThreshold = 100; +float voltageThreshold = 3.5, batteryVoltage = 4.5, batteryCurrent = 0, currentThreshold = 100; float latitude = 39.027702f, longitude = -77.078064f; float lat_file, long_file; double cpuTemp; @@ -175,7 +176,7 @@ int start_flag_detected = FALSE; int start_flag_complete = FALSE; int end_flag_detected = FALSE; int jpeg_start = 0; -#define CAMERA_TIMEOUT 10000 // 20000 // Camera timeout in milli seconds +#define CAMERA_TIMEOUT 2000 // 10000 // 20000 // Payload timeout in milli seconds void battery_saver(int setting); int battery_saver_check();