flight checked

Author: benpaddlejones

README.md

@@ -55,15 +55,9 @@ Students will be recreating a model of the pedestrian crossing on Unwins Bridge
 
 ![A street view image of the system we will be modeling](/images/real_world_situation.png "The traffic lights, pedestrian warning lights, pedestrian button and control system.")
 
-From the above real world control system we will model:
-
-- Overloading and overriding polymorphism
-- Inheritance, multilevel inheritance and multiple class inheritance
-- Abstraction
-- Decomposition and composition
-- Generalisation
-- Encapsulation
-- Object instantiation, objects as instance variables
+### Final Product
+
+![Video of Final Project in Operations](/images/demonstration.gif)
 
 ### Wire your system
 

images/demonstration.gif

@@ -1,33 +1,29 @@
 from machine import Pin, PWM
-from time import sleep
+from time import sleep, time
+
 
 class Audio_Notification(PWM):
     def __init__(self, pin, debug=False):
         super().__init__(Pin(pin))
         self.__debug = debug
         self.duty_u16(0)  # Start with buzzer off
+        self._last_toggle_time = time()
 
     def warning_on(self):
         if self.__debug:
             print("Warning on")
-        # Generate 3 beeps
-        for _ in range(3):
-            self.beep(freq=1500, duration=100)
-            sleep(0.1)
+        now = time()
+        if now - self._last_toggle_time >= 0.5:
+            self.beep(freq=500, duration=100)
+            self._last_toggle_time = now
 
     def warning_off(self):
         if self.__debug:
             print("Warning off")
         self.duty_u16(0)  # Turn off sound
 
     def beep(self, freq=1000, duration=500):
-        """
-        Generate a beep on a piezo buzzer.
-
-        :param freq: frequency in Hz
-        :param duration: duration in milliseconds
-        """
         self.freq(freq)
         self.duty_u16(32768)  # 50% duty cycle
         sleep(duration / 1000)
-        self.duty_u16(0)  # Turn off after beep
+        self.duty_u16(0)  # Turn off after beep

images/physical_prototype.png

@@ -0,0 +1,110 @@
+from led_light import Led_Light
+from pedestrian_button import Pedestrian_Button
+from audio_notification import Audio_Notification
+from time import sleep, time
+
+
+class Controller:
+    def __init__(
+        self, ped_red, ped_green, car_red, car_amber, car_green, button, buzzer, debug
+    ):
+        self.__Ped_Red = ped_red
+        self.__Ped_Green = ped_green
+        self.__Car_Red = car_red
+        self.__Car_Amber = car_amber
+        self.__Car_Green = car_green
+        self.__Buzzer = buzzer
+        self.__Button = button
+        self.__debug = debug
+        self.state = "IDLE"
+        self.last_state_change = time()
+
+    def walk_on(self):
+        if self.__debug:
+            print("Walking")
+        self.__Ped_Red.off()
+        self.__Ped_Green.on()
+        self.__Car_Green.off()
+        self.__Car_Amber.off()
+        self.__Car_Red.on()
+        self.__Buzzer.warning_on()
+
+    def walk_warning(self):
+        if self.__debug:
+            print("No Walking Warning")
+        self.__Ped_Red.flash()
+        self.__Ped_Green.off()
+        self.__Car_Green.off()
+        self.__Car_Amber.off()
+        self.__Car_Red.on()
+        self.__Buzzer.warning_off()
+
+    def walk_off(self):
+        if self.__debug:
+            print("No Walking")
+        self.__Ped_Red.on()
+        self.__Ped_Green.off()
+        self.__Car_Green.on()
+        self.__Car_Amber.off()
+        self.__Car_Red.off()
+        self.__Ped_Green.off()
+        self.__Buzzer.warning_off()
+
+    def change(self):
+        if self.__debug:
+            print("Changing")
+        self.__Ped_Red.on()
+        self.__Ped_Green.off()
+        self.__Car_Green.off()
+        self.__Car_Amber.on()
+        self.__Car_Red.off()
+        self.__Ped_Green.off()
+        self.__Buzzer.warning_off()
+
+    def update(self):
+        # State machine logic
+        if self.state == "IDLE":
+            if self.__Button.button_state:
+                if self.__debug:
+                    print("Pedestrian waiting detected, switching to CAR_AMBER")
+                self.state = "CAR_AMBER"
+                self.last_state_change = time()
+                self.change()
+            else:
+                self.walk_off()
+        elif self.state == "CAR_AMBER":
+            # Wait 10 seconds before allowing walk
+            self.change()
+            if time() - self.last_state_change > 5:
+                if self.__debug:
+                    print("Switching to WALK_ON")
+                self.state = "WALK_ON"
+                self.last_state_change = time()
+                self.walk_on()
+        elif self.state == "WALK_ON":
+            # Walk signal for 5 seconds
+            self.walk_on()
+            if time() - self.last_state_change > 5:
+                if self.__debug:
+                    print("Switching to No Walk Warning")
+                self.state = "WALK_WARNING"
+                self.last_state_change = time()
+                self.walk_warning()
+        elif self.state == "WALK_WARNING":
+            # Walk signal for 5 seconds
+            self.walk_warning()
+            if time() - self.last_state_change > 5:
+                if self.__debug:
+                    print("Returning to IDLE")
+                self.state = "IDLE"
+                self.last_state_change = time()
+                self.walk_off()
+                self.__Button.button_state = False
+        else:  # error
+            self.__Ped_Red.on()
+            self.__Ped_Green.off()
+            self.__Car_Green.off()
+            self.__Car_Amber.toggle()
+            self.__Car_Red.off()
+            self.__Ped_Green.off()
+            sleep(1)

project/lib/audio_notification.py

@@ -1,6 +1,7 @@
 from machine import Pin
 from time import sleep, time
 
+
 class Led_Light(Pin):
     # child class inherits the parent 'Pin' class
     def __init__(self, pin, flashing=False, debug=False):
@@ -9,6 +10,7 @@ def __init__(self, pin, flashing=False, debug=False):
         self.__debug = debug
         self.__pin = pin
         self.__flashing = flashing
+        self._last_toggle_time = time()
 
     def on(self):
         # method overiding polymorphism of the parent class
@@ -27,7 +29,7 @@ def toggle(self):
         if self.value() == 0:
             self.on()
         elif self.value() == 1:
-           self.off()
+            self.off()
 
     @property
     def led_light_state(self):
@@ -42,22 +44,9 @@ def led_light_state(self, value):
         elif value == 0:
             self.on()
 
-    def flash(self, duration=5):
-        # Method to flash the LED on and off every 0.5 seconds for a given duration
-        if self.__flashing:
-            if self.__debug:
-                print(f"LED connected to Pin {self.__pin} is flashing for {duration} seconds")
-            end_time = time() + duration
-            while time() < end_time:
-                self.toggle()
-                sleep(0.5)  # Delay for 0.5 seconds
-
-    def on_for(self, duration):
-        # Turns the LED on for a specified duration (in seconds) and then turns it off.
-        self.on()
-        if self.__debug:
-            print(f"LED connected to Pin {self.__pin} is ON for {duration} seconds")
-        sleep(duration)
-        self.off()
-        if self.__debug:
-            print(f"LED connected to Pin {self.__pin} is OFF after {duration} seconds")
+    def flash(self):
+        # Non-blocking flash: toggles LED every 0.5s for the given duration
+        now = time()
+        if self.__flashing and now - self._last_toggle_time >= 0.5:
+            self.toggle()
+            self._last_toggle_time = now

project/lib/controller.py

@@ -1,6 +1,7 @@
 from machine import Pin
 import time
 
+
 class Pedestrian_Button(Pin):
     # child class inherits the parent 'Pin' class
 
@@ -11,26 +12,29 @@ def __init__(self, pin, debug):
         self.__last_pressed = 0  # Track the last time the button was pressed
         self.__pedestrian_waiting = False
         self.button_state
-        self.irq(trigger=Pin.IRQ_RISING, handler=self.callback) # Set up interrupt on rising edge
+        self.irq(
+            trigger=Pin.IRQ_RISING, handler=self.callback
+        )  # Set up interrupt on rising edge
 
     @property
     def button_state(self):
-        state = self.value()  # Directly read the pin's value
         if self.__debug:
-            print(f"Button connected to Pin {self.__pin} is {'PRESSED' if state else 'NOT PRESSED'}")
-        self.__pedestrian_waiting = state
-        return state
+            print(
+                f"Button connected to Pin {self.__pin} is {'WAITING' if self.__pedestrian_waiting else 'NOT WAITING'}"
+            )
+        return self.__pedestrian_waiting
 
     @button_state.setter
     def button_state(self, value):
         self.__pedestrian_waiting = value
         if self.__debug:
             print(f"Button state on Pin {self.__pin} set to {value}")
 
-
     def callback(self, pin):
         current_time = time.ticks_ms()  # Get the current time in milliseconds
-        if time.ticks_diff(current_time, self.__last_pressed) > 200:  # 200ms debounce delay
+        if (
+            time.ticks_diff(current_time, self.__last_pressed) > 200
+        ):  # 200ms debounce delay
             self.__last_pressed = current_time
             self.__pedestrian_waiting = True
             if self.__debug:

project/lib/led_light.py

@@ -0,0 +1,34 @@
+from led_light import Led_Light
+from pedestrian_button import Pedestrian_Button
+from audio_notification import Audio_Notification
+from controller import Controller
+from time import sleep, time
+
+
+debug = False
+
+led_pedestrian_red = Led_Light(19, True, debug)
+led_pedestrian_green = Led_Light(17, False, debug)
+led_car_red = Led_Light(3, False, debug)
+led_car_orange = Led_Light(5, False, debug)
+led_car_green = Led_Light(6, False, debug)
+
+
+pedestrian_button = Pedestrian_Button(22, debug)
+
+buzzer = Audio_Notification(27, debug)
+
+controller = Controller(
+    led_pedestrian_red,
+    led_pedestrian_green,
+    led_car_red,
+    led_car_orange,
+    led_car_green,
+    pedestrian_button,
+    buzzer,
+    True,
+)
+
+while True:
+    controller.update()
+    sleep(0.1)

project/lib/pedestrian_button.py

@@ -16,6 +16,10 @@ The Introduction projects should be completed before starting the OOP Mini Proje
 | ![Analog Sensor](../introduction_projects/images/analog_sensor.png)<br/>Analog Sensor | ![Servo Control](../introduction_projects/images/servo_control.png)<br/>Servo Control |
 | ![Ultrasonic Sensor](../introduction_projects/images/ultrasonic_sensor.png)<br/>Ultrasonic Sensor | ![I2C Module](../introduction_projects/images/I2C_module.png)<br/>I2C Module |
 
+## Final Product
+
+![Video of Final Project in Operations](/images/demonstration.gif)
+
 ## Wokwi
 
 Wokwi is an online Electronics simulator. You can use it to simulate Arduino, ESP32, STM32, and many other popular boards, parts and sensors. We will be using it for Pi Pico, you can also use the integrated IDE.
@@ -47,7 +51,7 @@ Watch the [Pi Pico Breadboard Introduction Video](https://www.youtube.com/watch?
 
 ### Physical Prototype
 
-![Physical Prototype](/images/prototype_model.png)
+![Physical Prototype](/images/physical_prototype.png)
 
 ### Physical Unit Testing