Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correctly (and crudely) simulate control loop 

Issue was that the ADC cycle half wait (SCK delay) was too fast
for the input buffering (since MISO and MOSI are physical inputs
and not FPGA wires).
This commit is contained in:
Peter McGoron 2022-11-24 09:48:04 -05:00
parent 6ad2de97cf
commit 33ec8351d8
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/rtl/control_loop/control_loop.v
View File

@ -4,8 +4,8 @@ module control_loop
#( #(
parameter ADC_WID = 18, parameter ADC_WID = 18,
parameter ADC_WID_SIZ = 5, parameter ADC_WID_SIZ = 5,
parameter ADC_CYCLE_HALF_WAIT = 1, parameter ADC_CYCLE_HALF_WAIT = 5,
parameter ADC_CYCLE_HALF_WAIT_SIZ = 1, parameter ADC_CYCLE_HALF_WAIT_SIZ = 3,
parameter ADC_POLARITY = 1, parameter ADC_POLARITY = 1,
parameter ADC_PHASE = 0, parameter ADC_PHASE = 0,
/* The ADC takes maximum 527 ns to capture a value. /* The ADC takes maximum 527 ns to capture a value.

20
firmware/rtl/control_loop/control_loop_sim.cpp
View File

@ -52,18 +52,20 @@ int main(int argc, char **argv) {
mod->clk = 0; mod->clk = 0;
set_value(10000, CONTROL_LOOP_STATUS);
set_value(0b11010111000010100011110101110000101000111, CONTROL_LOOP_P); set_value(0b11010111000010100011110101110000101000111, CONTROL_LOOP_P);
set_value((V)12 << CONSTS_FRAC, CONTROL_LOOP_I); set_value((V)6 << CONSTS_FRAC, CONTROL_LOOP_I);
set_value(20, CONTROL_LOOP_DELAY); set_value(20, CONTROL_LOOP_DELAY);
set_value(10000, CONTROL_LOOP_SETPT); set_value(10000, CONTROL_LOOP_SETPT);
set_value(1, CONTROL_LOOP_STATUS); set_value(1, CONTROL_LOOP_STATUS);
mod->curset = 0;
for (int tick = 0; tick < 100000; tick++) { for (int tick = 0; tick < 500000; tick++) {
std::cout << tick << std::endl;
run_clock(); run_clock();
if (mod->request && !mod->fulfilled) { if (mod->request && !mod->fulfilled) {
mod->measured_value = func.val(mod->curset); V ext = sign_extend(mod->curset, 20);
V val = func.val(ext);
printf("setting: %ld, val: %ld\n", ext, val);
mod->measured_value = val;
mod->fulfilled = 1; mod->fulfilled = 1;
} else if (mod->fulfilled && !mod->request) { } else if (mod->fulfilled && !mod->request) {
mod->fulfilled = 0; mod->fulfilled = 0;
@ -73,6 +75,14 @@ int main(int argc, char **argv) {
mod->cmd = CONTROL_LOOP_WRITE_BIT | CONTROL_LOOP_P; mod->cmd = CONTROL_LOOP_WRITE_BIT | CONTROL_LOOP_P;
mod->word_into_loop = 0b010111000010100011110101110000101000111; mod->word_into_loop = 0b010111000010100011110101110000101000111;
mod->start_cmd = 1; mod->start_cmd = 1;
printf("adjust P\n");
}
if (tick == 100000) {
mod->cmd = CONTROL_LOOP_WRITE_BIT | CONTROL_LOOP_I;
/* 0.5 */
mod->word_into_loop = 1 << (CONSTS_FRAC - 1);
printf("adjust I\n");
mod->start_cmd = 1;
} }
if (mod->finish_cmd) { if (mod->finish_cmd) {
mod->start_cmd = 0; mod->start_cmd = 0;

11
firmware/rtl/spi/spi_slave.v
View File

@ -138,9 +138,14 @@ always @ (posedge clk) begin
default: ; default: ;
endcase endcase
end end
2'b00: if (!rdy) begin 2'b00: begin
finished <= 0; if (!rdy) begin
err <= 0; finished <= 0;
err <= 0;
end
`ifndef SPI_SLAVE_NO_WRITE
miso <= 0;
`endif
end end
endcase endcase
end end