From 8a5f32723ef73e25fd6a19d199e1f3f1f1ca7f94 Mon Sep 17 00:00:00 2001 From: Omar Magdy Date: Tue, 23 Aug 2022 17:26:28 +0200 Subject: Removed color.h and color.c --- main.c | 6 +++--- trafficlight.h | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 2826b11..cf3c931 100644 --- a/main.c +++ b/main.c @@ -4,9 +4,9 @@ uint32_t period_1 = RED_PERIOD; uint32_t period_2 = GREEN_PERIOD; uint32_t period_3 = RED_PERIOD; -Traffic tf1 = {RED, GPIO_PORTF_BASE, 1, 2, 3}; -Traffic tf2 = {YELLOW, GPIO_PORTA_BASE, 2, 3, 4}; -Traffic tf_ped = {RED, GPIO_PORTB_BASE, 5, 0, 1}; +Traffic tf1 = {RED , GPIO_PORTF_BASE, 1, 2, 3, 0}; +Traffic tf2 = {YELLOW, GPIO_PORTA_BASE, 2, 3, 4, 0}; +Traffic tf_ped = {RED , GPIO_PORTB_BASE, 5, 0, 1, 0}; void Switch_Handler() { diff --git a/trafficlight.h b/trafficlight.h index 2f8f33d..6d86982 100644 --- a/trafficlight.h +++ b/trafficlight.h @@ -1,12 +1,14 @@ #include #include #include "tivaware.h" -#include "color.h" #define TIVA_CLK 16e6 #define GREEN_PERIOD TIVA_CLK * 5 #define YELLOW_PERIOD TIVA_CLK * 2 #define RED_PERIOD TIVA_CLK * 7 +#define RED 1 +#define YELLOW 2 +#define GREEN 3 typedef struct Traffic{ @@ -15,6 +17,7 @@ typedef struct Traffic{ uint8_t red; uint8_t yellow; uint8_t green; + uint32_t prevPeriod; } Traffic; extern Traffic tf1; -- cgit v1.2.3