From f3e84151712a8cd830db7a78aa5746080697ce6c Mon Sep 17 00:00:00 2001 From: NickAA Date: Sun, 29 Jan 2023 16:25:24 -0500 Subject: [PATCH 1/2] Added Menu to control_loop_sim.cpp I was able to add the menu to the file and I fixed some bugs that came up. For some reason the seed value (a.k.a. P value) does not accept strings or char values so I left the set_value as is and same for the I value I don't know what the value is that is within the set_value. But everything seems to work the way it's intended to. --- .../rtl/control_loop/control_loop_sim.cpp | 148 ++++++++++++++---- 1 file changed, 114 insertions(+), 34 deletions(-) diff --git a/firmware/rtl/control_loop/control_loop_sim.cpp b/firmware/rtl/control_loop/control_loop_sim.cpp index 50411f1..8030f4f 100644 --- a/firmware/rtl/control_loop/control_loop_sim.cpp +++ b/firmware/rtl/control_loop/control_loop_sim.cpp @@ -49,44 +49,124 @@ static void set_value(V val, unsigned name) { int main(int argc, char **argv) { init(argc, argv); - mod = new ModType; - Transfer func = Transfer{150, 0, 2, 1.1, 10, -1}; - mod->clk = 0; + int Con, // Continue option for user + P = 3, // Default P value + I = 0, // Default I value + Delay = 20, // Default Delay value + SetPt = 10000, + Status = 1, + Option_Picked; + + do + { - // Replace CONTROL_LOOP_P with an int P and the number with char or string seed - set_value(0b11010111000010100011110101110000101000111, CONTROL_LOOP_P); - /* Constant values must be sized to 64 bits, or else the compiler - * will think they are 32 bit and silently mess things up - */ - // Replace CONTROL_LOOP_I with int I - set_value((V)6 << CONSTS_FRAC, CONTROL_LOOP_I); - set_value(20, CONTROL_LOOP_DELAY); - set_value(10000, CONTROL_LOOP_SETPT); - set_value(1, CONTROL_LOOP_STATUS); - mod->curset = 0; + mod = new ModType; + Transfer func = Transfer{150, 0, 2, 1.1, 10, -1}; - for (int tick = 0; tick < 500000; tick++) { - run_clock(); - if (mod->request && !mod->fulfilled) { - /* Verilator values are not sign-extended to the - * size of type, so we have to do that ourselves. - */ - 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; - } else if (mod->fulfilled && !mod->request) { - mod->fulfilled = 0; + mod->clk = 0; + + // Testing this char for P value + char Data_Change_S = '0b11010111000010100011110101110000101000111'; + + // Default value for P, some type of error where it won't accept any string, int | Try char next time + set_value(0b11010111000010100011110101110000101000111, CONTROL_LOOP_P); + + // Default value + set_value((V)6 << CONSTS_FRAC, CONTROL_LOOP_I); + set_value(Delay, CONTROL_LOOP_DELAY); + set_value(SetPt, CONTROL_LOOP_SETPT); + set_value(Status, CONTROL_LOOP_STATUS); + + // Menu + do + { + printf("%15s\n", "Menu"); + printf("1) Set Control loop P Current value: %d\n", P); + printf("2) Set Control loop I Current value: %d\n", I); + printf("3) Set Delay Current value: %d\n", Delay); + printf("4) Set setpoint Current value: %d\n", SetPt); + printf("5) Set status Current value: %d\n", Status); + printf("6) Continue\n"); + + // Checks for what option user picks + scanf("%d", &Option_Picked); + + // Clears unix screen + system("clear"); + + switch (Option_Picked) + { + case 1: + // This case doesn't work for some reason? Need further time to figure it out + printf("Please input new Control Loop P value: "); + scanf("%d", &P); + set_value(P, CONTROL_LOOP_P); + break; + case 2: + printf("Please input new Control Loop I value: "); + scanf("%d", &I); + set_value(I, CONTROL_LOOP_I); + break; + case 3: + printf("Please input new delay value: "); + scanf("%d", &Delay); + set_value(Delay, CONTROL_LOOP_DELAY); + break; + case 4: + printf("Please input new setpoint value: "); + scanf("%d", &SetPt); + set_value(SetPt, CONTROL_LOOP_SETPT); + break; + case 5: + printf("Please input new status value: "); + scanf("%d", &Status); + set_value(Status, CONTROL_LOOP_STATUS); + break; + } + + } while (Option_Picked != 6); + + + + + mod->curset = 0; + + // Resets Con to 1 to activate for loop + Con = 1; + + for (int tick = 0; Con == 1; tick++) { + run_clock(); + if (mod->request && !mod->fulfilled) { + /* Verilator values are not sign-extended to the + * size of type, so we have to do that ourselves. + */ + 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; + } else if (mod->fulfilled && !mod->request) { + mod->fulfilled = 0; + } + + if (mod->finish_cmd) { + mod->start_cmd = 0; + } + + // After 100000 ticks shows user prompt, might make tick to be changable for user. + if (tick % 100000 == 0 && tick != 0) + { + printf("Continue? (0 for exit, 1 for yes, 2 to return to menu)\n"); + scanf("%d", &Con); + } } + // Clears unix screen + system("clear"); - if (mod->finish_cmd) { - mod->start_cmd = 0; - } - } - - mod->final(); - delete mod; + mod->final(); + delete mod; + } while (Con == 2); + return 0; } From 822e2d4a7730a166b3ab7566b109b3fed7fcb554 Mon Sep 17 00:00:00 2001 From: NickAA Date: Sun, 29 Jan 2023 16:31:15 -0500 Subject: [PATCH 2/2] Added more comments to file --- firmware/rtl/control_loop/control_loop_sim.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/rtl/control_loop/control_loop_sim.cpp b/firmware/rtl/control_loop/control_loop_sim.cpp index 8030f4f..55d415a 100644 --- a/firmware/rtl/control_loop/control_loop_sim.cpp +++ b/firmware/rtl/control_loop/control_loop_sim.cpp @@ -54,9 +54,9 @@ int main(int argc, char **argv) { P = 3, // Default P value I = 0, // Default I value Delay = 20, // Default Delay value - SetPt = 10000, - Status = 1, - Option_Picked; + SetPt = 10000, // Default SetPt value + Status = 1, // Default Status value + Option_Picked; // Option user picked do {