diff --git a/.gitignore b/.gitignore index 2aefbb68..f5b18075 100644 --- a/.gitignore +++ b/.gitignore @@ -330,4 +330,5 @@ out/docs/fw_flow/Firmware Flowchart.png tests/googletest tests/outputs/ build/* -tests/*outputs/* \ No newline at end of file +tests/*outputs/* +tests/no_check_inputs/* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 787d42dc..7f93fd60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(GTEST_SOURCE_FILES src/antara_scheduler.cpp src/charlie_scheduler.cpp tests/fixed_google_tests.cpp - tests/file_google_tests.cpp + #tests/file_google_tests.cpp #tests/overlap_google_tests.cpp tests/scheduler_test_flog.cpp ) diff --git a/src/charlie_scheduler.cpp b/src/charlie_scheduler.cpp index 485507a1..f8d5d93f 100644 --- a/src/charlie_scheduler.cpp +++ b/src/charlie_scheduler.cpp @@ -160,8 +160,7 @@ int Scheduler::getNextTask(DeploymentSchedule_t** p_nextEvent, { FLOG_AddError(FLOG_SCHEDULER_DELAY_EXCEEDED, s.measurementCount); - //SF_OSAL_printf("Task %s skipped at time %zu" __NL__ , - //currentEvent.taskName,currentTime); + } } } diff --git a/tests/test_file_generator.py b/tests/test_file_generator.py index 3f6d45cb..adfbd301 100644 --- a/tests/test_file_generator.py +++ b/tests/test_file_generator.py @@ -57,20 +57,22 @@ def generate_delays(self): os.remove(f) file_num = 0 ensembles = {} - gyro_sweep = [30,31] - mag_sweep = [30,31] + gyro_sweep = [30,300] + mag_sweep = [30,300] input = None ensembles["Temperature"] = Ensemble("Temperature",0.873,1,1) ensembles["GPS"] = Ensemble("GPS",0.1443,1,1) ensembles["Wet/Dry Sensor"] = Ensemble("Wet/Dry Sensor",1.02,1,1) - for gyro_interval in range(gyro_sweep[0],gyro_sweep[1]+1): + step = 5 + for gyro_interval in range(gyro_sweep[0],gyro_sweep[1]+1,step): ensembles["Gyrometer"] = Ensemble("Gyrometer",5.209,1, gyro_interval) - for mag_interval in range(mag_sweep[0],mag_sweep[1]+1): + for mag_interval in range(mag_sweep[0],mag_sweep[1]+1,step): ensembles["Magnetometer"] = Ensemble("Magnetometer",5.212,1, mag_interval) input = Input("test" + str(file_num), ensembles.values()) file_num += 1 input.generate_delays() input.write() + print(f'{file_num}/{(250/step)**2}' + "\r")