Skip to content
Snippets Groups Projects
Commit 32743b7d authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Adding check to prevent false resets, switched to microsecond precision, and...

Adding check to prevent false resets, switched to microsecond precision, and adding better output to status
parent 05df50e7
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,11 @@ void core1( void * pvParameters ){ ...@@ -58,7 +58,11 @@ void core1( void * pvParameters ){
if(current_internal_status == InternalStatus::NotZeroed if(current_internal_status == InternalStatus::NotZeroed
&& result_number < requested_measurements){ && result_number < requested_measurements){
zeroServo(); //Rearm zeroServo(); //Rearm
delay(5000 + random(1,11)); // Five seconds + random delay
do{
delay(2000 + random(1,11)); // Two seconds + random delay
}while(getPhotoDiodeReading() < triggerValue); //Prevent false resets
rotation_servo.write(zeroValueForServo - deflection); //deflection movement rotation_servo.write(zeroValueForServo - deflection); //deflection movement
} }
......
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
} }
void MotionToPhotonServer::pageStatus(){ void MotionToPhotonServer::pageStatus(){
server.send(200, "text/plain", String(getStatus())); unsigned int results = getCurrentNumberOfResults();
server.send(200, "text/plain", String(getStatus()) + ((results > 0) ? ": " + String(results):"") );
} }
void MotionToPhotonServer::pageSetThreshold(){ void MotionToPhotonServer::pageSetThreshold(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment