Added first playing field part 3

Author: sam

source/ev3dev2/simulator/Simulator.py

@@ -55,6 +55,8 @@ def __init__(self, robot_state, robot_pos):
         self.right_ts_data = False
         self.top_us_data = -1
 
+        self.text_x = self.screen_width - apply_scaling(220)
+
 
     def setup(self):
         """
@@ -126,13 +128,12 @@ def _draw_text(self):
         message = self.robot_state.next_sound_job()
         sound = message if message else '-'
 
-        arcade.draw_text(center_cs, self.screen_width - 140, self.screen_height - 45, arcade.color.BLACK_LEATHER_JACKET, 10)
-        arcade.draw_text(left_ts, self.screen_width - 140, self.screen_height - 60, arcade.color.BLACK_LEATHER_JACKET, 10)
-        arcade.draw_text(right_ts, self.screen_width - 140, self.screen_height - 75, arcade.color.BLACK_LEATHER_JACKET, 10)
-        arcade.draw_text(top_us, self.screen_width - 140, self.screen_height - 90, arcade.color.BLACK_LEATHER_JACKET, 10)
-        arcade.draw_text('Sound:', self.screen_width - 140, self.screen_height - 105, arcade.color.BLACK_LEATHER_JACKET, 10)
-        arcade.draw_text(sound, self.screen_width - 140, self.screen_height - 120, arcade.color.BLACK_LEATHER_JACKET, 10,
-                         anchor_y='top')
+        arcade.draw_text(center_cs, self.text_x, self.screen_height - apply_scaling(80), arcade.color.BLACK_LEATHER_JACKET, 10)
+        arcade.draw_text(left_ts, self.text_x, self.screen_height - apply_scaling(100), arcade.color.BLACK_LEATHER_JACKET, 10)
+        arcade.draw_text(right_ts, self.text_x, self.screen_height - apply_scaling(120), arcade.color.BLACK_LEATHER_JACKET, 10)
+        arcade.draw_text(top_us, self.text_x, self.screen_height - apply_scaling(140), arcade.color.BLACK_LEATHER_JACKET, 10)
+        arcade.draw_text('Sound:', self.text_x, self.screen_height - apply_scaling(160), arcade.color.BLACK_LEATHER_JACKET, 10)
+        arcade.draw_text(sound, self.text_x, self.screen_height - apply_scaling(180), arcade.color.BLACK_LEATHER_JACKET, 10, anchor_y='top')
 
 
     def update(self, delta_time):
@@ -182,12 +183,12 @@ def main():
                         default=200,
                         help="Starting position x-coordinate of the robot, default is 200",
                         required=False,
-                        type=int)
+                        type=check_xy)
     parser.add_argument("-y", "--robot_position_y",
                         default=300,
                         help="Starting position y-coordinate of the robot, default is 300",
                         required=False,
-                        type=int)
+                        type=check_xy)
     parser.add_argument("-o", "--robot_orientation",
                         default=0,
                         help="Starting orientation the robot, default is 0",
@@ -226,4 +227,16 @@ def check_scale(value):
     return f
 
 
+def check_xy(value):
+    try:
+        f = int(value)
+    except ValueError:
+        raise argparse.ArgumentTypeError('Coordinate value must be a integer')
+
+    if f < 0 or f > 1000:
+        raise argparse.ArgumentTypeError("%s is an invalid coordinate. Should be between 0 and 1000" % f)
+
+    return f
+
+
 main()

source/ev3dev2/simulator/config/config.yaml

@@ -34,7 +34,7 @@ image_paths:
 
 obstacle_settings:
   border_settings:
-    border_depth: 15
+    border_depth: 30
 
   lake_settings:
     border_width: 29

source/ev3dev2/simulator/connection/ServerSocket.py

@@ -23,6 +23,8 @@ def __init__(self, robot_state):
         self.message_processor = MessageProcessor(robot_state)
         self.robot_state = robot_state
 
+        self.first_run = True
+
 
     def run(self):
         """
@@ -42,6 +44,10 @@ def run(self):
             (client, address) = server.accept()
 
             print('Connection accepted')
+            if not self.first_run:
+                self.robot_state.should_reset = True
+
+            self.first_run = False
             time.sleep(1)
 
             try:
@@ -63,8 +69,6 @@ def run(self):
             print('Closing connection...')
             client.close()
 
-            self.robot_state.should_reset = True
-
 
     def _process(self, data: bytes) -> bytes:
         """