rafa/SE-TP2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update stable version 24/05/2025 #2

Merged
rafa merged 29 commits from dev into main 2025-05-24 20:00:44 +02:00
Conversation 0 Commits 29 Files Changed 18 +18 -6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6554a14a77 - Show all commits

4
code/CarSpotController.cpp
View File

@ -28,4 +28,8 @@ class CarSpotCOntroller {
void increment_occupied_spots () {
this->occupied_spots++;
}
bool is_full() {
return this->occupied_spots == this->total_spots;
}
};

16
code/code.ino
View File

@ -19,9 +19,9 @@ OneWire oneWire(TEMP_SENSOR_PIN);
DallasTemperature temperature_sensors(&oneWire);
DistSensor dist_sensor = DistSensor(ULTRASONIC_SENSOR_PIN_TRIG, ULTRASONIC_SENSOR_PIN_ECHO, 25.0);
Barrier barrier = Barrier(SERVO_PIN, 4);
Barrier barrier = Barrier(SERVO_PIN, 2);
LCDScreen screen = LCDScreen();
CarSpotCOntroller car_spot_controller = CarSpotCOntroller(24);
CarSpotCOntroller car_spot_controller = CarSpotCOntroller(2);
JoySitkController joystick = JoySitkController(JOYSTICK_X_PIN, JOYSTICK_Y_PIN);
unsigned long current_time, sensor_last_time_activated, temperature_last_time_measured, joystick_last_time_activated;
@ -44,8 +44,12 @@ void loop() {
if (dist_sensor.is_in_range()){
sensor_last_time_activated = current_time;
if(barrier.is_closed()){
if (!car_spot_controller.is_full()){
barrier.open();
car_spot_controller.increment_occupied_spots();
}else{
tone(3, 262, 500);
}
}
} else if (!dist_sensor.is_in_range() && barrier.is_open()){
if (current_time - sensor_last_time_activated >= barrier.open_time_seconds * 1000){
@ -64,15 +68,19 @@ void loop() {
if (joystick.is_moving_right() && current_time - joystick_last_time_activated >= 250){
joystick_last_time_activated = current_time;
screen.set_state((screen.get_next_state()));
}
if (joystick.is_moving_left() && current_time - joystick_last_time_activated >= 250){
joystick_last_time_activated = current_time;
screen.set_state(screen.get_previous_state());
}
screen.display(temperature_in_c,car_spot_controller.get_total_spots(), car_spot_controller.get_occupied_spots());
}