shorten code by removing unnecessary "actual"

[challenge-bot] / build-stages / i_chooser / i_chooser.ino

diff --git a/build-stages/i_chooser/i_chooser.ino b/build-stages/i_chooser/i_chooser.ino
index 6eabcaf90f157a2ce79a7bceef243165b27ee5cb..db6720f5fdcde73a6b4f2f2a84712cff22079596 100644 (file)
--- a/build-stages/i_chooser/i_chooser.ino
+++ b/build-stages/i_chooser/i_chooser.ino
@@ -14,7 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bot_map.h"
+#include "bot_with_leds_map.h"
 
 void on(int pin){
   digitalWrite(pin, HIGH);}
@@ -198,18 +198,18 @@ void follow() {
   int desired_right_ping_time = 800;
   int desired_left_ping_time = 800;
 
-  unsigned int actual_left_ping_time = ping(left_trigger_pin, left_echo_pin);
-  unsigned int actual_right_ping_time = ping(right_trigger_pin, right_echo_pin);
+  unsigned int left_ping_time = ping(left_trigger_pin, left_echo_pin);
+  unsigned int right_ping_time = ping(right_trigger_pin, right_echo_pin);
 
-  left_speed = actual_left_ping_time - desired_left_ping_time;
-  right_speed = actual_right_ping_time - desired_right_ping_time;
+  left_speed = left_ping_time - desired_left_ping_time;
+  right_speed = right_ping_time - desired_right_ping_time;
 
   Serial.print(", left: ping = ");
-  Serial.print(actual_left_ping_time);
+  Serial.print(left_ping_time);
   Serial.print(" speed = ");
   Serial.print(left_speed);
   Serial.print(" right: ping = ");
-  Serial.print(actual_right_ping_time);
+  Serial.print(right_ping_time);
   Serial.print(" speed = ");
   Serial.print(right_speed);
 
@@ -256,7 +256,3 @@ void loop() {
   prior_button_state = button_state;
 
   Serial.println(); }
-
-void loop_asdf() {
-  go(250, 250);
-}