closed loop control

Severson-Group · Oct 18, 2024 · 66cb833 · 66cb833
1 parent f837df2
commit 66cb833
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/sdk/app_cpu1/user/usr/user_config.h b/sdk/app_cpu1/user/usr/user_config.h
@@ -47,7 +47,7 @@
 
 // Enable support for AMDS (Advanced Motor Drive Sensing) platform
 // set to 1 for enabled, 0 for disabled
-#define USER_CONFIG_ENABLE_AMDS_SUPPORT (0)
+#define USER_CONFIG_ENABLE_AMDS_SUPPORT (1)
 
 // Scheduler Interval Tolerance Override
 // as of AMDC Firmware v1.3, all timing variables for tasks (runtime, loop time, etc)

diff --git a/sdk/app_cpu1/user/usr/vsiApp/app_vsiApp.c b/sdk/app_cpu1/user/usr/vsiApp/app_vsiApp.c
@@ -4,10 +4,15 @@
 #include "usr/vsiApp/app_vsiApp.h"
 #include "usr/vsiApp/cmd/cmd_vsiApp.h"
 #include "usr/vsiApp/task_vsiApp.h"
+#include "drv/timing_manager.h"
+#include "drv/gp3io_mux.h"
 
 void app_vsiApp_init(void)
 {
     // Register "vsi" command with system
+	gp3io_mux_set_device(GP3IO_MUX_1_BASE_ADDR, GP3IO_MUX_DEVICE1);
+	// Enable data sampling for AMDS on GPIO Port 1
+	timing_manager_enable_sensor(AMDS_1);
     cmd_vsiApp_register();
 
     // task_vsiApp_init();

diff --git a/sdk/app_cpu1/user/usr/vsiApp/task_vsiApp.c b/sdk/app_cpu1/user/usr/vsiApp/task_vsiApp.c
@@ -94,7 +94,7 @@ void task_vsiApp_callback(void *arg)
 	LOG_voltage_b = (duty_b - 0.5) * 20;
 	LOG_voltage_c = (duty_c - 0.5) * 20;
 
-	circularBuffer[circularBufferIndex] = LOG_current_a;
+	circularBuffer[circularBufferIndex] = LOG_current_b;
 	circularBufferIndex++;
 	if (circularBufferIndex >= CIRCULAR_BUFFER_LENGTH) {
 		circularBufferIndex = 0;
@@ -121,7 +121,7 @@ double calculateRMS() {
 		average += circularBuffer[i] * circularBuffer[i];
 	}
 	average /= CIRCULAR_BUFFER_LENGTH;
-	return sqrt(average);
+	return sqrt(average) * 2;
 }
 
 int task_vsiApp_amplitude(double amplitude) {

diff --git a/sdk/temp_xsdb_launch_script.tcl b/sdk/temp_xsdb_launch_script.tcl
@@ -0,0 +1 @@
+set xsdb_idle_timeout -1;source C:/Xilinx/SDK/2019.1/scripts/xsdb/xsdb/xsdb-server.tcl