From 30d66753ba0400cf5e2a4a3978568db09068f6cc Mon Sep 17 00:00:00 2001 From: Roman Dolejsi Date: Sun, 27 Oct 2024 23:27:51 +0100 Subject: [PATCH 1/4] DU-14 - Line navigator --- lesson_14/main_line_navigator.py | 60 ++++++ lesson_14/state.py | 307 +++++++++++++++++++++++++++++++ lesson_14/state_generic.py | 54 ++++++ lesson_14/state_intersection.py | 93 ++++++++++ lesson_14/state_line.py | 112 +++++++++++ lesson_14/state_map.py | 161 ++++++++++++++++ lesson_14/state_turn.py | 123 +++++++++++++ lesson_14/system.py | 177 ++++++++++++++++++ lesson_14/system_mbit.py | 138 ++++++++++++++ lesson_14/system_ped.py | 188 +++++++++++++++++++ lesson_14/wheel.py | 143 ++++++++++++++ lesson_14/wheel_calibrator.py | 120 ++++++++++++ lesson_14/wheel_driver.py | 66 +++++++ lesson_14/wheel_encoder.py | 104 +++++++++++ 14 files changed, 1846 insertions(+) create mode 100644 lesson_14/main_line_navigator.py create mode 100644 lesson_14/state.py create mode 100644 lesson_14/state_generic.py create mode 100644 lesson_14/state_intersection.py create mode 100644 lesson_14/state_line.py create mode 100644 lesson_14/state_map.py create mode 100644 lesson_14/state_turn.py create mode 100644 lesson_14/system.py create mode 100644 lesson_14/system_mbit.py create mode 100644 lesson_14/system_ped.py create mode 100644 lesson_14/wheel.py create mode 100644 lesson_14/wheel_calibrator.py create mode 100644 lesson_14/wheel_driver.py create mode 100644 lesson_14/wheel_encoder.py diff --git a/lesson_14/main_line_navigator.py b/lesson_14/main_line_navigator.py new file mode 100644 index 0000000..635a450 --- /dev/null +++ b/lesson_14/main_line_navigator.py @@ -0,0 +1,60 @@ +from state import Behavior, Ctx +from state_map import StateMap +from system import System +from wheel_driver import WheelDriver + +if __name__ == "__main__": + # Tries to track a line, stop at first indecision (no line for 3 secs, intersection). + system = System() + wheels = WheelDriver( + system=system, + left_pwm_min=60, left_pwm_multiplier=0.09, left_pwm_shift=-2.5, + right_pwm_min=60, right_pwm_multiplier=0.09, right_pwm_shift=-2.5 + ) + + # see Behavior class for the robot behavior definition and parameter characteristics + behavior = Behavior( + fwd_speed=2, + side_speed_dec=2, side_speed_min=1, + side_arc_min=1, side_arc_inc=3, side_arc_max=6, + # 25ms per cycle x 75 = 1.875s outside the valid line action rules (i.e., searching for line) + line_cycle_tolerance=75, + turn_speed=0.2, turn_arc_speed=8, + # 25ms per cycle x 100 = 2.5s outside the valid turn action rules (i.e., searching for 90° turned line) + turn_cycle_tolerance=100, + fast_sensor_change_dropped_below_cycle_count=4, + cycle_duration_us=25_000 + ) + state_map = StateMap(behavior=behavior, stop_on_non_line_sensors=False, turns=True, intersections=True) + ctx = Ctx(system=system, wheels=wheels, behavior=behavior, + states=state_map.states, transitions=state_map.transitions, state_key='START') + + try: + state_cycle_start = system.ticks_us() + while not system.is_button_a_pressed(): + wheels.update() + # reads the sensors and builds their history + ctx.update_sensors() + + time_now = system.ticks_us() + if system.ticks_diff(time_now, state_cycle_start) > ctx.behavior.cycle_duration_us: + state_cycle_start = time_now + + # finalize context before evaluation + # (costly operations are done here like sensor history extension with current sensor) + ctx.before_evaluation() + + # if our context situation matches one of the states, we switch to that state + # (this is typically based on sensor history match, but other matchers are possible) + ctx.switch_to_state_matching_ctx_situation() + + # while being in the state we update it + ctx.state.on_update(ctx) + + finally: + try: + ctx.state.on_exit(ctx) + finally: + wheels.stop() + system.display_off() + print("Finished") diff --git a/lesson_14/state.py b/lesson_14/state.py new file mode 100644 index 0000000..95a1c54 --- /dev/null +++ b/lesson_14/state.py @@ -0,0 +1,307 @@ +from system import System +from wheel_driver import WheelDriver + + +class Behavior: + """The behavior of the robot.""" + + def __init__(self, + # base forward speed (rad) + fwd_speed: float, + # how much to decrement each cycle when on side sensor (too low = lazy reaction) + side_speed_dec: float, + # the minimum rotation speed to maintain to not go too low + # and unnecessarily slow down turning (it turns no matter what as long as rotation speeds are correct) + side_speed_min: float, + # starting arc speed (rotation) when side sensor picks up the line instead of center one + side_arc_min: float, + # how fast we'll be increasing arc speed each cycle we are out of center + # this continues even if we are out of side sensor due to tolerance cycles (see below) + side_arc_inc: float, + # maximum arc speed we can perform (to not get too crazy and take our time when turning) + side_arc_max: float, + # tolerance before declaring we're out of line (time-dependent) + # (if turning too slow, we might not catch the line again if too low) + line_cycle_tolerance: int, + # base turn speed (rad) + turn_speed: float, + # base turn arc speed (rad) + turn_arc_speed: float, + # tolerance before declaring we're out of turn (time-dependent) + # (if turning too slow, we might not catch the line again if too low) + turn_cycle_tolerance: int, + # we disregard sensor transitions which last very short time + fast_sensor_change_dropped_below_cycle_count: int, + # how long the cycle is (in microseconds) + cycle_duration_us: int + ): + self.fwd_speed = fwd_speed + self.side_speed_dec = side_speed_dec + self.side_speed_min = side_speed_min + self.side_arc_min = side_arc_min + self.side_arc_inc = side_arc_inc + self.side_arc_max = side_arc_max + self.line_cycle_tolerance = line_cycle_tolerance + self.turn_speed = turn_speed + self.turn_arc_speed = turn_arc_speed + self.turn_cycle_tolerance = turn_cycle_tolerance + self.fast_sensor_change_dropped_below_cycle_count = fast_sensor_change_dropped_below_cycle_count + self.cycle_duration_us = cycle_duration_us + + +class SensorHasCount: + """A sensor and how many times it needs to match.""" + + def __init__(self, sensor, min_count, max_count=None, optional=False): + self.sensor = sensor + self.min_count = min_count + self.max_count = max_count + self.optional = optional + + def matches(self, sensor, count): + if sensor != self.sensor: + return False + if self.max_count is not None: + return self.min_count <= count <= self.max_count + return count >= self.min_count + + # let's print binary representation of the sensor and how many times it needs to match + def __str__(self): + return f"{self.sensor:0{5}b} ({self.min_count}x)" + + +class Ctx: + """Carries the current operating context of the robot.""" + + def __init__(self, system: System, wheels: WheelDriver, behavior: Behavior, + states: dict[str, 'State'], transitions: dict[str, list[str]], state_key: str): + self.system = system + self.wheels = wheels + self.behavior = behavior + self.states = states + self.transitions = transitions + self.state_key = state_key + self.state = states[state_key] + self.sensor = None + self.sensor_count = 0 + self.sensor_last = None + self.state_action_cycle = 0 + self.state_out_of_bounds_cycle = 0 + # history of sensor changes: [(lcr, count), ...] + # we keep track of the last several sensor changes and use that to determine situation underneath us + # this feeds to a sudden main state change if we detect different behavior than expected + # each state has the ability to override other states if it thinks it should rule the car + self.sensor_history = [] + # the history with extra element pertaining the current sensor and cycle count (updated just before state eval) + self.sensor_history_with_current = [] + # Our history needs to be able to house at least 4 transitions + # (going to intersection might be preceded by a single sensor if the car is going sideways) + self.sensor_history_length = 5 + # carries max speed for each wheel (for display purposes) + # will be updated on forward to correct values + self.fwd_speed_pwm_left_max = 255 + self.fwd_speed_pwm_right_max = 255 + # initialize the state + self.state.on_enter(self) + self.state.set_default_action(self) + + def update_sensors(self): + """Updates sensor readings and counts.""" + self.sensor_last = self.sensor + li, ri, ll, lc, lr = self.system.get_sensors() + self.sensor = li << 4 | ri << 3 | ll << 2 | lc << 1 | lr + if self.sensor != self.sensor_last: + if self.sensor_count > 0: + # we eliminate fluke transitions (short ones) from the history + if self.sensor_count >= self.behavior.fast_sensor_change_dropped_below_cycle_count: + # print(f"Last sensor into history: {self.sensor_last:05b} ({self.sensor_count}x) -> change to {self.sensor:05b}") + self.sensor_history.append((self.sensor_last, self.sensor_count)) + if len(self.sensor_history) >= self.sensor_history_length: + self.sensor_history.pop(0) + else: + print(f"Fluke transition eliminated: {self.sensor_last:05b} ({self.sensor_count}x)") + self.system.display_sensors(li, ri, ll, lc, lr) + self.sensor_count = 1 + else: + self.sensor_count += 1 + + def transition_to_state(self, state_key): + """Transitions to state, a one-liner helper for main code.""" + if state_key != self.state_key: + action_now = self.state.action + state_new = self.states[state_key] + state_new.set_default_action(ctx=self) + action_new = state_new.action + self.state.on_exit(ctx=self) + print("Transitioning: state %s (action %s) -> state %s (action %s)" + % (self.state, action_now, state_new, action_new)) + self.system.display_drive_mode(action_new.symbol) + self.state = state_new + self.state_key = state_key + # reset the sensor history to start fresh within the state and not bring historical baggage + self.sensor_history = [] + self.state.on_enter(ctx=self) + + def switch_to_state_matching_ctx_situation(self): + """Switches the state matching the sensor history + current sensor state (car behavior in the recent past).""" + state_transitions = self.transitions.get(self.state_key) + if state_transitions is None: + print("ERROR: No state transitions for state %s" % self.state_key) + return + for state_key in state_transitions: + state = self.states[state_key] + if state == self.state or state.matchers is None: + continue + for matcher in state.matchers: + if matcher.matches(self): + print("Switching to state %s (%s) due to match of state matcher, sensor history %s" + % (state_key, state, Ctx._str_history(self.sensor_history_with_current))) + self.transition_to_state(state_key) + return + + def add_sensor_to_history(self, sensor): + if len(self.sensor_history) >= self.sensor_history_length: + self.sensor_history.pop(0) + self.sensor_history.append(sensor) + + def before_evaluation(self): + """Called when the context changes are finished, before all evaluations.""" + # we need to update the sensor history with the current sensor and count + self.sensor_history_with_current = self.sensor_history.copy() + self.sensor_history_with_current.append((self.sensor, self.sensor_count)) + + @staticmethod + def _str_history(sensor_history): + """Converts the sensor history to a string.""" + return ", ".join([str(SensorHasCount(s, c)) for s, c in sensor_history]) + + +class Action: + def __init__(self, symbol: str): + self.name = type(self).__name__.replace('Action', '') + self.symbol = symbol + + def __str__(self): + return self.name + + def matches(self, ctx: Ctx) -> bool: + """Returns True if the action matches the context. Used for intra-state transitions.""" + return False + + def on_enter(self, ctx: Ctx): + """Called when the action is entered. Can return new action or indicate state switch.""" + ctx.system.display_drive_mode(self.symbol) + + def on_update(self, ctx: Ctx): + """Called when the action is updated. Can return new action or indicate state switch.""" + pass + + def on_exit(self, ctx: Ctx): + """Called when the action is exited. Can return new action or indicate state switch.""" + pass + + +class SensorMatchingAction(Action): + def __init__(self, symbol: str, matching_sensor: int): + super().__init__(symbol=symbol) + self.matching_sensor = matching_sensor + + def matches(self, ctx: Ctx) -> bool: + return ctx.sensor == self.matching_sensor + + +class StateMatcher: + def __init__(self): + self.name = type(self).__name__.replace('StateMatcher', '') + + def __str__(self): + return self.name + + def matches(self, ctx: Ctx) -> bool: + """Returns True if the state matches the current context situation.""" + pass + + +class SensorHistoryStateMatcher(StateMatcher): + def __init__(self, steps: list[SensorHasCount]): + super().__init__() + self.steps = steps + + def __str__(self): + return f"{self.name}(steps=[{', '.join([str(step) for step in self.steps])}])" + + def matches(self, ctx: Ctx): + # we go through sensor history from the end to the beginning + # (we are interested in the last steps, not the first ones) + # we match the sensor history to all steps (in reverse), disregarding optional steps if missing + sensor_history_view = ctx.sensor_history_with_current + step_index = 0 + history_index = len(sensor_history_view) - 1 + + while step_index < len(self.steps) and history_index >= 0: + step = self.steps[step_index] + sensor, count = sensor_history_view[history_index] + if step.matches(sensor, count): + step_index += 1 + history_index -= 1 + elif step.optional: + step_index += 1 + else: + return False + + # Ensure all non-optional steps are matched + while step_index < len(self.steps): + if not self.steps[step_index].optional: + return False + step_index += 1 + + return True + +class State: + def __init__(self, symbol: str, actions: list[Action], matchers: list[StateMatcher] = None): + # Our name is the class name without the State suffix + self.name = type(self).__name__.replace('State', '') + self.symbol = symbol + self.matchers = matchers + self.actions = actions + self.action = None + + def __str__(self): + return self.name + + def str_full(self): + matchers = ', '.join([str(matcher) for matcher in self.matchers]) if self.matchers else 'None' + actions = ', '.join([str(action) for action in self.actions]) + return f"{self.name}(matchers=[{matchers}], actions=[{actions}])" + + def on_enter(self, ctx: Ctx): + """Called when the state is entered.""" + print("Entering state %s" % self) + ctx.system.display_drive_mode(self.symbol) + if self.action is not None: + self.action.on_enter(ctx) + + def on_update(self, ctx: Ctx): + """Called when the state is updated.""" + if self.action is not None: + self.action.on_update(ctx) + + def on_exit(self, ctx: Ctx): + """Called when the state is exited.""" + if self.action is not None: + self.action.on_exit(ctx) + + def set_default_action(self, ctx: Ctx): + self.action = self.actions[0] + ctx.system.display_drive_mode(self.action.symbol) + self.action.on_enter(ctx) + + +class NoOpState(State): + def __init__(self, symbol: str, matchers: list[StateMatcher] = None): + super().__init__(symbol=symbol, actions=[], matchers=matchers) + + def on_enter(self, ctx: Ctx): + print("NoOpState entered - stopping the robot") + ctx.wheels.stop() + super().on_enter(ctx=ctx) diff --git a/lesson_14/state_generic.py b/lesson_14/state_generic.py new file mode 100644 index 0000000..5c85698 --- /dev/null +++ b/lesson_14/state_generic.py @@ -0,0 +1,54 @@ +from state import Ctx, Action, State + + +class GenericAction(Action): + def __init__(self, symbol): + super().__init__(symbol) + + +class StartAction(GenericAction): + """Starts the robot. An action used by start state to wait for a button to be pressed to start moving. + The action also stops the robot to allow comfortable pressing of the button.""" + + def __init__(self): + super().__init__(symbol='s') + + def on_enter(self, ctx: Ctx): + ctx.system.display_on() + ctx.wheels.stop() + ctx.system.display_speed(0, ctx.fwd_speed_pwm_left_max, left=True) + ctx.system.display_speed(0, ctx.fwd_speed_pwm_right_max, left=False) + + def on_update(self, ctx: Ctx): + if ctx.system.is_button_b_pressed(): + print("B pressed, starting") + ctx.transition_to_state("LINE") + + +class StopAction(GenericAction): + """Stops the robot. No further action will be taken.""" + + def __init__(self): + super().__init__(symbol='.') + + def on_enter(self, ctx: Ctx): + ctx.wheels.stop() + + def on_update(self, ctx: Ctx): + if ctx.system.is_button_b_pressed(): + ctx.transition_to_state("START") + + +class StartState(State): + def __init__(self, symbol: str, matchers=None): + super().__init__(symbol=symbol, actions=[StartAction()], matchers=matchers) + + +class StopState(State): + def __init__(self, symbol: str, matchers=None): + super().__init__(symbol=symbol, actions=[StopAction()], matchers=matchers) + + +class ErrorState(State): + def __init__(self, symbol: str, matchers=None): + super().__init__(symbol=symbol, actions=[StopAction()], matchers=matchers) diff --git a/lesson_14/state_intersection.py b/lesson_14/state_intersection.py new file mode 100644 index 0000000..7c0f13f --- /dev/null +++ b/lesson_14/state_intersection.py @@ -0,0 +1,93 @@ +from state import Ctx, Action, State, SensorHistoryStateMatcher + + +class Choice: + def __init__(self, symbol: str, target_state: str): + self.symbol = symbol + self.target_state = target_state + + +class InteractiveIntersectAction(Action): + def __init__(self, symbol: str, choices: list[Choice]): + super().__init__(symbol) + self.choices = choices + self.choice_idx = -1 + self.button_press_count = 0 + + def on_enter(self, ctx: Ctx): + ctx.wheels.stop() + ctx.system.display_speed(0, ctx.behavior.fwd_speed, left=True) + ctx.system.display_speed(0, ctx.behavior.fwd_speed, left=False) + ctx.system.display_drive_mode(self.symbol) + self.choice_idx = -1 + self.button_press_count = 0 + + def on_update(self, ctx: Ctx): + # we will be switching to the next choice after button press ends + if ctx.system.is_button_b_pressed(): + self.button_press_count += 1 + elif self.button_press_count > 0: + # we want at least half a second for long press + min_cycle_count_for_long_press = 500_000 // ctx.behavior.cycle_duration_us + if self.button_press_count >= min_cycle_count_for_long_press: + ctx.system.display_choice(' ') + ctx.transition_to_state(self.choices[self.choice_idx].target_state) + else: + self.choice_idx += 1 + if self.choice_idx >= len(self.choices): + self.choice_idx = 0 + ctx.system.display_choice(self.choices[self.choice_idx].symbol) + self.button_press_count = 0 + + +class InteractiveIntersectState(State): + """User-interactive intersection state. + The state stops the car, displays the intersection type and asks the user for the choice. + User can cycle through the options (an arrow will be displayed in that direction), + then confirms the choice with long-pressing 'B' button.""" + + +class IntersectXState(State): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [InteractiveIntersectAction(symbol=symbol, choices=[ + Choice(symbol='<', target_state='TURN_L_OFF_LINE'), + Choice(symbol='^', target_state='LINE'), + Choice(symbol='>', target_state='TURN_R_OFF_LINE'), + ])] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + + +class IntersectYState(State): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [InteractiveIntersectAction(symbol=symbol, choices=[ + Choice(symbol='<', target_state='TURN_L_ONTO_LINE'), + Choice(symbol='>', target_state='TURN_R_ONTO_LINE'), + ])] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + + +class IntersectLState(State): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [InteractiveIntersectAction(symbol=symbol, choices=[ + Choice(symbol='<', target_state='TURN_L_OFF_LINE'), + Choice(symbol='^', target_state='LINE'), + ])] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + + +class IntersectRState(State): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [InteractiveIntersectAction(symbol=symbol, choices=[ + Choice(symbol='^', target_state='LINE'), + Choice(symbol='>', target_state='TURN_R_OFF_LINE'), + ])] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + + +class IntersectTState(State): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [InteractiveIntersectAction(symbol=symbol, choices=[ + Choice(symbol='<', target_state='TURN_L'), + Choice(symbol='>', target_state='TURN_R'), + ])] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) diff --git a/lesson_14/state_line.py b/lesson_14/state_line.py new file mode 100644 index 0000000..01e7305 --- /dev/null +++ b/lesson_14/state_line.py @@ -0,0 +1,112 @@ +from state import Ctx, SensorMatchingAction, State + + +class LineAction(SensorMatchingAction): + def __init__(self, symbol: str, matching_sensor: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor) + + +class FwdLineAction(LineAction): + """Moves the robot forward.""" + + def __init__(self, symbol: str, matching_sensor: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor) + + def on_enter(self, ctx: Ctx): + super().on_enter(ctx) + ctx.wheels.move(speed_rad=ctx.behavior.fwd_speed, rotation_rad=0) + ctx.fwd_speed_pwm_left = ctx.wheels.left.speed_pwm + ctx.fwd_speed_pwm_right = ctx.wheels.right.speed_pwm + ctx.system.display_speed(ctx.behavior.fwd_speed, ctx.behavior.fwd_speed, left=True) + ctx.system.display_speed(ctx.behavior.fwd_speed, ctx.behavior.fwd_speed, left=False) + ctx.state_action_cycle = 0 + + def on_update(self, ctx: Ctx): + """When going just forward, we don't do any recalculations.""" + ctx.state_action_cycle += 1 + + +class SideFwdLineAction(LineAction): + """Moves the robot forward with slight turn to the side on which we captured the non-center sensor.""" + + def __init__(self, symbol: str, matching_sensor: int, direction: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor) + self.direction = direction + + def on_enter(self, ctx: Ctx): + super().on_enter(ctx) + ctx.wheels.move(speed_rad=ctx.behavior.fwd_speed, rotation_rad=-ctx.behavior.side_arc_max) + ctx.fwd_speed_pwm_left = ctx.wheels.left.speed_pwm + ctx.fwd_speed_pwm_right = ctx.wheels.right.speed_pwm + ctx.system.display_speed(ctx.wheels.left.speed_pwm, ctx.behavior.fwd_speed, left=True) + ctx.system.display_speed(ctx.wheels.left.speed_pwm, ctx.behavior.fwd_speed, left=False) + ctx.state_action_cycle = 0 + + def on_update(self, ctx: Ctx): + """When side-stepping line while going forward, we are slowing down progressively while increasing arc speed.""" + ctx.state_action_cycle += 1 + rotation_rad = ctx.behavior.side_arc_min + ctx.behavior.side_arc_inc * ctx.state_action_cycle + rotation_rad = min(rotation_rad, ctx.behavior.side_arc_max) + align_speed = ctx.behavior.fwd_speed - ctx.state_action_cycle * ctx.behavior.side_speed_dec + align_speed = max(align_speed, ctx.behavior.side_speed_min) + ctx.wheels.move(speed_rad=align_speed, rotation_rad=rotation_rad * self.direction) + ctx.system.display_speed(ctx.wheels.left.speed_pwm, ctx.fwd_speed_pwm_left_max, left=True) + ctx.system.display_speed(ctx.wheels.right.speed_pwm, ctx.fwd_speed_pwm_right_max, left=False) + print( + "%s, rotation_rad %d, init %s + inc_per_cycle %s * cycle %s" % + (self, rotation_rad, ctx.behavior.side_arc_min, ctx.behavior.side_arc_inc, ctx.state_action_cycle)) + + +class LeftFwdLineAction(SideFwdLineAction): + """Moves the robot forward with slight turn to the left when left sensor is captured.""" + + def __init__(self, symbol: str, matching_sensor: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor, direction=1) + + +class RightFwdLineAction(SideFwdLineAction): + """Moves the robot forward with slight turn to the right when right sensor is captured.""" + + def __init__(self, symbol: str, matching_sensor: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor, direction=-1) + + +class LineState(State): + def __init__(self, symbol: str, matchers=None): + actions: list[LineAction] = [ + FwdLineAction(symbol='|', matching_sensor=0b010), + LeftFwdLineAction(symbol='\\', matching_sensor=0b100), + RightFwdLineAction(symbol='/', matching_sensor=0b001) + ] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + self.actions = actions # type-cast for IDE support + + def transition_action(self, ctx: Ctx): + """Transitions from action to action within the state based on the line sensor readings.""" + # print("Trans state %s action %s, %s" % (state, action_now, bin(lcr))) + for action in self.actions: + if action.matching_sensor == ctx.sensor: + print("Transitioning state %s action %s to %s" % (self, self.action, action)) + self.action.on_exit(ctx) + self.action = action + action.on_enter(ctx) + return True + return False + + def on_update(self, ctx: Ctx): + """Updates the current state.""" + if ctx.sensor != self.action.matching_sensor: + # print(f"Transitioning Line: sensor={ctx.sensor:05b} no longer matches while_sensor={self.action.matching_sensor:05b} (current state {self} action {self.action})") + ctx.state_out_of_bounds_cycle += 1 + if self.transition_action(ctx): + ctx.state_out_of_bounds_cycle = 0 + else: + if ctx.state_out_of_bounds_cycle > ctx.behavior.line_cycle_tolerance: + print("Line cycle tolerance exceeded, switching to error state") + ctx.transition_to_state("STOP") + return + else: + if ctx.state_out_of_bounds_cycle > 0: + ctx.state_out_of_bounds_cycle = 0 + print("Back in state") + self.action.on_update(ctx) diff --git a/lesson_14/state_map.py b/lesson_14/state_map.py new file mode 100644 index 0000000..5cc6a61 --- /dev/null +++ b/lesson_14/state_map.py @@ -0,0 +1,161 @@ +from state import Behavior, SensorHistoryStateMatcher, SensorHasCount +from state_generic import StartState, StopState, ErrorState +from state_intersection import IntersectXState, IntersectYState, IntersectTState, IntersectLState, IntersectRState +from state_line import LineState +from state_turn import LeftTurnState, RightTurnState, OffLineLeftTurnState, OffLineRightTurnState + + +class StateMap: + """States of the robot. + Each state is defined declaratively, indicating: + - sensor history matchers for entering the state + - supported transitions to other states + """ + + def __init__(self, behavior: Behavior, stop_on_non_line_sensors=False, turns=False, intersections=False): + # if we want basic scenario, we will transition to stop on any non-line sensor change + stop_matchers = None if not stop_on_non_line_sensors else [ + SensorHistoryStateMatcher(steps=[SensorHasCount(sensor=0b111, min_count=5)]), + SensorHistoryStateMatcher(steps=[SensorHasCount(sensor=0b011, min_count=5)]), + SensorHistoryStateMatcher(steps=[SensorHasCount(sensor=0b110, min_count=5)]), + ] + self.states = { + # Generic states + 'START': StartState(symbol='s', matchers=[ + # move to start when line is detected after border states (i.e., after stop) + SensorHistoryStateMatcher(steps=[SensorHasCount(sensor=0b010, min_count=10)]), + ]), + 'STOP': StopState(symbol='.', matchers=stop_matchers), + 'ERROR': ErrorState(symbol='x'), + + # Follows the line (no declarative matchers enabled, we transition in and out using advanced conditions) + 'LINE': LineState(symbol='|'), + } + line_transitions = [ 'STOP' ] + self.transitions = { + 'START': [ 'LINE', 'STOP' ], + 'LINE': line_transitions, + 'STOP': [ 'START' ], + } + + if turns: + self.states.update({ + # detects a turn to the left + 'TURN_L': LeftTurnState( + symbol='TL', matchers=[ + # we are detecting disappearing line while last match shows it turning to the left + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b000, min_count=20), + SensorHasCount(sensor=0b110, min_count=4), + SensorHasCount(sensor=0b010, min_count=10) + ]) + ] + ), + # detects a turn to the right + 'TURN_R': RightTurnState( + symbol='TR', matchers=[ + # we are detecting disappearing line while last match shows it turning to the right + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b000, min_count=20), + SensorHasCount(sensor=0b011, min_count=4), + SensorHasCount(sensor=0b010, min_count=10) + ]) + ] + ), + }) + line_transitions.extend(['TURN_L', 'TURN_R']) + self.transitions.update({ + 'TURN_L': [ 'STOP' ], + 'TURN_R': [ 'STOP' ], + }) + + if intersections: + vertical_min_count = 10 + horizontal_min_count = behavior.fast_sensor_change_dropped_below_cycle_count + self.states.update({ + # detects a full intersection (+) + 'INTERSECT_X': IntersectXState( + symbol='I+', matchers=[ + # we will be detecting normal line, then a full intersection, then normal line again + # we also need to account for the fact that we might be slightly off the line + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b010, min_count=vertical_min_count), + SensorHasCount(sensor=0b110, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b011, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b111, min_count=horizontal_min_count), + SensorHasCount(sensor=0b110, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b011, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b010, min_count=vertical_min_count) + ]) + ] + ), + # detects an intersection slight to the left and right, not forward (i.e., 'Y') + 'INTERSECT_Y': IntersectYState( + symbol='IY', matchers=[ + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b101, min_count=vertical_min_count), + SensorHasCount(sensor=0b110, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b011, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b010, min_count=horizontal_min_count), + ]) + ] + ), + # detects an intersection to the left and right, not forward (i.e., 'T') + 'INTERSECT_T': IntersectTState( + symbol='IT', matchers=[ + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b000, min_count=vertical_min_count), + SensorHasCount(sensor=0b111, min_count=horizontal_min_count), + SensorHasCount(sensor=0b110, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b011, min_count=horizontal_min_count, optional=True), + SensorHasCount(sensor=0b010, min_count=vertical_min_count) + ]) + ] + ), + # detects an intersection to the left + 'INTERSECT_L': IntersectLState( + symbol='IL', matchers=[ + # we are detecting a blip on the right sensor, it has to last for some time (speed-dependent) + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b010, min_count=vertical_min_count), + SensorHasCount(sensor=0b110, min_count=horizontal_min_count), + SensorHasCount(sensor=0b010, min_count=vertical_min_count) + ]) + ] + ), + # detects an intersection to the right + 'INTERSECT_R': IntersectRState( + symbol='IR', matchers=[ + # we are detecting a blip on the right sensor, it has to last for some time (speed-dependent) + SensorHistoryStateMatcher(steps=[ + SensorHasCount(sensor=0b010, min_count=vertical_min_count), + SensorHasCount(sensor=0b011, min_count=horizontal_min_count), + SensorHasCount(sensor=0b010, min_count=vertical_min_count) + ]) + ] + ), + # extra turn operations needed to go off the intersection in the right sensor order + 'TURN_L_OFF_LINE': OffLineLeftTurnState(symbol='TL'), + 'TURN_R_OFF_LINE': OffLineRightTurnState(symbol='TR'), + + }) + line_transitions.extend(['INTERSECT_X', 'INTERSECT_Y', 'INTERSECT_T', 'INTERSECT_L', 'INTERSECT_R']) + self.transitions.update({ + 'INTERSECT_X': [ 'STOP'], + 'INTERSECT_R': [ 'STOP' ], + 'INTERSECT_L': [ 'STOP' ], + 'INTERSECT_T': [ 'STOP' ], + 'TURN_L_OFF_LINE': [ 'STOP' ], + 'TURN_R_OFF_LINE': [ 'STOP' ], + }) + + print("Working with states:") + for state in self.states.values(): + print("* " + state.str_full()) + print("Enabled implicit state-to-state transitions:") + for state, transitions in self.transitions.items(): + print(f"* {state} -> {transitions}") + + + def __str__(self): + return "StateMap(%s)" % self.states diff --git a/lesson_14/state_turn.py b/lesson_14/state_turn.py new file mode 100644 index 0000000..c09c127 --- /dev/null +++ b/lesson_14/state_turn.py @@ -0,0 +1,123 @@ +from state import Ctx, SensorMatchingAction, State, SensorHistoryStateMatcher + + +class TurnAction(SensorMatchingAction): + def __init__(self, symbol: str, matching_sensor: int, direction: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor) + self.direction = direction + + def on_enter(self, ctx: Ctx): + super().on_enter(ctx) + ctx.wheels.move(speed_rad=ctx.behavior.turn_speed, rotation_rad=ctx.behavior.turn_arc_speed * self.direction) + ctx.system.display_speed(ctx.wheels.left.speed_pwm, ctx.fwd_speed_pwm_left_max, left=True) + ctx.system.display_speed(ctx.wheels.right.speed_pwm, ctx.fwd_speed_pwm_right_max, left=False) + ctx.state_action_cycle = 0 + + def on_update(self, ctx: Ctx): + ctx.state_action_cycle += 1 + + +class SideSeekTurnAction(TurnAction): + def __init__(self, symbol: str, matching_sensor: int, direction: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor, direction=direction) + + def on_enter(self, ctx: Ctx): + print("Turning to catch side line..") + super().on_enter(ctx) + ctx.wheels.move(speed_rad=ctx.behavior.turn_speed, rotation_rad=ctx.behavior.turn_arc_speed * self.direction) + ctx.system.display_speed(ctx.wheels.left.speed_pwm, ctx.fwd_speed_pwm_left_max, left=True) + ctx.system.display_speed(ctx.wheels.right.speed_pwm, ctx.fwd_speed_pwm_right_max, left=False) + ctx.state_action_cycle = 0 + + +class CenterSeekTurnAction(TurnAction): + def __init__(self, symbol: str, matching_sensor: int, direction: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor, direction=direction) + + def on_enter(self, ctx: Ctx): + print("Turning to catch center line..") + super().on_enter(ctx) + ctx.transition_to_state('LINE') + + +class NoCenterSeekTurnAction(TurnAction): + def __init__(self, symbol: str, matching_sensor: int, direction: int): + super().__init__(symbol=symbol, matching_sensor=matching_sensor, direction=direction) + + def on_enter(self, ctx: Ctx): + print("Turning off center line..") + super().on_enter(ctx) + ctx.wheels.move(speed_rad=ctx.behavior.turn_speed, rotation_rad=ctx.behavior.turn_arc_speed * self.direction) + ctx.system.display_speed(ctx.wheels.left.speed_pwm, ctx.fwd_speed_pwm_left_max, left=True) + ctx.system.display_speed(ctx.wheels.right.speed_pwm, ctx.fwd_speed_pwm_right_max, left=False) + ctx.state_action_cycle = 0 + + +class TurnState(State): + def __init__(self, symbol: str, actions: list[TurnAction], matchers: list[SensorHistoryStateMatcher]): + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + self.actions = actions # type-cast for IDE support + + def set_default_action(self, ctx: Ctx): + self.action = self.actions[0] + self.action.on_enter(ctx) + + def on_update(self, ctx: Ctx): + """Updates the current state: we just go through both actions we have and wait until we match the sensors.""" + if ctx.sensor != self.action.matching_sensor: + print( + f"Turning and seeking sensor {self.action.matching_sensor:05b}, current sensor={ctx.sensor:05b} (current state {self} action {self.action})") + ctx.state_out_of_bounds_cycle += 1 + if ctx.state_out_of_bounds_cycle > ctx.behavior.turn_cycle_tolerance: + print("Turn cycle tolerance exceeded, switching to error state") + ctx.transition_to_state('STOP') + return + else: + ctx.state_out_of_bounds_cycle = 0 + if self.action == self.actions[0]: + print("Transitioning state %s action %s to %s" % (self, self.action, self.actions[1])) + self.action.on_exit(ctx) + self.action = self.actions[1] + self.action.on_enter(ctx) + else: + print("Finished turning") + ctx.transition_to_state('LINE') + self.action.on_update(ctx) + + +class LeftTurnState(TurnState): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [ + SideSeekTurnAction(symbol=symbol, matching_sensor=0b100, direction=1), + CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=1) + ] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + + +class RightTurnState(TurnState): + def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): + actions = [ + SideSeekTurnAction(symbol=symbol, matching_sensor=0b001, direction=-1), + CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=-1) + ] + super().__init__(symbol=symbol, actions=actions, matchers=matchers) + + +class OffLineLeftTurnState(TurnState): + def __init__(self, symbol: str): + actions = [ + NoCenterSeekTurnAction(symbol=symbol, matching_sensor=0b000, direction=1), + SideSeekTurnAction(symbol=symbol, matching_sensor=0b100, direction=1), + CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=1) + ] + super().__init__(symbol=symbol, actions=actions, matchers=[]) + + +class OffLineRightTurnState(TurnState): + def __init__(self, symbol: str): + actions = [ + NoCenterSeekTurnAction(symbol=symbol, matching_sensor=0b000, direction=-1), + SideSeekTurnAction(symbol=symbol, matching_sensor=0b001, direction=-1), + CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=-1) + ] + super().__init__(symbol=symbol, actions=actions, matchers=[]) diff --git a/lesson_14/system.py b/lesson_14/system.py new file mode 100644 index 0000000..b308ae0 --- /dev/null +++ b/lesson_14/system.py @@ -0,0 +1,177 @@ +class System: + """System class for the robot core system interface, + with platform-specific implementations separate classes.""" + SYS_MBIT = "Micro:Bit" + SYS_PICO = "Pico:Ed" + + I2C_FREQ = 100_000 + I2C_SENSOR_DEVICE = 0x38 + I2C_MOTOR_DEVICE = 0x70 + + MASK_LINE_LEFT = 0x04 + MASK_LINE_CENTER = 0x08 + MASK_LINE_RIGHT = 0x10 + MASK_IR_LEFT = 0x20 + MASK_IR_RIGHT = 0x40 + + SOUND_SPEED = 343 # m/s + + def __init__(self): + """Initializes the system.""" + pass + + def get_system_type(self): + """Returns the system type.""" + pass + + def ticks_us(self): + """Returns the current time in microseconds.""" + pass + + def ticks_diff(self, ticks1, ticks2): + """Returns the difference between two time values in microseconds.""" + pass + + def sleep_us(self, us): + """Sleeps for the given time in microseconds.""" + pass + + def i2c_scan(self) -> list[int]: + """Scans the I2C bus for devices and returns a list of addresses.""" + pass + + def i2c_read(self, addr: int, n: int) -> bytes: + """Reads 'n' amount of data from the I2C device into a buffer.""" + pass + + def i2c_write(self, addr: int, buf: bytes): + """Writes data to the I2C device from a buffer.""" + pass + + def i2c_write_motor(self, buf: bytes): + """Writes data to the I2C motor device from a buffer.""" + self.i2c_write(self.I2C_MOTOR_DEVICE, buf) + + def i2c_init_motor(self): + """Initializes the I2C motor device.""" + self.i2c_write_motor(b"\x00\x01") + self.i2c_write_motor(b"\xE8\xAA") + + def i2c_read_sensors(self): + """Returns the current sensor data byte.""" + return self.i2c_read(self.I2C_SENSOR_DEVICE, 1)[0] + + def get_sensors(self): + """Checks if line sensors (..., left, center, right) detected a line (true if line is present) + or obstacle sensors (left, right, ...) detect an obstacle (true if [white] reflection is present).""" + data = self.i2c_read_sensors() + li = bool(data & self.MASK_IR_LEFT) + ri = bool(data & self.MASK_IR_RIGHT) + ll = bool(data & self.MASK_LINE_LEFT) + lc = bool(data & self.MASK_LINE_CENTER) + lr = bool(data & self.MASK_LINE_RIGHT) + return not li, not ri, ll, lc, lr + + def pin_read_digital(self, pin): + """Reads the digital value of a pin.""" + pass + + def pin_write_digital(self, pin, value: int): + """Writes a digital value to the pin.""" + pass + + def set_sonar_angle_pwm(self, angle_pwm: int): + """Sets front sonar horizontal angle PWM value.""" + pass + + def get_sonar_echo_delay_us(self, timeout_us) -> int: + """Measures the delay it takes for the sonar echo to return. + Returns the delay in microseconds or a negative value if the timeout was reached.""" + pass + + def get_sonar_distance(self, max_distance=1.0) -> float: + """Returns the distance in meters measured by the sonar, + with the maximum time spent on detecting the echo based on the max distance we want to detect. + This is by default set to 1m as the reasonable maximum distance for the sonar balanced to max time spent.""" + timeout_us = int((2 * max_distance / self.SOUND_SPEED) * 1_000_000) + measured_time_us = self.get_sonar_echo_delay_us(timeout_us=timeout_us) + if measured_time_us < 0: + return measured_time_us + measured_time_sec = measured_time_us / 1_000_000 + return measured_time_sec * self.SOUND_SPEED / 2 + + def get_encoder_pin_left(self): + """Returns the pin object for the left encoder.""" + pass + + def get_encoder_pin_right(self): + """Returns the pin object for the right encoder.""" + pass + + def get_adc_value(self) -> int: + """Returns the current ADC value of the robot (0 - 1023).""" + pass + + def get_supply_voltage(self): + """Returns the current supply voltage of the robot.""" + adc = self.get_adc_value() # ADC value 0 - 1023 + # Convert ADC value to volts: 3.3 V / 1024 (max. voltage at ADC pin / ADC resolution) + voltage = 0.00322265625 * adc + # Multiply measured voltage by voltage divider ratio to calculate actual voltage + # (10 kOhm + 5,6 kOhm) / 5,6 kOhm [(R1 + R2) / R2, Voltage divider ratio] + return voltage * 2.7857142 + + def is_button_a_pressed(self): + """Returns whether button A is pressed.""" + pass + + def is_button_b_pressed(self): + """Returns whether button B is pressed.""" + pass + + def display_text(self, label): + """Sets a label on the robot display (prints in log, displays the first letter on the screen).""" + pass + + def display_sensors(self, il, ir, ll, lc, lr, y=4, lb=9, ib=5): + """Displays the sensors in top line of the display as pixels for each sensor. + Line sensors (left, center, right) are far left, center, far right, lb is line brightness 0-9, default 9. + IR sensors (left, right) are interlaced among them, ib is IR brightness 0-9, default 5.""" + pass + + def display_drive_mode(self, mode: str): + """Displays the drive mode depicting the current situation we are in now. + The form of the displaying of the mode is platform-dependent. + Variable mode refers to the pictogram displayed, see each implementation (they should be in sync).""" + pass + + def display_choice(self, choice: str): + """Displays the choice depicting the current situation we are in now. + The form of the displaying of the choice is platform-dependent. + Variable mode refers to the pictogram displayed, see each implementation (they should be in sync).""" + pass + + def get_drive_mode_symbol_keys(self): + """Returns the keys of the drive mode symbols.""" + pass + + def display_speed(self, speed_now, speed_max, left: bool): + """Displays one of the two current wheel speeds on the display. Position and form is platform-dependent.""" + pass + + def display_bitmap(self, x_pos: int, y_pos: int, width: int, lines: list[int]): + """Displays bitmap on display (0x0 = top left, max is platform-dependent: 5x5 on Micro:Bit, 27x7 Pico:Ed). + Bitwise, each line int is right-aligned.""" + pass + + def display_clear(self): + """Clears the display.""" + pass + + def display_on(self): + """Enables the display.""" + pass + + def display_off(self): + """Disables the display.""" + pass diff --git a/lesson_14/system_mbit.py b/lesson_14/system_mbit.py new file mode 100644 index 0000000..dfb1f62 --- /dev/null +++ b/lesson_14/system_mbit.py @@ -0,0 +1,138 @@ +from microbit import button_a, button_b, display, i2c, pin1, pin2, pin8, pin12, pin14, pin15 +from machine import time_pulse_us +from utime import ticks_us, ticks_diff, sleep + +from system import System as SystemBase + + +class System(SystemBase): + DRIVE_MODE_PICTOGRAMS = { + ' ': [0b000, 0b000, 0b000], + 'TL': [0b000, 0b110, 0b010], # sharp turn to left + 'TR': [0b000, 0b011, 0b010], # sharp turn to right + 'IT': [0b000, 0b111, 0b010], # intersection left-right (T) + 'IL': [0b010, 0b110, 0b010], # intersection left-straight (T to left) + 'IR': [0b010, 0b011, 0b010], # intersection right-straight (T to right) + 'IY': [0b101, 0b010, 0b010], # split in the road (Y) + 'I+': [0b010, 0b111, 0b010], # intersection all directions (+) + '-': [0b000, 0b111, 0b000], + '_': [0b000, 0b000, 0b111], + '.': [0b000, 0b000, 0b010], + '|': [0b010, 0b010, 0b010], + '/': [0b001, 0b010, 0b100], + '\\': [0b100, 0b010, 0b001], + 's': [0b011, 0b010, 0b110], + 'x': [0b101, 0b010, 0b101], + } + + def __init__(self, i2c_freq=SystemBase.I2C_FREQ): + super().__init__() + i2c.init(freq=i2c_freq) + print("System %s initialized, voltage %sV" % (self.get_system_type(), self.get_supply_voltage())) + + def get_system_type(self): + return self.SYS_MBIT + + def ticks_us(self): + return ticks_us() + + def ticks_diff(self, ticks1, ticks2): + return ticks_diff(ticks1, ticks2) + + def sleep_us(self, us): + sleep(us / 1_000_000) + + def i2c_read(self, addr: int, n: int) -> bytes: + return i2c.read(addr, n) + + def i2c_write(self, addr: int, buf: bytes): + i2c.write(addr, buf) + + def i2c_scan(self) -> list[int]: + return i2c.scan() + + def pin_read_digital(self, pin): + return pin.read_digital() + + def pin_write_digital(self, pin, value: int): + pin.write_digital(value) + + def set_sonar_angle_pwm(self, angle_pwm: int): + pin1.write_analog(angle_pwm) + + def get_sonar_echo_delay_us(self, timeout_us) -> int: + self.pin_write_digital(pin8, 1) + self.pin_write_digital(pin8, 0) + return time_pulse_us(pin12, 1, timeout_us) + + def get_encoder_pin_left(self): + return pin14 + + def get_encoder_pin_right(self): + return pin15 + + def get_adc_value(self) -> int: + return pin2.read_analog() + + def is_button_a_pressed(self): + return button_a.is_pressed() + + def is_button_b_pressed(self): + return button_b.is_pressed() + + def display_text(self, label): + """Sets a label on the robot display (prints in log, displays the first letter on the screen).""" + print("Label: %s" % label) + display.show(label[0]) + + def display_sensors(self, il, ir, ll, lc, lr, y=4, lb=9, ib=5): + """Displays the sensors in top line of the display as pixels for each sensor. + Line sensors (left, center, right) are far left, center, far right, lb is line brightness 0-9, default 9. + IR sensors (left, right) are interlaced among them, ib is IR brightness 0-9, default 5.""" + display.set_pixel(4, y, lb if ll else 0) + display.set_pixel(2, y, lb if lc else 0) + display.set_pixel(0, y, lb if lr else 0) + display.set_pixel(3, y, ib if il else 0) + display.set_pixel(1, y, ib if ir else 0) + + def display_drive_mode(self, mode: str): + """Displays the drive mode in the center (3x3 pixels), overriding choice, supporting + all pictograms defined in DRIVE_MODE_PICTOGRAMS (other characters clear the area).""" + lines = self.DRIVE_MODE_PICTOGRAMS[mode if mode in self.DRIVE_MODE_PICTOGRAMS else ' '] + self.display_bitmap(1, 2, 3, lines) + + def display_choice(self, choice: str): + """Displays the choice in the center (3x3 pixels), overriding drive mode, supporting + all pictograms defined in DRIVE_MODE_PICTOGRAMS (other characters clear the area).""" + self.display_drive_mode(choice) + + def get_drive_mode_symbol_keys(self): + return list(self.DRIVE_MODE_PICTOGRAMS.keys()) + + def display_speed(self, speed_now, speed_max, left: bool): + """Displays the current speed on the display (represented as a 3-pixel bar) on the right side of display.""" + intensity = 3 + height_max = 4 + height = int(height_max * speed_now / speed_max) + x_pos = 4 if left else 0 + for y in range(height_max): + display.set_pixel(x_pos, y, intensity if y < height else 0) + + def display_bitmap(self, x_pos: int, y_pos: int, width: int, lines: list[int]): + """Displays the bitmap on the display (0x0 = top left, max 5x5). Bitwise, each line int is right-aligned.""" + for y in range(len(lines)): + for x in range(width): + display.set_pixel(x_pos + x, 4 - (y_pos + y), 9 if lines[y] & (1 << x) else 0) + + def display_clear(self): + """Clears the display.""" + display.clear() + + def display_on(self): + """Enables the display.""" + display.on() + display.clear() + + def display_off(self): + """Disables the display.""" + display.off() diff --git a/lesson_14/system_ped.py b/lesson_14/system_ped.py new file mode 100644 index 0000000..fdb8e0d --- /dev/null +++ b/lesson_14/system_ped.py @@ -0,0 +1,188 @@ +from time import monotonic_ns, sleep + +from analogio import AnalogIn +from board import P1, P2, P8, P12, P14, P15 +from digitalio import DigitalInOut, Direction +from picoed import i2c, display, button_a, button_b +from pulseio import PulseIn +from pwmio import PWMOut + +from system import System as SystemBase + + +class System(SystemBase): + """Pico:Ed implementation of the System class. + The Pico:Ed board (I2C, pins, buttons, display) use library at https://github.com/elecfreaks/circuitpython_picoed. + Display uses IS31FL3731 library at https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731. + Light uses NeoPixel library at https://github.com/adafruit/Adafruit_CircuitPython_NeoPixel. + Sonar code is inspired by HC-SR04 library at https://github.com/adafruit/Adafruit_CircuitPython_HCSR04.""" + + DRIVE_MODE_PICTOGRAMS = { + ' ': [0b00000, 0b00000, 0b00000, 0b00000, 0b00000], + 'TL': [0b00000, 0b00000, 0b11100, 0b00100, 0b00100], # sharp turn to left + 'TR': [0b00000, 0b00000, 0b00111, 0b00100, 0b00100], # sharp turn to right + 'IT': [0b00000, 0b00000, 0b11111, 0b00100, 0b00100], # intersection left-right (T) + 'IL': [0b00100, 0b00100, 0b11100, 0b00100, 0b00100], # intersection left-straight (T to left) + 'IR': [0b00100, 0b00100, 0b00111, 0b00100, 0b00100], # intersection right-straight (T to right) + 'IY': [0b10001, 0b01010, 0b00100, 0b00100, 0b00100], # split in the road (Y) + 'I+': [0b00100, 0b00100, 0b11111, 0b00100, 0b00100], # intersection all directions (+) + '<': [0b00010, 0b00100, 0b01111, 0b00100, 0b00010], # interactive choice left + '^': [0b00000, 0b00100, 0b01110, 0b10101, 0b00100], # interactive choice forward + '>': [0b00100, 0b00010, 0b01111, 0b00010, 0b00100], # interactive choice right + '-': [0b00000, 0b00000, 0b11111, 0b00000, 0b00000], + '_': [0b00000, 0b00000, 0b00000, 0b00000, 0b11111], + '.': [0b00000, 0b00000, 0b00000, 0b00000, 0b00100], + '|': [0b00100, 0b00100, 0b00100, 0b00100, 0b00100], + '/': [0b00001, 0b00010, 0b00100, 0b01000, 0b10000], + '\\': [0b10000, 0b01000, 0b00100, 0b00010, 0b00001], + 's': [0b00111, 0b01000, 0b01110, 0b00010, 0b11100], + 'x': [0b10001, 0b01010, 0b00100, 0b01010, 0b10001], + } + + def __init__(self): + super().__init__() + # Sonar servo + self.pin1 = PWMOut(P1, frequency=100) + # ADC + self.pin2 = AnalogIn(P2) + # Sonar trigger + self.pin8 = DigitalInOut(P8) + self.pin8.direction = Direction.OUTPUT + # Sonar echo + self.pin12 = PulseIn(P12) + # Encoder left + self.pin14 = DigitalInOut(P14) + self.pin14.direction = Direction.INPUT + # Encoder right + self.pin15 = DigitalInOut(P15) + self.pin15.direction = Direction.INPUT + print("System %s initialized, voltage %sV" % (self.get_system_type(), self.get_supply_voltage())) + + def get_system_type(self): + return self.SYS_PICO + + def ticks_us(self): + return monotonic_ns() // 1000 + + def ticks_diff(self, ticks1, ticks2): + return abs(ticks1 - ticks2) + + def sleep_us(self, us): + sleep(us / 1_000_000) + + def i2c_scan(self) -> list[int]: + while not i2c.try_lock(): + pass + ret = i2c.scan() + i2c.unlock() + return ret + + def i2c_read(self, addr: int, n: int) -> bytes: + while not i2c.try_lock(): + pass + buffer = bytearray(n) + i2c.readfrom_into(addr, buffer, start=0, end=n) + i2c.unlock() + return buffer + + def i2c_write(self, addr: int, buf: bytes): + while not i2c.try_lock(): + pass + i2c.writeto(addr, buf) + i2c.unlock() + + def pin_read_digital(self, pin): + return 1 if pin.value else 0 + + def pin_write_digital(self, pin, value: int): + pin.value = value != 1 + + def set_sonar_angle_pwm(self, angle_pwm: int): + scaled_value = int((angle_pwm / 128) * 16384) + self.pin1.duty_cycle = scaled_value + + def get_sonar_echo_delay_us(self, timeout_us) -> int: + # Trigger the sonar w/ 10ms pulse + self.pin8.value = True + self.sleep_us(10) + self.pin8.value = False + + self.pin12.clear() + self.pin12.resume() + start_time = monotonic_ns() + while not self.pin12: + if (monotonic_ns() - start_time) > timeout_us * 1000: + self.pin12.pause() + return -1 + self.pin12.pause() + return self.pin12[0] if len(self.pin12) > 0 else -1 + + def get_encoder_pin_left(self): + return self.pin14 + + def get_encoder_pin_right(self): + return self.pin15 + + def get_adc_value(self) -> int: + # scale ADC value to 10-bit value as expected by the caller + return self.pin2.value * 1024 // 16384 + + def is_button_a_pressed(self): + return button_a.is_pressed() + + def is_button_b_pressed(self): + return button_b.is_pressed() + + def display_text(self, label): + print("Label: %s" % label) + display.scroll(label[0:3]) + + def display_sensors(self, il, ir, ll, lc, lr, y=6, lb=32, ib=3): + """Displays the sensors in top line of the display as pixels for each sensor. + Line sensors (left, center, right) are far left, center, far right, lb is line brightness 0-9, default 9. + IR sensors (left, right) are interlaced among them, ib is IR brightness 0-9, default 5.""" + x_pos = 4 + stretch = 2 + display.pixel(x_pos + 4 * stretch, y, lb if ll else 0) + display.pixel(x_pos + 2 * stretch, y, lb if lc else 0) + display.pixel(x_pos + 0 * stretch, y, lb if lr else 0) + display.pixel(x_pos + 3 * stretch, y, ib if il else 0) + display.pixel(x_pos + 1 * stretch, y, ib if ir else 0) + + def display_drive_mode(self, mode: str): + """Displays the drive mode in the display center (5x5 pixels), supporting + all pictograms defined in DRIVE_MODE_PICTOGRAMS (other characters clear the area).""" + lines = self.DRIVE_MODE_PICTOGRAMS[mode if mode in self.DRIVE_MODE_PICTOGRAMS else ' '] + self.display_bitmap(6, 0, 5, lines) + + def display_choice(self, choice: str): + """Displays the choice next to the drive mode (5x5 pixels), supporting + all pictograms defined in DRIVE_MODE_PICTOGRAMS (other characters clear the area).""" + lines = self.DRIVE_MODE_PICTOGRAMS[choice if choice in self.DRIVE_MODE_PICTOGRAMS else ' '] + self.display_bitmap(1, 0, 5, lines) + + def get_drive_mode_symbol_keys(self): + return list(self.DRIVE_MODE_PICTOGRAMS.keys()) + + def display_speed(self, speed_now, speed_max, left: bool): + """Displays the current speed as a horizontal bar on the left or right of the display.""" + intensity = 2 + height_max = 7 + height = int(height_max * speed_now / speed_max) + x_pos = 16 if left else 0 + for y in range(height_max): + display.pixel(x_pos, y, intensity if y < height else 0) + + def display_bitmap(self, x_pos: int, y_pos: int, width: int, lines: list[int]): + for y in range(len(lines)): + for x in range(width): + display.pixel(x_pos + width - x - 1, y_pos + width - y - 1, 9 if lines[y] & (1 << (width - x - 1)) else 0) + + def display_clear(self): + display.fill(0) + + def display_on(self): + pass + + def display_off(self): + self.display_clear() diff --git a/lesson_14/wheel.py b/lesson_14/wheel.py new file mode 100644 index 0000000..b2f7a09 --- /dev/null +++ b/lesson_14/wheel.py @@ -0,0 +1,143 @@ +from wheel_encoder import WheelEncoder +from system import System + + +class Wheel: + """Handles single wheel capable of moving forward or backward + with given (variable) speed and stop immediately or conditionally + based on distance and time.""" + + def __init__(self, system: System, name, motor_fwd_cmd, motor_rwd_cmd, sensor_pin, + pwm_min=60, pwm_max=255, pwm_multiplier=0, pwm_shift=0): + """Initializes the wheel.""" + self.system = system + self.name = name + self.motor_fwd_cmd = motor_fwd_cmd + self.motor_rwd_cmd = motor_rwd_cmd + self.distance_remain_ticks = -1 + self.distance_req_time_us = -1 + self.distance_start_time_us = 0 + self.speed_pwm = 0 + self.enc = WheelEncoder(system=system, sensor_pin=sensor_pin) + self.pwm_min = pwm_min + self.pwm_max = pwm_max + self.pwm_multiplier = pwm_multiplier + self.pwm_shift = pwm_shift + + def move_pwm(self, speed_pwm): + """Moves the wheel using given PWM speed (indefinite ticks, time). + The wheel will continue to move until stop() is called. + The PWM speed is a value between -255 and 255, where 0 means stop.""" + self.set_speed_pwm(speed_pwm) + self.distance_remain_ticks = -1 + self.distance_req_time_us = -1 + + def move_rad(self, speed_rad): + """Moves the wheel using given rad/sec speed (indefinite ticks, time). + The wheel will continue to move until stop() is called.""" + speed_pwm = self.radsec2pwm(speed_rad) + self.move_pwm(speed_pwm + self.pwm_min if speed_pwm > 0 else speed_pwm - self.pwm_min) + + def move_pwm_for_ticks(self, speed_pwm, distance_ticks): + """Moves the wheel forward using given PWM speed for the given distance + in sensor ticks. If the motor is already moving, the asked distance is added + to the remaining distance and the motor continues until no distance remains.""" + self.set_speed_pwm(speed_pwm) + print("Moving %s wheel with speed %d pwm for distance %f ticks" % (self.name, speed_pwm, distance_ticks)) + self.distance_remain_ticks += distance_ticks + + def move_pwm_for_time(self, speed_pwm, distance_time_us): + """Moves the wheel forward using given PWM speed for the given time. + If the motor is already moving, the distance in time is added to the current + distance and the motor continues to move until the total time is reached.""" + self.set_speed_pwm(speed_pwm) + self.distance_req_time_us += distance_time_us + if self.distance_start_time_us == 0: + self.distance_start_time_us = self.system.ticks_us() + + def move_pwm_for_distance(self, speed_pwm, distance): + """Moves the wheel forward using given PWM speed for given distance in meters.""" + distance_ticks = int(distance * self.enc.TICKS_PER_M) + self.move_pwm_for_ticks(speed_pwm, distance_ticks) + + def move_radsec_for_distance(self, radsec, distance): + """Moves the wheel using given rad/s speed for given distance in meters.""" + print("Moving %s wheel with speed %f rad/s for distance %f m" % (self.name, radsec, distance)) + speed_pwm = self.radsec2pwm(radsec) + distance_ticks = int(distance * self.enc.TICKS_PER_M) * 2 + self.move_pwm_for_ticks(speed_pwm, distance_ticks) + + def set_speed_pwm(self, speed_pwm): + """Sets the wheel PWM speed (and direction). Does not affect the remaining + distance or time previously set to perform. If the wheel was going + in the other direction, resets the H-bridge other direction first.""" + if speed_pwm == 0: + if self.speed_pwm != 0: + # print("Stopping %s wheel" % self.name) + self.system.i2c_write_motor(bytes([self.motor_fwd_cmd, 0])) + self.system.i2c_write_motor(bytes([self.motor_rwd_cmd, 0])) + self.speed_pwm = 0 + return + speed_pwm = int(max(-255, min(255, speed_pwm))) + if self.speed_pwm == speed_pwm: + return + self.enc.reset() + if (self.speed_pwm < 0 < speed_pwm) or (self.speed_pwm > 0 > speed_pwm): + # if we are changing the direction, we need to reset the motor first + motor_reset_cmd = (self.motor_rwd_cmd + if speed_pwm >= 0 else self.motor_fwd_cmd) + # print("Changing %s wheel direction" % self.name) + self.system.i2c_write_motor(bytes([motor_reset_cmd, 0])) + motor_set_cmd = self.motor_fwd_cmd if speed_pwm > 0 else self.motor_rwd_cmd + print("Setting %s wheel speed_pwm %d" % (self.name, speed_pwm)) + self.system.i2c_write_motor(bytes([motor_set_cmd, abs(speed_pwm)])) + self.speed_pwm = speed_pwm + + def radsec2pwm(self, radsec): + """Returns the PWM speed for the given rad/s speed. + We use the multiplier and shift values to calculate the PWM speed using formula: + rad_per_sec = pwm * multiplier + shift, for us: pwm = (rad_per_sec - shift) / multiplier.""" + if self.pwm_multiplier == 0: + print("error: wheel %s pwm_multiplier is 0" % self.name) + return 0 + direction = 1 if radsec >= 0 else -1 + return direction * int((abs(radsec) - self.pwm_shift) / self.pwm_multiplier) + + def msec2pwm(self, msec): + """Returns the PWM speed for the given m/s speed.""" + rad_per_sec = self.enc.m2rad(msec) + return self.radsec2pwm(rad_per_sec) + + def stop(self): + """Stops the wheel immediately.""" + self.set_speed_pwm(0) + self.distance_remain_ticks = -1 + self.distance_req_time_us = -1 + self.enc.reset() + + def stop_on_no_work(self): + """Stops the wheel if the remaining distance in ticks or time is reached.""" + stop_due_to_ticks = True + if self.distance_remain_ticks != 0: + stop_due_to_ticks = False + stop_due_to_time = True + if self.distance_req_time_us >= 0: + time_delta = self.system.ticks_diff(self.system.ticks_us(), self.distance_start_time_us) + if time_delta < self.distance_req_time_us: + stop_due_to_time = False + # we stop only if both conditions are met + # otherwise we keep the other condition finish as well + if stop_due_to_ticks and stop_due_to_time: + self.stop() + + def on_tick(self): + """Updates the wheel state based on a new tick, + checks the remaining distance in ticks.""" + if self.distance_remain_ticks > 0: + self.distance_remain_ticks -= 1 + + def update(self): + """Updates the encoder and general wheel state.""" + if self.enc.update() is True: + self.on_tick() + self.stop_on_no_work() diff --git a/lesson_14/wheel_calibrator.py b/lesson_14/wheel_calibrator.py new file mode 100644 index 0000000..b45cdc5 --- /dev/null +++ b/lesson_14/wheel_calibrator.py @@ -0,0 +1,120 @@ +from wheel import Wheel +from system import System + + +class WheelCalibrator: + def __init__(self, system: System, wheel: Wheel): + """Initializes the wheel calibrator.""" + self.system = system + self.wheel = wheel + self.p2m2radsec = [0.0 for _ in range(wheel.pwm_min, wheel.pwm_max + 1)] + self.pwm_min = 0 + self.pwm_max = 0 + self.conversion_table_available = False + + def gather_pwm_to_real_speed_table_full(self): + """Gathers the real forward and reverse speeds for a desired PWM range + based on the encoder readings. Each value is scanned after half a second. + The calibration fills the conversion table between PWM and rad/s.""" + self.pwm_min = 0.0 + for speed_pwm in range(self.wheel.pwm_min, self.wheel.pwm_max + 1): + self.calibrate_pwm(speed_pwm=speed_pwm, gather_min=True) + self.calculate_pwm_value_multiplier_and_shift() + self.conversion_table_available = True + + def gather_pwm_to_real_speed_table_approx(self): + """Gathers the approximate forward and reverse speeds for a desired PWM range + based on the encoder readings. The range is sampled from bottom to top + in 10 PWM step intervals to find the lowest moving speed. As a follow-up step, + the top speed is scanned as well to find the highest moving speed. + The calibration fills the conversion table between PWM and rad/s using a linear + approximation. Multiplier (a) and shift (b) are calculated for the equation + y = a * x + b.""" + # minimum speed + speed_pwm = self.wheel.pwm_min + while speed_pwm <= self.wheel.pwm_max: + radsec, msec = self.gather_rad_msec_for_pwm(speed_pwm) + self.p2m2radsec[speed_pwm - self.wheel.pwm_min] = radsec + if radsec > 0.0: + self.pwm_min = speed_pwm + break + speed_pwm += 10 + if self.pwm_min == 0: + print("No movement detected when going through pwm_min .. pwm_max range, %s wheel calibration failed" + % self.wheel.name) + return -1 + if self.pwm_min > self.wheel.pwm_min: + print("Altering %s wheel pwm_min from %s to %s" % (self.wheel.name, self.wheel.pwm_min, self.pwm_min)) + self.wheel.pwm_min = self.pwm_min + + # maximum speed + speed_pwm = self.wheel.pwm_max + radsec, msec = self.gather_rad_msec_for_pwm(speed_pwm) + self.p2m2radsec[speed_pwm - self.wheel.pwm_min] = radsec + if radsec > 0.0: + self.pwm_max = speed_pwm + else: + print("No movement detected on pwm_max speed, %s wheel calibration failed" % self.wheel.name) + return -1 + + # linear approximation in radians per second + rad_speed_delta = (self.p2m2radsec[self.pwm_max - self.wheel.pwm_min] + - self.p2m2radsec[0]) + a = rad_speed_delta / (self.pwm_max - self.pwm_min) + b = self.p2m2radsec[0] - a * self.pwm_min + for speed_pwm in range(self.wheel.pwm_min, self.wheel.pwm_max + 1): + speed_write = a * speed_pwm + b + self.p2m2radsec[speed_pwm - self.wheel.pwm_min] = speed_write + self.calculate_pwm_value_multiplier_and_shift() + self.conversion_table_available = True + + def calibrate_pwm(self, speed_pwm, gather_min): + radsec, msec = self.gather_rad_msec_for_pwm(speed_pwm) + self.p2m2radsec[speed_pwm - self.wheel.pwm_min] = radsec + if gather_min and radsec > 0.0 and self.pwm_min == 0: + self.pwm_min = speed_pwm + + def gather_rad_msec_for_pwm(self, speed_pwm): + """Moves the wheel forward using given PWM speed for half a second, + returns the speed in rad/s and m/s.""" + start_time = self.system.ticks_us() + self.wheel.move_pwm(speed_pwm) + while self.system.ticks_diff(self.system.ticks_us(), start_time) <= 500_000: + self.wheel.update() + radsec = self.wheel.enc.speed_radsec + msec = self.wheel.enc.speed_msec() + self.wheel.stop() + return radsec, msec + + def calculate_pwm_value_multiplier_and_shift(self): + """ + Calculates pwm multiplier and shift using least squares regression (from valid pwm range). + multiplier = (count()*sum(pwd*rad) - sum(pwm)*sum(rad)) / (count()*sum(pwm*pwm) - sum(pwm)*sum(pwm)) + shift = (sum(rad) - multiplier*sum(pwm)) / count() + """ + count = self.wheel.pwm_max - self.wheel.pwm_min + 1 + sum_pwm = 0 + sum_pwm_mult_pwm = 0 + sum_rad = 0 + sum_pwm_mult_rad = 0 + for pwm in range(self.wheel.pwm_min, self.wheel.pwm_max + 1): + sum_pwm += pwm + sum_pwm_mult_pwm += pwm * pwm + sum_rad += self.p2m2radsec[pwm - self.wheel.pwm_min] + sum_pwm_mult_rad += pwm * self.p2m2radsec[pwm - self.wheel.pwm_min] + self.wheel.pwm_multiplier = (count * sum_pwm_mult_rad - sum_pwm * sum_rad) / \ + (count * sum_pwm_mult_pwm - sum_pwm * sum_pwm) + self.wheel.pwm_shift = (sum_rad - self.wheel.pwm_multiplier * sum_pwm) / count + print("Altering %s wheel multiplier: %s, shift: %s" % + (self.wheel.name, self.wheel.pwm_multiplier, self.wheel.pwm_shift)) + + def calibration_table_to_csv(self): + print("CSV calibration data for %s wheel (pwm_min = %s, multiplier = %s, shift = %s):" + % (self.wheel.name, self.wheel.pwm_min, self.wheel.pwm_multiplier, self.wheel.pwm_shift)) + print("pwm,radsec,msec") + for pwm in range(self.wheel.pwm_min, self.wheel.pwm_max + 1): + # We just print the calibration data for the border values (min 5, max 5) + if pwm < self.wheel.pwm_min + 5 or pwm > self.wheel.pwm_max - 5: + radsec = self.p2m2radsec[pwm - self.wheel.pwm_min] + msec = self.wheel.enc.rad2m(radsec) + print("%d,%f,%f" % (pwm, radsec, msec)) diff --git a/lesson_14/wheel_driver.py b/lesson_14/wheel_driver.py new file mode 100644 index 0000000..70534db --- /dev/null +++ b/lesson_14/wheel_driver.py @@ -0,0 +1,66 @@ +from system import System +from wheel import Wheel + + +class WheelDriver: + """Handles the movement of the whole robot + (forward, backward, turning). Activities are either + indefinite or conditional based on ticks, time + or real speed measured by the encoder on wheel level.""" + + def __init__(self, system: System, + left_pwm_min=50, left_pwm_max=255, left_pwm_multiplier=0, left_pwm_shift=0, + right_pwm_min=50, right_pwm_max=255, right_pwm_multiplier=0, right_pwm_shift=0): + """Initializes the wheel driver.""" + self.system = system + self.system.i2c_init_motor() + self.left = Wheel(system=system, name="left", + motor_fwd_cmd=5, motor_rwd_cmd=4, sensor_pin=system.get_encoder_pin_left(), + pwm_min=left_pwm_min, pwm_max=left_pwm_max, + pwm_multiplier=left_pwm_multiplier, pwm_shift=left_pwm_shift) + self.right = Wheel(system=system, name="right", + motor_fwd_cmd=3, motor_rwd_cmd=2, sensor_pin=system.get_encoder_pin_right(), + pwm_min=right_pwm_min, pwm_max=right_pwm_max, + pwm_multiplier=right_pwm_multiplier, pwm_shift=right_pwm_shift) + self.speed_rad = -99 + self.rotation_rad = -99 + self.stop() + + # Please note: normally, we would have aggregate move...() methods here for both wheels, but + # these got removed in favor of smaller code memory footprint + we control each wheel separately anyway. + + def move(self, speed_rad, rotation_rad): + """Moves the robot with specific PWM on each wheel while applying rotational speed in radians. + Positive rotation is clockwise, negative rotation is counterclockwise. + We first need to calculate the speed of each wheel based on the desired speed and rotation.""" + if speed_rad == 0 and rotation_rad == 0: + self.stop() + return + reverse = speed_rad < 0 + if reverse: + rotation_rad = -rotation_rad + speed_rad = abs(speed_rad) + left_speed = speed_rad - self.left.enc.WHEEL_CIRCUMFERENCE_M * rotation_rad + right_speed = speed_rad + self.right.enc.WHEEL_CIRCUMFERENCE_M * rotation_rad + if reverse: + left_speed = -left_speed + right_speed = -right_speed + print("Moving with speed_rad %d, rotation_rad %f, left_pwm %s, right_pwm %s" % (speed_rad, rotation_rad, left_speed, right_speed)) + self.left.move_rad(left_speed) + self.right.move_rad(right_speed) + self.speed_rad = speed_rad + self.rotation_rad = rotation_rad + + def stop(self): + """Stops the robot.""" + if self.speed_rad == 0 and self.rotation_rad == 0: + return + self.left.stop() + self.right.stop() + self.speed_rad = 0 + self.rotation_rad = 0 + + def update(self): + """Updates the wheel driver, propagating the changes to the hardware.""" + self.left.update() + self.right.update() diff --git a/lesson_14/wheel_encoder.py b/lesson_14/wheel_encoder.py new file mode 100644 index 0000000..1450abc --- /dev/null +++ b/lesson_14/wheel_encoder.py @@ -0,0 +1,104 @@ +from system import System + +class WheelEncoder: + """Encoder is able to monitor the wheel movement precisely + and provide the actual wheel rotation speed over the ticks + measured for X consecutive constant time intervals.""" + USE_BOTH_EDGES = False + TICKS_PER_WHEEL = 40 if USE_BOTH_EDGES else 20 + RAD_PER_WHEEL = 2 * 3.14159265359 + RAD_PER_TICK = RAD_PER_WHEEL / TICKS_PER_WHEEL + WHEEL_CIRCUMFERENCE_M = 0.21 + WHEEL_RADIUS_M = WHEEL_CIRCUMFERENCE_M / RAD_PER_WHEEL + WHEEL_CENTER_DISTANCE = 0.075 + M_PER_WHEEL = RAD_PER_WHEEL * WHEEL_RADIUS_M + TICKS_PER_M = TICKS_PER_WHEEL / M_PER_WHEEL + MIN_TICK_TIME_US = 5_000 # minimum possible tick time (switch instability detection under this value) + MAX_TICK_TIME_US = 200_000 # maximum possible tick time (after which we consider speed to be zero) + AVG_TICK_COUNT = 3 + + def __init__(self, system: System, sensor_pin): + """Initializes the wheel encoder.""" + self.system = system + self.sensor_pin = sensor_pin + self.sensor_value = -1 + self.tick_last_time = -1 + self.tick_last_time_avg = -1 + self.update_count = 0 + self.tick_count = 0 + self.speed_radsec = 0 + self.speed_radsec_avg = 0 + self.calc_value = -1 + self.calc_tick = 0 + self.calc_update_count = -1 + + def reset(self): + """Resets the encoder state.""" + self.__init__(self.system, self.sensor_pin) + + def update(self): + """Updates the encoder state based on the ongoing command.""" + """Retrieves the sensor value, checks for change and updates the wheel state + based on the ongoing command.""" + self.update_count += 1 + time_now = self.system.ticks_us() + last_time_diff = self.system.ticks_diff(time_now, self.tick_last_time) + if self.tick_last_time != -1 and last_time_diff < self.MIN_TICK_TIME_US: + return False + sensor_value_now = self.system.pin_read_digital(self.sensor_pin) + if sensor_value_now == self.sensor_value: + if last_time_diff >= self.MAX_TICK_TIME_US: + self.speed_radsec = 0 + return False + self.sensor_value = sensor_value_now + if self.tick_last_time == -1: + self.tick_last_time = time_now + self.tick_last_time_avg = time_now + return False + if sensor_value_now == 1: + if self.USE_BOTH_EDGES: + # compensate for much shorter time when the sensor is down + last_time_diff *= 1.8 + else: + # we count just 1->0 change in this mode (to achieve uniformity between 0 and 1) + return False + self.tick_last_time = time_now + self.speed_radsec = self.RAD_PER_TICK / (last_time_diff / 1_000_000) + + # calculate average speed (simplistic, just accumulate last several ticks once in a while) + self.tick_count += 1 + if self.tick_count < self.AVG_TICK_COUNT: + if self.speed_radsec_avg == 0: + self.speed_radsec_avg = self.speed_radsec + else: + last_time_avg_diff = self.system.ticks_diff(time_now, self.tick_last_time_avg) + self.speed_radsec_avg = self.RAD_PER_TICK * self.AVG_TICK_COUNT / (last_time_avg_diff / 1_000_000) + self.tick_last_time_avg = time_now + self.tick_count = 0 + + self.calc_value = sensor_value_now + self.calc_tick = self.tick_count + self.calc_update_count = self.update_count + if self.speed_radsec > 0 and self.update_count < (4 if self.USE_BOTH_EDGES else 2): + print("Warning: wheel encoder updating slow, %s counts per change" % self.update_count) + self.update_count = 0 + return True + + def speed_msec(self): + """Returns the current wheel speed in m/s.""" + return self.M_PER_WHEEL * self.speed_radsec / self.RAD_PER_WHEEL + + def speed_msec_avg(self): + """Returns the current wheel speed in m/s.""" + return self.M_PER_WHEEL * self.speed_radsec_avg / self.RAD_PER_WHEEL + + def m2rad(self, m): + """Converts meters to radians.""" + return self.RAD_PER_WHEEL * m / self.M_PER_WHEEL + + def rad2m(self, rad): + """Converts radians to meters.""" + return self.M_PER_WHEEL * rad / self.RAD_PER_WHEEL + + def __str__(self): + return "speed: %f rad/s, %f m/s" % (self.speed_radsec, self.speed_msec()) From 336e2e23c0b456023899d3a5ab149ae02497fb79 Mon Sep 17 00:00:00 2001 From: Roman Dolejsi Date: Sun, 27 Oct 2024 23:31:43 +0100 Subject: [PATCH 2/4] DU-14 - Line navigator - build script --- lesson_14/build.gradle | 366 ++++++++++++++++++ lesson_14/build_line_navigator | 2 + lesson_14/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + lesson_14/gradlew | 252 ++++++++++++ lesson_14/gradlew.bat | 94 +++++ 6 files changed, 721 insertions(+) create mode 100644 lesson_14/build.gradle create mode 100755 lesson_14/build_line_navigator create mode 100644 lesson_14/gradle/wrapper/gradle-wrapper.jar create mode 100644 lesson_14/gradle/wrapper/gradle-wrapper.properties create mode 100755 lesson_14/gradlew create mode 100644 lesson_14/gradlew.bat diff --git a/lesson_14/build.gradle b/lesson_14/build.gradle new file mode 100644 index 0000000..995fd50 --- /dev/null +++ b/lesson_14/build.gradle @@ -0,0 +1,366 @@ +/** + * Builds minified merged Python main.py and uploads it to a Micro:Bit or CircuitPython device (Pico:Ed, ...). + * All major OSes are supported, the following python packages need to be installed: + * - for minification - python-minifier (command 'pyminify' on path) + * - for Micro:bit - microfs (command 'ufs' on path) + * - for CircuitPython - circup (command 'circup' on path) - for auto-loading library support (todo) + * + * Tasks: + * clean .. cleans build/ directory + * mini .. minifies all sources into build/mini/ + * buildMini .. builds the merged minified source into build/mini/main.py + * build .. builds the merged (non-minified) source into build/main.py + calls buildMini + * upload .. uploads merged main.py file of choice to the detected platform (see upload options below) + * + * Generic options: + * -Pmain={file.py} .. specifies main.py file (last during merging), optional (autodetected), + * needed just when __main__ block is in multiple source files + * -Phw={file.py} .. specifies hardware-specific classes, default: hw.py | system.py + * -Phwcp={file.py} .. specifies CircuitPython-specific class, default: {hw}_cp.py or {hw}_ped.py + * -Phwmb={file.py} .. specifies Micro:Bit-specific class, default: {hw}_mb.py or {hw}_mbit.py + * -Pinclude={file1,file2,..} .. adds extra files outside of project dir (all *.py files in project are included automatically) + * -Pexclude={file1,file2,..} .. removes files from the source file list + * + * Multiple hardware implementations: + * When working with multiple platforms, -Phw, -Phwcp and -Phwmb properties will enable automatic class replacement + * based on the inserted device. The code is expected to just depend on base class defined in -Phw. During merging + * and minification, the base hardware class is kept with suffix *Base. It is expected the hardware-specific + * classes import and reference it as such in the original code while other classes just reference the original base + * class. The effect is that the specific hardware classes substitute it in the resulting code and none is the wiser. + * This way, the advanced editors will not have issues during programming, while we can have different implementation + * classes on resulting device, a bit like dependency injection. + * + * Upload options: + * -Pmini .. uploads minified version + * -Psudo .. uses supervisor permissions to operate (Unix/MacOS only, sometimes needed to gain port access on Linux for device uploads) + * -Pcp .. CircuitPython (Pico:Ed, ..) - autodetected on Ubuntu, detection left to 'circup' otherwise + * -Pmb .. Micro:Bit - fallback (default) option, uses 'ufs' and its port detection mechanism + * + * CircuitPython device environment variables (when defined, used for calling 'circup'): + * CP_PATH .. path to a mounted device (not needed for Ubuntu, but 'pmount' apt OS package needed if not mounted) + * CP_HOST .. CircuitPython host to contact in the form of (host}:{port}#{password} (*) - (todo) + * (*) Each CP device supports access over Wifi, see https://docs.circuitpython.org/en/latest/docs/workflows.html + * + * Example build commands: + * + * Basic non-minified build and upload if sudo is not needed, all sources are in local dir + there's just one __main__ block: + * ./gradlew clean build upload + * + * Minified build with sudo upload and added source file from other directory: + * ./gradlew -Pmini -Psudo -Pinclude=../cely_projekt/cely_projekt.py clean build upload + */ +import java.nio.file.Files +import java.util.stream.Collectors +import java.util.stream.Stream + +ext { + onWindows = System.getProperty("os.name").toLowerCase().contains("win") + useSudo = project.hasProperty('sudo') + useMini = project.hasProperty('mini') + cpPath = System.getenv('CP_PATH') != null ? System.getenv('CP_PATH') : + (!project.hasProperty('mb') ? detectCircuitPythonPath() : null) + cpHost = System.getenv('CP_HOST') + useCP = !project.hasProperty('mb') && (project.hasProperty('cp') || cpPath != null || cpHost != null) + useMB = project.hasProperty('mb') || !useCP + hwPrefixes = List.of('system', 'hardware', 'hw') + hwMBSuffixes = List.of('_mb', '_mbit') + hwCPSuffixes = List.of('_cp', '_ped') + hwType = useCP ? 'cp' : 'mb' + hwBase = project.hasProperty('hw') ? project.getProperty('hw') : ( + hwPrefixes.stream() + .map { prefix -> new File(projectDir, prefix + '.py') } + .filter { f -> f.exists() } + .findFirst().orElse(null) + ) + hwClasses = hwBase == null ? List.of() : + Stream.concat(hwMBSuffixes.stream(), hwCPSuffixes.stream()) + .map(suffix -> new File(projectDir, hwBase.getName().replaceAll("\\.py\$", suffix + '.py'))) + .filter { f -> f.exists() } + .collect(Collectors.toList()) + hwClass = project.hasProperty('hw' + hwType) ? project.getProperty('hw' + hwType) : ( + hwBase == null ? null : + (useMB ? hwMBSuffixes : hwCPSuffixes).stream() + .map(suffix -> new File(projectDir, hwBase.getName().replaceAll("\\.py\$", suffix + '.py'))) + .filter { f -> f.exists() } + .findFirst().orElse(null) + ) + miniDir = "${buildDir}/mini" + includedFiles = propertyCsvToFileList('include') + excludedFiles = propertyCsvToFileList('exclude') + mainFile = getMainFileName(includedFiles, excludedFiles) + // we need all local *.py sources, but we will need to exclude the indicated ones + // if hardware-specific override is configured, we need to exclude hw classes not matching the correct one + // we also need to exclude main.py (or whatever was specified as main) and put it at the very end explicitly + sourceFiles = Stream.concat( + Stream.concat( + includedFiles.stream(), + Arrays.stream(projectDir.listFiles()) + .filter { f -> f.name.endsWith('.py') } + .sorted { f1, f2 -> f1.name.compareTo(f2.name) } + ) + .filter { f -> !f.equals(mainFile) } + .filter { f -> !excludedFiles.contains(f) } + .filter { f -> hwClass == null || !hwClasses.contains(f) || f.equals(hwClass) }, + Stream.of(mainFile) + ).toList() +} + +if (hwBase != null && hwClass != null) { + logger.lifecycle("Enabling hardware-specific class replacement: suffix *Base added to ${hwBase.getName()}, real hardware in ${hwClass.getName()}") +} + +task clean { + doLast { + logger.lifecycle("Cleaning ..") + delete "${buildDir}" + } +} + +task minify { + doLast { + mkdir miniDir + sourceFiles.each { file -> + // our main.py is a merged file, we have to avoid name clash + def fileOut = file.name.replaceAll('^main\\.py$', 'main_.py') + exec { + workingDir projectDir + commandLine = [ + 'pyminify', file.getPath(), + '--remove-literal-statements', + '--remove-class-attribute-annotations', '--no-rename-locals', '--no-hoist-literals', + '--no-remove-explicit-return-none', '--no-remove-return-annotations', + '--output', "${miniDir}/${fileOut}" + ] + } + } + } +} + +def mergeSource(BufferedWriter writer, File source, Set imports, Map> importsFrom) { + logger.lifecycle("Merging ${source}") + writer.newLine() + writer.newLine() + try (BufferedReader reader = new BufferedReader(new FileReader(source))) { + boolean header = true; + while (reader.ready()) { + String line = reader.readLine() + if (header) { + if (line.startsWith("class") || line.startsWith("def") || line.startsWith("if")) { + header = false + // if we are dealing with a hardware class base, we will be suffixing with Base + // this will avoid conflict with actual inheriting implementation class + if (source.getName().equals(hwBase.getName()) && line.startsWith("class")) { + line = line.replaceAll(":\$", "Base:") + } + } else if (line.startsWith("import")) { + line = line.replaceFirst("import\\s+", "") + imports.addAll(Arrays.asList(line.split(",\\s*"))) + } else if (line.startsWith("from")) { + String importSource = line.replaceAll("from (\\S+)\\s?.*\$", "\$1") + String objects = line.replaceFirst("from\\s+(\\S+)\\s+import\\s+", "") + importsFrom.computeIfAbsent(importSource, value -> new LinkedHashSet<>()) + .addAll(Arrays.asList(objects.split(",\\s*"))) + } + } + if (!header) { + writer.write(line) + writer.newLine() + } + } + } +} + +def mergeAll(File target, List sourceFiles) { + def imports = new LinkedHashSet() + def importsFrom = new LinkedHashMap>() + String body + try (StringWriter bodyWriter = new StringWriter()) { + try (BufferedWriter writer = new BufferedWriter((bodyWriter))) { + sourceFiles.each { source -> mergeSource(writer, source, imports, importsFrom) } + } + body = bodyWriter.toString() + } + + List classSources = sourceFiles.stream() + .map { it.name.replaceAll("\\.py", "").replaceAll(".*/", "") } + .collect(Collectors.toList()) + try (BufferedWriter writer = new BufferedWriter((new FileWriter(target, false)))) { + logger.lifecycle("Merging all into ${target}") + String importsCsv = imports.stream() + .filter { !classSources.contains(it) } + .collect(Collectors.joining(", ")) + if (!importsCsv.trim().isBlank()) { + writer.write("import ${importsCsv}") + writer.newLine() + } + importsFrom.entrySet().forEach { entry -> + if (!classSources.contains(entry.getKey())) { + def objects = String.join(", ", entry.getValue()) + writer.write("from ${entry.getKey()} import ${objects}") + writer.newLine() + } + } + writer.write(body) + } +} + +task buildMini { + dependsOn minify + doLast { + List files = sourceFiles.stream() + .map { file -> + // when we were minifying, we had to minify into an alternate name + // to avoid target file name clash, here we need to use it as a new source + new File(miniDir, file.name.replaceAll('^main\\.py$', 'main_.py')) + } + .toList() + mergeAll(new File(miniDir, "main.py"), files) + } +} + +task build { + dependsOn buildMini + doLast { + mergeAll(new File(buildDir, "main.py"), sourceFiles) + } +} + +task upload { + shouldRunAfter build + doLast { + def uploadFile = new File(useMini ? miniDir : buildDir, "main.py") + if (cpHost != null) { + throw new Exception("CP_HOST environment variable not supported yet") + } + if (!useMB) { + if (cpPath == null) { + cpPath = detectCircuitPythonPath() + } + useCP |= cpPath != null + } + if (useCP) { + if (cpPath == null) { + throw new Exception("CIRCUITPY device not found, please mount it or set CP_PATH environment variable") + } + def cmd = useSudo ? + ['sudo', 'cp', "${uploadFile}", "${cpPath}/code.py"] : + ['cp', "${uploadFile}", "${cpPath}/code.py"] + logger.lifecycle("Copying ${useSudo ? "(using sudo) " : ""}merged ${useMini ? "minified " : ""}${uploadFile} to CircuitPython device path ${cpPath}/code.py") + exec { + workingDir "${projectDir}" + commandLine = cmd + } + if (!onWindows) { + logger.lifecycle("Syncing CircuitPython device ..") + exec { + workingDir "${projectDir}" + commandLine = ['sync'] + } + } + } else if (useMB) { + def cmd = useSudo ? + ['sudo', 'ufs', 'put', "${uploadFile}"] : + ['ufs', 'put', "${uploadFile}"] + logger.lifecycle("Uploading ${useSudo ? "(using sudo) " : ""}merged ${useMini ? "minified " : ""}${uploadFile} to Micro:Bit device") + exec { + workingDir "${projectDir}" + commandLine = cmd + } + } else { + throw new Exception("Unknown platform, please specify -Pcp or -Pmb") + } + } +} + +List propertyCsvToFileList(String property) { + List files = new ArrayList<>() + if (project.hasProperty(property)) { + List patterns = Arrays.asList(project.getProperty(property).split(",")) + files.addAll( + Arrays. stream(projectDir.listFiles()) + .filter { f -> f.name.endsWith('.py') } + .filter { f -> patterns.stream().anyMatch { p -> f.name.matches(p) } } + .toList() + ) + } + return files +} + +/** + * Returns main file name from property (if defined), use main.py (if exists) or scan for content to find __main__. + */ +File getMainFileName(List includedFiles, List excludedFiles) { + if (project.hasProperty('main')) { + def mainFile = new File(projectDir, project.getProperty('main')) + if (!mainFile.exists()) { + throw new Exception("Indicated main file ${mainFile.getPath()} does not exist") + } + // any other main files in the directory are excluded automatically + excludedFiles.addAll( + Arrays. stream(projectDir.listFiles()) + .filter { f -> f.name.endsWith('.py') } + .filter { f -> f.name.startsWith('main_') } + .filter { f -> !f.equals(mainFile) } + .toList() + ) + return mainFile + } else if (new File(projectDir, 'main.py').exists()) { + return new File(projectDir, 'main.py') + } else { + def mainFiles = + Stream.concat( + includedFiles.stream(), + Arrays.stream(projectDir.listFiles()) + ) + .filter { f -> f.name.endsWith('.py') } + .filter { f -> !excludedFiles.contains(f) } + .filter { f -> Files.readAllLines(f.toPath()).contains('if __name__ == "__main__":') } + .toList() + if (mainFiles.isEmpty()) { + throw new Exception("No *.py files found in the project directory looking like a main code block") + } else if (mainFiles.size() > 1) { + excludedFiles.forEach { logger.lifecycle("Excluded: ${it.getAbsolutePath()}") } + logger.lifecycle("Excluded files: ${excludedFiles}") + throw new Exception("Multiple *.py files found in the project directory looking like a main code block: $mainFiles, please specify -Pmain={file}") + } + logger.lifecycle("Detected main code block in file ${mainFiles.getFirst()}") + return mainFiles.getFirst() + } +} + +def getDiskMountPoint(String diskLabel) { + def out = new ByteArrayOutputStream() + exec { + workingDir "${projectDir}" + commandLine = ['df'] + standardOutput = out + } + def line = out.toString().split("\n").stream().filter { it.contains(diskLabel) }.findFirst() + if (line.isEmpty()) { + return null + } + def mountPoint = line.get().replaceAll(".*\\s+", "") + logger.lifecycle("Detected disk ${diskLabel} mounted at ${mountPoint}") + return mountPoint +} + +// for Unix-like systems we can use 'df' to check the possible location of CIRCUITPY +def detectCircuitPythonPath() { + def cpPath = null + if (!onWindows) { + cpPath = getDiskMountPoint('CIRCUITPY') + if (cpPath == null) { + // if we still have nothing we can try to permissive-mount the disk by label (supported by Linux) + File cpDevFile = new File("/dev/disk/by-label/CIRCUITPY") + if (cpDevFile.exists()) { + logger.lifecycle("Detected CircuitPython device ${cpDevFile.getCanonicalPath()}, permissive-mounting ..") + exec { + workingDir "${projectDir}" + commandLine = ['pmount', cpDevFile.getCanonicalPath(), 'CIRCUITPY'] + } + cpPath = getDiskMountPoint('CIRCUITPY') + } + } + } + return cpPath +} diff --git a/lesson_14/build_line_navigator b/lesson_14/build_line_navigator new file mode 100755 index 0000000..e5ccf4f --- /dev/null +++ b/lesson_14/build_line_navigator @@ -0,0 +1,2 @@ +#!/bin/bash +./gradlew -Pmain=main_line_navigator.py -Pexclude=light.*,sonar.*,wheel_calibrator.* clean build upload diff --git a/lesson_14/gradle/wrapper/gradle-wrapper.jar b/lesson_14/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf=J?1`he3W*;m4)ce8*WFq1sdP=~$5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I z%Rkz#(S8Pjz*P7bqB6L|M#Er{|QLae-Y{KA>`^} z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6 z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd zl?w-|plD8spjDF03g5ip;W3Z z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8 z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R% z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO` z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX| z)_XpaI61<+La+U&&%2a z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX zDDH;3T*GzRT@5=7ibO>N-6_XPBYxno@mD_3I#rDD?iADxX`! zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS= z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP z5MC&=c6X;XlUzrz5q?(!eO@~* zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^ zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F zZg=-~qLb~VRLpv`k zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x!*E6eqmEm*j2bE@=ZI0YZ5%Yj29!5+J$4h{s($nakA`xgbO8w zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3! zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8 zHBvRqN^;$Jizy+ z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saGsD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vlRP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd zNoE)8FvQA>Z`eR5Z@Ig6kS5?0h;`Y&OL2D&xnnAUzQz{YSdh0k zB3exx%A2TyI)M*EM6htrxSlep!Kk(P(VP`$p0G~f$smld6W1r_Z+o?=IB@^weq>5VYsYZZR@` z&XJFxd5{|KPZmVOSxc@^%71C@;z}}WhbF9p!%yLj3j%YOlPL5s>7I3vj25 z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN; z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziGwpg-GM#251sK_ z=3|kitS!j%;fpc@oWn65SEL73^N&t>Ix37xgs= zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2 z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iKuPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx z+K3GKESI4*`tYlmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4UrFWr%LHkdQ;~XU zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8 zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#O%PeD_WvFO~Kct za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2 z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi42-WYU9Vhj~3< zZSM-B;E`g_o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2 z^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2ZuYySbp@hA# ze(kc;P4i_-_UDP?%<6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=NkMk$<8- z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk= z;&0}6LsGtfVa1q)CEUPlx#(ED@-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI zfd=``2&8GsycjR?M%(zMjn;tn9agcq;&rR!Hp z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@ zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8f~#aOFytCT zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKwOd?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5 zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~ zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@ z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQdkijLSOtX6xW%Z9Nw<;M- zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7 zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~ zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S! zR|lF%n!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts z!~@&!N`10S593pVQu4FzpOh!tvg}p%zCU(aV5=~K#bKi zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~# z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H ztJBFvFfsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S zZO!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@ zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R z@As?eG!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr% zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~ zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl z+?+nMGeQQhh~??0!s4iQ#gm3!BpMpnY?04kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt zW5hd~-HWBLI_3HuO) zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*! z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q z<5!4iuB#Q_lLZ8}h|hPODI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gGW~y3nfPAoV%amgr>PSyVAd@l)}8#X zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&89}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv; zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U|0{BW!m)9 zi_9$F?m<`2!`JNFv+w8MK_K)qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<+QCzRr*NA!QjHw# z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV- zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+ zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQjFn33lODt3Wb1j8VR zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6 zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM zJuLNTUVh#WsE*a6uqiz`b#9ZYg3+2%=C(6AvZGc=u&<6??!slB1a9K)=VL zY9EL^mfyKnD zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4 z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad> z;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb z1qtl?;_yjYo)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh zhNh;+eQ9BEIs;tPz%jSVnfCP!3L&9YtEP;svoj_bNzeGSQIAjd zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm` z*>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMabv~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS12kV?AZ%O0SFB$^ zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n# z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%TFafZwZ?5KZpcuaO54Z9hX zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V zK?4jV61B|1Uj_5fBKW;8LdwOFZKWp)g{B%7g1~DgO&N& z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{& z@vY&R1QmQs83BW28qAmJfS7MYi=h(YK??@EhjL-t*5W!p z^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP# zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<0Fbh^*l6!5wfSu8MpMoh=2l z^^0Sr$UpZp*9oqa23fcCfm7`ya2<4wzJ`Axt7e4jJrRFVf?nY~2&tRL* zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU z%l6hPZia>R!`aZjwCp}I zg)%20;}f+&@t;(%5;RHL>K_&7MH^S+7<|(SZH!u zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg zBwho$phWx}x!qy8&}6y5Vr$G{yGSE*r$^r{}pw zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd z&&yX@Hp>~(wU{|(#U&Bf92+1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe| zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI zsq7L{P}^#QsZViX%KgxBvEugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D* z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06 zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5 zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z z3u0qT0TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4nFK|hVAbHcZ3x{PzytQLkCVk7hA!Lo` zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8 z@Ht|vXd^6{Fgai8*tmyRGmD_s_nv~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!AaaX;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<| zX3tt?EAy<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m zOT}u;N|x@aq)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q zE>m=zF}!lObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu zC|T!gPiI1rWGb1z$Md?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk zfF#NLe>W$3m&C^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#!B4JE@GVH zoobHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_ z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`eQq*JYgt8xdFQ6S z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823 zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P zJveQj^hJL#Sn!*4k`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHHh5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m;n{r|;MU3!q4AVkua~fieeWu2 zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^ zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM zL z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9 z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@D$zuCPrkmz@sdv+{ciyFJG2Zwy&%c7;atIeTdh!a(R^QXnu1Oq1b42*OQFWnyQ zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h= zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMeoTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb z<5eqR=ZG3>n2{6v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(s7jdu0>LD#N=$Lk#3HkG!a zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@ zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5*Im1e_8Z${JsM>Ov?nh8Z zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW_1Mmf;76{LU z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI| zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf zssobT^(R@KuShj8>@!1M7tm|2%-pYYDxz-5`rCbaTCG5{;Uxm z*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$ zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyEkXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4 zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2 zo{mLtSy&BA!mSzs&CrKWq^y40JF5a&GSXIi2= z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG_6(p^eTxD-4O#lROgon;R35=|nj#eHIfJBYPWG>H>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0 zDoQ?=?I@Hbr;*VVll1Gmd8*%tiXggMK81a+T(5Gx6;eNb8=uYn z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4 z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(Dryv zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1 zKelh3-jr2I9V?ych`{hta9wQ2c9=MM`2cC{m6^MhlL2{DLv7C^j z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0 z^l01c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O05TCV=&3g)C!lT=czLpZ@Sa%TYuoE?v8T8`V;e$#Zf2_Nj6nvBgh1)2 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/lesson_14/gradle/wrapper/gradle-wrapper.properties b/lesson_14/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1ed247e --- /dev/null +++ b/lesson_14/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/lesson_14/gradlew b/lesson_14/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/lesson_14/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/lesson_14/gradlew.bat b/lesson_14/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/lesson_14/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 118be424bd2c2d73baa96cdf61c18f68574c5967 Mon Sep 17 00:00:00 2001 From: Roman Dolejsi Date: Mon, 28 Oct 2024 11:49:00 +0100 Subject: [PATCH 3/4] State machine: Intersection 'Y' implementation finalized --- lesson_14/state_intersection.py | 4 ++-- lesson_14/state_map.py | 30 +++++++++++++++++------------- lesson_14/state_turn.py | 21 +++++++++++++++++++++ 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/lesson_14/state_intersection.py b/lesson_14/state_intersection.py index 7c0f13f..b4c7d2e 100644 --- a/lesson_14/state_intersection.py +++ b/lesson_14/state_intersection.py @@ -60,8 +60,8 @@ def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): class IntersectYState(State): def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): actions = [InteractiveIntersectAction(symbol=symbol, choices=[ - Choice(symbol='<', target_state='TURN_L_ONTO_LINE'), - Choice(symbol='>', target_state='TURN_R_ONTO_LINE'), + Choice(symbol='<', target_state='TURN_L_TO_LINE'), + Choice(symbol='>', target_state='TURN_R_TO_LINE'), ])] super().__init__(symbol=symbol, actions=actions, matchers=matchers) diff --git a/lesson_14/state_map.py b/lesson_14/state_map.py index 5cc6a61..a16ac61 100644 --- a/lesson_14/state_map.py +++ b/lesson_14/state_map.py @@ -3,6 +3,7 @@ from state_intersection import IntersectXState, IntersectYState, IntersectTState, IntersectLState, IntersectRState from state_line import LineState from state_turn import LeftTurnState, RightTurnState, OffLineLeftTurnState, OffLineRightTurnState +from state_turn import ToLineLeftTurnState, ToLineRightTurnState class StateMap: @@ -31,11 +32,11 @@ def __init__(self, behavior: Behavior, stop_on_non_line_sensors=False, turns=Fal # Follows the line (no declarative matchers enabled, we transition in and out using advanced conditions) 'LINE': LineState(symbol='|'), } - line_transitions = [ 'STOP' ] + line_transitions = ['STOP'] self.transitions = { - 'START': [ 'LINE', 'STOP' ], + 'START': ['LINE', 'STOP'], 'LINE': line_transitions, - 'STOP': [ 'START' ], + 'STOP': ['START'], } if turns: @@ -65,8 +66,8 @@ def __init__(self, behavior: Behavior, stop_on_non_line_sensors=False, turns=Fal }) line_transitions.extend(['TURN_L', 'TURN_R']) self.transitions.update({ - 'TURN_L': [ 'STOP' ], - 'TURN_R': [ 'STOP' ], + 'TURN_L': ['STOP'], + 'TURN_R': ['STOP'], }) if intersections: @@ -137,16 +138,20 @@ def __init__(self, behavior: Behavior, stop_on_non_line_sensors=False, turns=Fal # extra turn operations needed to go off the intersection in the right sensor order 'TURN_L_OFF_LINE': OffLineLeftTurnState(symbol='TL'), 'TURN_R_OFF_LINE': OffLineRightTurnState(symbol='TR'), - + 'TURN_L_TO_LINE': ToLineLeftTurnState(symbol='TL'), + 'TURN_R_TO_LINE': ToLineRightTurnState(symbol='TR'), }) line_transitions.extend(['INTERSECT_X', 'INTERSECT_Y', 'INTERSECT_T', 'INTERSECT_L', 'INTERSECT_R']) self.transitions.update({ - 'INTERSECT_X': [ 'STOP'], - 'INTERSECT_R': [ 'STOP' ], - 'INTERSECT_L': [ 'STOP' ], - 'INTERSECT_T': [ 'STOP' ], - 'TURN_L_OFF_LINE': [ 'STOP' ], - 'TURN_R_OFF_LINE': [ 'STOP' ], + 'INTERSECT_X': ['STOP'], + 'INTERSECT_Y': ['STOP'], + 'INTERSECT_R': ['STOP'], + 'INTERSECT_L': ['STOP'], + 'INTERSECT_T': ['STOP'], + 'TURN_L_OFF_LINE': ['STOP'], + 'TURN_R_OFF_LINE': ['STOP'], + 'TURN_L_TO_LINE': ['STOP'], + 'TURN_R_TO_LINE': ['STOP'], }) print("Working with states:") @@ -156,6 +161,5 @@ def __init__(self, behavior: Behavior, stop_on_non_line_sensors=False, turns=Fal for state, transitions in self.transitions.items(): print(f"* {state} -> {transitions}") - def __str__(self): return "StateMap(%s)" % self.states diff --git a/lesson_14/state_turn.py b/lesson_14/state_turn.py index c09c127..586b8ce 100644 --- a/lesson_14/state_turn.py +++ b/lesson_14/state_turn.py @@ -86,6 +86,7 @@ def on_update(self, ctx: Ctx): class LeftTurnState(TurnState): + """Turns the car to the left from an empty space, first catching the left side sensor, then the center one.""" def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): actions = [ SideSeekTurnAction(symbol=symbol, matching_sensor=0b100, direction=1), @@ -95,6 +96,7 @@ def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): class RightTurnState(TurnState): + """Turns the car to the right from an empty space, first catching the right side sensor, then the center one.""" def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): actions = [ SideSeekTurnAction(symbol=symbol, matching_sensor=0b001, direction=-1), @@ -104,6 +106,7 @@ def __init__(self, symbol: str, matchers: list[SensorHistoryStateMatcher]): class OffLineLeftTurnState(TurnState): + """Turns the car to the left from a center line, first waiting for an empty space on all sensors, then left side sensor, then the center one.""" def __init__(self, symbol: str): actions = [ NoCenterSeekTurnAction(symbol=symbol, matching_sensor=0b000, direction=1), @@ -114,6 +117,7 @@ def __init__(self, symbol: str): class OffLineRightTurnState(TurnState): + """Turns the car to the right from a center line, first waiting for an empty space on all sensors, then right side sensor, then the center one.""" def __init__(self, symbol: str): actions = [ NoCenterSeekTurnAction(symbol=symbol, matching_sensor=0b000, direction=-1), @@ -121,3 +125,20 @@ def __init__(self, symbol: str): CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=-1) ] super().__init__(symbol=symbol, actions=actions, matchers=[]) + +class ToLineLeftTurnState(TurnState): + """Turns the car to the left just waiting for the center sensor to catch the line (disregarding side sensor).""" + def __init__(self, symbol: str): + actions = [ + CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=1) + ] + super().__init__(symbol=symbol, actions=actions, matchers=[]) + + +class ToLineRightTurnState(TurnState): + """Turns the car to the right just waiting for the center sensor to catch the line (disregarding side sensor).""" + def __init__(self, symbol: str): + actions = [ + CenterSeekTurnAction(symbol=symbol, matching_sensor=0b010, direction=-1) + ] + super().__init__(symbol=symbol, actions=actions, matchers=[]) From 660219dfc4c0fbf2d8fd347524de9f2110b6f97e Mon Sep 17 00:00:00 2001 From: Roman Dolejsi Date: Mon, 28 Oct 2024 16:59:56 +0100 Subject: [PATCH 4/4] main_line_navigator: outdated comments corrected --- lesson_14/main_line_navigator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_14/main_line_navigator.py b/lesson_14/main_line_navigator.py index 635a450..f5f67e4 100644 --- a/lesson_14/main_line_navigator.py +++ b/lesson_14/main_line_navigator.py @@ -4,7 +4,7 @@ from wheel_driver import WheelDriver if __name__ == "__main__": - # Tries to track a line, stop at first indecision (no line for 3 secs, intersection). + # Navigates across lines, turns at sharp turns and stops at intersections and asks for user input where to go system = System() wheels = WheelDriver( system=system,