diff --git a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.1.vhd b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.1.vhd index 16117b5..2b25a62 100644 --- a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.1.vhd +++ b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.1.vhd @@ -34,25 +34,30 @@ ENTITY KittCar IS END KittCar; ARCHITECTURE Behavioral OF KittCar IS - CONSTANT MIN_KITT_CAR_STEP_NS : UNSIGNED(63 DOWNTO 0) := to_unsigned(MIN_KITT_CAR_STEP_MS * 1000000, 64); -- 64bits is more than needed, just for test purposes (47 bits are enough) + CONSTANT MIN_KITT_CAR_STEP_NS : UNSIGNED(46 DOWNTO 0) := to_unsigned(MIN_KITT_CAR_STEP_MS * 1000000, 47); SIGNAL leds_sr : STD_LOGIC_VECTOR(led'RANGE) := (OTHERS => '0'); - SIGNAL n_period : UNSIGNED(sw'RANGE) := 1; + SIGNAL n_period : UNSIGNED(sw'RANGE) := to_unsigned(1, sw'LENGTH); SIGNAL up : STD_LOGIC := '1'; BEGIN -- Sincronous logic PROCESS (clk, reset) - VARIABLE counter : UNSIGNED(63 DOWNTO 0) := (OTHERS => '0'); -- 64bits is more than needed, just for test purposes (47 bits are enough) + VARIABLE counter : UNSIGNED(46 DOWNTO 0) := (OTHERS => '0'); BEGIN IF reset = '1' THEN leds_sr <= (OTHERS => '0'); counter := (OTHERS => '0'); ELSIF rising_edge(clk) THEN - -- Reset the leds + -- Kitt logic IF unsigned(leds_sr) = 0 THEN leds_sr(0) <= '1'; + up <= '1'; + ELSIF leds_sr(led'HIGH) = '1' THEN + up <= '0'; + ELSIF leds_sr(led'LOW) = '1' THEN + up <= '1'; END IF; -- Increment the counter @@ -74,16 +79,6 @@ BEGIN END IF; END PROCESS; - -- Kitt logic - PROCESS (leds_sr) - BEGIN - IF leds_sr(led'HIGH) = '1' THEN - up <= '0'; - ELSIF leds_sr(led'LOW) = '1' THEN - up <= '1'; - END IF; - END PROCESS; - -- Handle the switch PROCESS (sw) BEGIN diff --git a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.vhd b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.vhd index 995fc5c..3c1d5e7 100644 --- a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.vhd +++ b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v1.vhd @@ -50,9 +50,14 @@ BEGIN counter := (OTHERS => '0'); ELSIF rising_edge(clk) THEN - -- Reset the leds + -- Kitt logic IF unsigned(leds_sr) = 0 THEN leds_sr(0) <= '1'; + up <= '1'; + ELSIF leds_sr(led'HIGH) = '1' THEN + up <= '0'; + ELSIF leds_sr(led'LOW) = '1' THEN + up <= '1'; END IF; -- Increment the counter @@ -74,16 +79,6 @@ BEGIN END IF; END PROCESS; - -- Kitt logic - PROCESS (leds_sr) - BEGIN - IF leds_sr(led'HIGH) = '1' THEN - up <= '0'; - ELSIF leds_sr(led'LOW) = '1' THEN - up <= '1'; - END IF; - END PROCESS; - -- Handle the switch PROCESS (sw) BEGIN diff --git a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.1.vhd b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.1.vhd deleted file mode 100644 index 482bb90..0000000 --- a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.1.vhd +++ /dev/null @@ -1,99 +0,0 @@ --- File: KittCar_v2.vhd --- Description: Counter prescaler & unsigned n_period --- Known problem: Not yet tested - ----------- DEFAULT LIBRARY --------- -LIBRARY IEEE; -USE IEEE.STD_LOGIC_1164.ALL; -USE IEEE.NUMERIC_STD.ALL; ------------------------------------- - -ENTITY KittCar IS - GENERIC ( - - CLK_PERIOD_NS : POSITIVE RANGE 1 TO 100 := 10; -- clk period in nanoseconds - MIN_KITT_CAR_STEP_MS : POSITIVE RANGE 1 TO 2000 := 1; -- Minimum step period in milliseconds (i.e., value in milliseconds of Delta_t) - - NUM_OF_SWS : INTEGER RANGE 1 TO 16 := 16; -- Number of input switches - NUM_OF_LEDS : INTEGER RANGE 1 TO 16 := 16 -- Number of output LEDs - - ); - PORT ( - - ------- Reset/Clock -------- - reset : IN STD_LOGIC; - clk : IN STD_LOGIC; - ---------------------------- - - -------- LEDs/SWs ---------- - sw : IN STD_LOGIC_VECTOR(NUM_OF_SWS - 1 DOWNTO 0); -- Switches avaiable on Basys3 - led : OUT STD_LOGIC_VECTOR(NUM_OF_LEDS - 1 DOWNTO 0) -- LEDs avaiable on Basys3 - ---------------------------- - - ); -END KittCar; - -ARCHITECTURE Behavioral OF KittCar IS - SIGNAL leds_sr : STD_LOGIC_VECTOR(led'RANGE) := (OTHERS => '0'); - SIGNAL n_period : UNSIGNED(sw'RANGE) := 1; - SIGNAL up : STD_LOGIC := '1'; -BEGIN - - -- Sincronous logic - PROCESS (clk, reset) - VARIABLE counter_ns : INTEGER := 0; - VARIABLE counter_ms : INTEGER := 0; - BEGIN - IF reset = '1' THEN - leds_sr <= (OTHERS => '0'); - counter_ns := 0; - counter_ms := 0; - ELSIF rising_edge(clk) THEN - - -- Reset the leds - IF unsigned(leds_sr) = 0 THEN - leds_sr(0) <= '1'; - END IF; - - -- Handle counters - counter_ns := counter_ns + CLK_PERIOD_NS; - IF counter_ns >= 1000000 THEN - counter_ms := counter_ms + 1; - counter_ns := 0; - END IF; - - -- Calculate the number of periods - IF counter_ms >= (MIN_KITT_CAR_STEP_MS * to_integer(n_period)) THEN - - -- Shift the leds - IF up = '1' THEN - leds_sr <= leds_sr(NUM_OF_LEDS - 2 DOWNTO 0) & '0'; - ELSIF up = '0' THEN - leds_sr <= '0' & leds_sr(NUM_OF_LEDS - 1 DOWNTO 1); - END IF; - - -- Reset the counter - counter_ms := 0; - END IF; - END IF; - END PROCESS; - - -- Kitt logic - PROCESS (leds_sr) - BEGIN - IF leds_sr(led'HIGH) = '1' THEN - up <= '0'; - ELSIF leds_sr(led'LOW) = '1' THEN - up <= '1'; - END IF; - END PROCESS; - - -- Handle the switch - PROCESS (sw) - BEGIN - n_period <= unsigned(sw) + 1; - END PROCESS; - - led <= leds_sr; - -END Behavioral; \ No newline at end of file diff --git a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.vhd b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.vhd index 7bd6c0b..d32ba4d 100644 --- a/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.vhd +++ b/LAB1/lab1_kit_car/lab1_kit_car.srcs/sources_1/new/KittCar_v2.vhd @@ -1,5 +1,5 @@ -- File: KittCar_v2.vhd --- Description: Counter prescaler +-- Description: Counter prescaler & unsigned n_period -- Known problem: Not yet tested ---------- DEFAULT LIBRARY --------- @@ -35,35 +35,40 @@ END KittCar; ARCHITECTURE Behavioral OF KittCar IS SIGNAL leds_sr : STD_LOGIC_VECTOR(led'RANGE) := (OTHERS => '0'); - SIGNAL n_period : POSITIVE RANGE 1 TO (2 ** NUM_OF_SWS) := 1; + SIGNAL n_period : UNSIGNED(sw'RANGE) := to_unsigned(1, sw'LENGTH); SIGNAL up : STD_LOGIC := '1'; BEGIN -- Sincronous logic PROCESS (clk, reset) - VARIABLE counter_ns : INTEGER := 0; - VARIABLE counter_ms : INTEGER := 0; + VARIABLE counter_ns : UNSIGNED(19 DOWNTO 0) := (OTHERS => '0'); -- 20-bit counter for nanoseconds + VARIABLE counter_ms : UNSIGNED(26 DOWNTO 0) := (OTHERS => '0'); -- 27-bit counter for milliseconds BEGIN IF reset = '1' THEN leds_sr <= (OTHERS => '0'); - counter_ns := 0; - counter_ms := 0; + counter_ns := (OTHERS => '0'); + counter_ms := (OTHERS => '0'); ELSIF rising_edge(clk) THEN - -- Reset the leds + -- Kitt logic IF unsigned(leds_sr) = 0 THEN leds_sr(0) <= '1'; + up <= '1'; + ELSIF leds_sr(led'HIGH) = '1' THEN + up <= '0'; + ELSIF leds_sr(led'LOW) = '1' THEN + up <= '1'; END IF; -- Handle counters - counter_ns := counter_ns + CLK_PERIOD_NS; - IF counter_ns >= 1000000 THEN + counter_ns := counter_ns + to_unsigned(CLK_PERIOD_NS, counter_ns'LENGTH); + IF counter_ns >= to_unsigned(1000000, counter_ns'LENGTH) THEN counter_ms := counter_ms + 1; - counter_ns := 0; + counter_ns := (OTHERS => '0'); END IF; -- Calculate the number of periods - IF counter_ms >= (MIN_KITT_CAR_STEP_MS * n_period) THEN + IF counter_ms >= to_unsigned(MIN_KITT_CAR_STEP_MS, counter_ms'LENGTH) * n_period THEN -- Shift the leds IF up = '1' THEN @@ -73,25 +78,15 @@ BEGIN END IF; -- Reset the counter - counter_ms := 0; + counter_ms := (OTHERS => '0'); END IF; END IF; END PROCESS; - -- Kitt logic - PROCESS (leds_sr) - BEGIN - IF leds_sr(led'HIGH) = '1' THEN - up <= '0'; - ELSIF leds_sr(led'LOW) = '1' THEN - up <= '1'; - END IF; - END PROCESS; - -- Handle the switch PROCESS (sw) BEGIN - n_period <= to_integer(unsigned(sw)) + 1; + n_period <= unsigned(sw) + 1; END PROCESS; led <= leds_sr; diff --git a/LAB1/lab1_kit_car/lab1_kit_car.xpr b/LAB1/lab1_kit_car/lab1_kit_car.xpr index 700d1a7..29decdd 100644 --- a/LAB1/lab1_kit_car/lab1_kit_car.xpr +++ b/LAB1/lab1_kit_car/lab1_kit_car.xpr @@ -75,7 +75,7 @@ - +