Merge pull request #260 from Severson-Group/develop

Merge v1.0.3 bug fixes to release branch v1.0.x
Severson-Group · Mar 17, 2022 · 34e5cc6 · 34e5cc6
2 parents 675f644 + 14ffce4
commit 34e5cc6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This document summarizes the changes introduced to the code base for each release.
 
+## v1.0.3
+
+- Fix bug in Vivado project vs. C code config checking
+- Reduce max number of samples to dump per time slice over Ethernet
+
 ## v1.0.2
 
 - Fix task stats printing

diff --git a/sdk/app_cpu1/common/main.c b/sdk/app_cpu1/common/main.c
@@ -45,8 +45,8 @@
 #error "ERROR: Vivado hardware target is REV D, but usr/user_config.h target is REV E!"
 #endif
 
-// REV D has 2 GPIO ports, each with their own eddy current sensor driver IP block:
-#if (USER_CONFIG_HARDWARE_TARGET == AMDC_REV_D) && (XPAR_AMDC_EDDY_CURRENT_SENSOR_NUM_INSTANCES != 2)
+// REV D has 2 GPIO ports, but only a single eddy current sensor driver IP block:
+#if (USER_CONFIG_HARDWARE_TARGET == AMDC_REV_D) && (XPAR_AMDC_EDDY_CURRENT_SENSOR_NUM_INSTANCES != 1)
 #error "ERROR: Vivado hardware target is REV E, but usr/user_config.h target is REV D!"
 #endif
 

diff --git a/sdk/app_cpu1/common/sys/log.c b/sdk/app_cpu1/common/sys/log.c
@@ -524,12 +524,12 @@ void state_machine_dump_binary_callback(void *arg)
         int max_num_samples = 1;
         if (ctx->dump_method == 2) {
             // Means Ethernet
-            max_num_samples = 100;
+            max_num_samples = 20;
 
             // To compute network load:
             // Mbps = (max_num_samples*4*8*10e3) / (1024*1024)
             //
-            // 100 ==> 30.5 Mbps
+            // 20 ==> 6.1 Mbps
             //
             // This is the upper limit; might stop early
             // due to buffer getting full!