verlan/Verilog_Louis
1
0
Fork 0
forked from tanchou/Verilog
Code Pull Requests Activity

Gros patch sur la fifo et rx fifo pour gagner des tick d'horloge, uart comand fonctionne toujours pas

Browse Source
This commit is contained in:
Gamenight77
2025-05-13 10:21:28 +02:00
parent cca81f4db5
commit b7d184d02f
13 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Semaine_4/FIFO/src/verilog/fifo.v
View File

@@ -34,8 +34,8 @@
end end
if (rd_en && !empty) begin // OUT if (rd_en && !empty) begin // OUT
rd_ptr <= (rd_ptr + 1) % SIZE;
rd_data <= fifo[rd_ptr]; rd_data <= fifo[rd_ptr];
rd_ptr <= (rd_ptr + 1) % SIZE;
count <= count - 1; count <= count - 1;
end end
end end

12
Semaine_4/UART_FIFO/src/verilog/uart_rx_fifo.v
View File

@@ -5,7 +5,7 @@ module uart_rx_fifo #(
)( )(
input clk, input clk,
input rd_en, input rd_en,
output reg [7:0] rd_data, output wire [7:0] rd_data,
input rx_pin, input rx_pin,
output data_available output data_available
); );
@@ -18,7 +18,6 @@ module uart_rx_fifo #(
reg wr_en; reg wr_en;
wire fifo_empty; wire fifo_empty;
wire fifo_full; wire fifo_full;
wire [7:0] fifo_rd_data;
// UART Receiver instance // UART Receiver instance
rxuartlite uart_rx_inst ( rxuartlite uart_rx_inst (
@@ -38,20 +37,13 @@ module uart_rx_fifo #(
.wr_en(wr_en), .wr_en(wr_en),
.wr_data(rx_data), .wr_data(rx_data),
.rd_en(rd_en), .rd_en(rd_en),
.rd_data(fifo_rd_data), .rd_data(rd_data),
.empty(fifo_empty), .empty(fifo_empty),
.full(fifo_full) .full(fifo_full)
); );
assign data_available = ~fifo_empty; assign data_available = ~fifo_empty;
// Enregistrement explicite des données lues pour stabilité
always @(posedge clk) begin
if (rd_en && !fifo_empty) begin
rd_data <= fifo_rd_data;
end
end
// Écriture dans la FIFO uniquement si donnée reçue ET FIFO pas pleine // Écriture dans la FIFO uniquement si donnée reçue ET FIFO pas pleine
always @(posedge clk) begin always @(posedge clk) begin
if (rx_received && !fifo_full) begin if (rx_received && !fifo_full) begin

2
Semaine_5/UART_ULTRASON_COMMANDS/IP/verilog/fifo.v
View File

@@ -34,8 +34,8 @@
end end
if (rd_en && !empty) begin // OUT if (rd_en && !empty) begin // OUT
rd_ptr <= (rd_ptr + 1) % SIZE;
rd_data <= fifo[rd_ptr]; rd_data <= fifo[rd_ptr];
rd_ptr <= (rd_ptr + 1) % SIZE;
count <= count - 1; count <= count - 1;
end end
end end

12
Semaine_5/UART_ULTRASON_COMMANDS/IP/verilog/uart_rx_fifo.v
View File

@@ -5,7 +5,7 @@ module uart_rx_fifo #(
)( )(
input clk, input clk,
input rd_en, input rd_en,
output reg [7:0] rd_data, output wire [7:0] rd_data,
input rx_pin, input rx_pin,
output data_available output data_available
); );
@@ -18,7 +18,6 @@ module uart_rx_fifo #(
reg wr_en; reg wr_en;
wire fifo_empty; wire fifo_empty;
wire fifo_full; wire fifo_full;
wire [7:0] fifo_rd_data;
// UART Receiver instance // UART Receiver instance
rxuartlite uart_rx_inst ( rxuartlite uart_rx_inst (
@@ -38,20 +37,13 @@ module uart_rx_fifo #(
.wr_en(wr_en), .wr_en(wr_en),
.wr_data(rx_data), .wr_data(rx_data),
.rd_en(rd_en), .rd_en(rd_en),
.rd_data(fifo_rd_data), .rd_data(rd_data),
.empty(fifo_empty), .empty(fifo_empty),
.full(fifo_full) .full(fifo_full)
); );
assign data_available = ~fifo_empty; assign data_available = ~fifo_empty;
// Enregistrement explicite des données lues pour stabilité
always @(posedge clk) begin
if (rd_en && !fifo_empty) begin
rd_data <= fifo_rd_data;
end
end
// Écriture dans la FIFO uniquement si donnée reçue ET FIFO pas pleine // Écriture dans la FIFO uniquement si donnée reçue ET FIFO pas pleine
always @(posedge clk) begin always @(posedge clk) begin
if (rx_received && !fifo_full) begin if (rx_received && !fifo_full) begin

2
Semaine_5/UART_ULTRASON_COMMANDS/IP/verilog/ultrasonic_fpga.v
View File

@@ -54,7 +54,7 @@ module ultrasonic_fpga #(
case (state) case (state)
IDLE: begin IDLE: begin
done <= 1; done <= 0;
sig_out <= 0; sig_out <= 0;
sig_dir <= 0; sig_dir <= 0;
distance <= 0; distance <= 0;

14
Semaine_5/UART_ULTRASON_COMMANDS/src/verilog/top_uart_ultrason_command.v
View File

@@ -52,7 +52,7 @@ module top_uart_ultrason_command (
); );
// === FSM === // === FSM ===
localparam IDLE = 0, READ = 1; localparam IDLE = 0, READ = 1, DECODE = 2;
localparam STOP = 3, ONE = 1, CONTINUOUS = 2; localparam STOP = 3, ONE = 1, CONTINUOUS = 2;
reg [1:0] rx_state = IDLE; reg [1:0] rx_state = IDLE;
@@ -84,6 +84,11 @@ module top_uart_ultrason_command (
READ: begin READ: begin
leds [5] <= 1; leds [5] <= 1;
rd_en <= 1'b1;
rx_state <= DECODE;
end
DECODE: begin
case (rd_data) case (rd_data)
8'h01: begin // Start mesure one mesure 8'h01: begin // Start mesure one mesure
start <= 1; start <= 1;
@@ -116,7 +121,9 @@ module top_uart_ultrason_command (
// Mesure block // Mesure block
always @(posedge clk) begin always @(posedge clk) begin
leds <= mesure[1:0]; leds <= mesure[1:0];
case (tx_state) case (tx_state)
MESURE: begin MESURE: begin
case (mesure) case (mesure)
STOP: begin // Stop mesure STOP: begin // Stop mesure
@@ -128,9 +135,10 @@ module top_uart_ultrason_command (
if (done) begin if (done) begin
tx_state <= SEND_LOW; tx_state <= SEND_LOW;
wr_en <= 1; wr_en <= 1;
mesure <= STOP;
end else begin end else begin
tx_state <= MESURE; tx_state <= MESURE;
mesure <= STOP; mesure <= ONE;
end end
end end
@@ -152,7 +160,7 @@ module top_uart_ultrason_command (
SEND_LOW: begin SEND_LOW: begin
wr_en <= 1; wr_en <= 1;
wr_data <= distance[7:0]; // Octet LSB wr_data <= distance[7:0]; // Octet LSB
tx_state <= SEND_HIGH; tx_state <= WAIT;
end end
SEND_HIGH: begin SEND_HIGH: begin

8
Semaine_5/UART_ULTRASON_COMMANDS/tests/Python/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

12
Semaine_5/UART_ULTRASON_COMMANDS/tests/Python/.idea/Python.iml generated Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
</module>

6
Semaine_5/UART_ULTRASON_COMMANDS/tests/Python/.idea/inspectionProfiles/profiles_settings.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

4
Semaine_5/UART_ULTRASON_COMMANDS/tests/Python/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
</project>

8
Semaine_5/UART_ULTRASON_COMMANDS/tests/Python/.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Python.iml" filepath="$PROJECT_DIR$/.idea/Python.iml" />
</modules>
</component>
</project>

6
Semaine_5/UART_ULTRASON_COMMANDS/tests/Python/.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
</component>
</project>

23
Semaine_5/UART_ULTRASON_COMMANDS/tests/verilog/tb_ultrason_commands.v
View File

@@ -13,7 +13,7 @@ module tb_ultrason_commands;
wire tx_ready; wire tx_ready;
reg [7:0] data_in = 8'h00; reg [7:0] data_in = 8'h00;
wire [7:0] data_out; wire [7:0] data_out;
wire rx_received; wire data_available;
reg rd_en = 0; // Lecture FIFO reg rd_en = 0; // Lecture FIFO
@@ -42,13 +42,13 @@ module tb_ultrason_commands;
.BAUD_RATE(BAUD_RATE) .BAUD_RATE(BAUD_RATE)
) uart_rx_fifo_inst ( ) uart_rx_fifo_inst (
.clk(clk), .clk(clk),
.rx_pin(rx), // on observe la sortie du DUT .rx_pin(tx),
.rd_en(rd_en), .rd_en(rd_en),
.rd_data(data_out), .rd_data(data_out),
.data_available(rx_received) .data_available(data_available)
); );
// === TX pour injecter une commande UART vers le DUT === // === TX pour injecter une commande UART ===
uart_tx #( uart_tx #(
.CLK_FREQ(CLK_FREQ), .CLK_FREQ(CLK_FREQ),
.BAUD_RATE(BAUD_RATE) .BAUD_RATE(BAUD_RATE)
@@ -57,7 +57,7 @@ module tb_ultrason_commands;
.tx_enable(tx_enable), .tx_enable(tx_enable),
.tx_ready(tx_ready), .tx_ready(tx_ready),
.data(data_in), .data(data_in),
.tx(tx), // va dans le DUT .tx(rx),
.rst_p(1'b0) .rst_p(1'b0)
); );
@@ -70,6 +70,7 @@ module tb_ultrason_commands;
// Attendre que le TX soit prêt // Attendre que le TX soit prêt
wait(tx_ready); wait(tx_ready);
$display(">> TX ready");
#100; #100;
// Envoyer la commande "ONE" (1) // Envoyer la commande "ONE" (1)
@@ -77,19 +78,25 @@ module tb_ultrason_commands;
tx_enable <= 1; tx_enable <= 1;
#20; #20;
tx_enable <= 0; tx_enable <= 0;
$display(">> Command sent: %d", data_in);
// Lire 2 octets de réponse : LSB et MSB de la distance // Lire 2 octets de réponse : LSB et MSB de la distance
repeat (2) begin repeat (2) begin
wait(rx_received); wait(data_available);
//D
#10; // Laisse le temps de valider le drapeau #10; // Laisse le temps de valider le drapeau
rd_en <= 1; // Lecture de la FIFO rd_en <= 1; // Lecture de la FIFO
#20; #30;
rd_en <= 0; rd_en <= 0;
#200;
$display(">> Distance octet: %d", data_out); $display(">> Distance octet: %d", data_out);
end end
$display("==== End UART Ultrasonic Test ===="); $display("==== End UART Ultrasonic Test ====");
#1000; #10000;
$stop; $stop;
end end