Diff: main.cpp

Revision:

66:3947255b18c5

Parent:

63:10604c39666f

Child:

67:96a4052a1705

diff -r bfdf1e10428d -r 3947255b18c5 main.cpp
--- a/main.cpp	Thu Nov 26 04:31:14 2020 +0000
+++ b/main.cpp	Fri Jan 29 20:39:36 2021 +0000
@@ -26,7 +26,7 @@
 #include "math_ops.h" 
 #include "current_controller_config.h"
 #include "hw_config.h"
-#include "motor_config_U10.h" // need to choose between two files here, one for U10 and one for U12
+#include "motor_config_U12.h" // need to choose between two files here, one for U10 and one for U12
 #include "stm32f4xx_flash.h"
 #include "FlashWriter.h"
 #include "user_config.h"
@@ -124,7 +124,7 @@
     wait_us(10);
     printf(" %-4s %-31s %-5s %-6s %-5i\n\r", "m", "CAN Master ID", "0", "127", CAN_MASTER);
     wait_us(10);
-    printf(" %-4s %-31s %-5s %-6s %.1f\n\r", "l", "Current Limit (A)", "0.0", "40.0", I_MAX);
+    printf(" %-4s %-31s %-5s %-6s %.1f\n\r", "l", "Current Limit (A)", "0.0", "65.0", I_MAX);
     wait_us(10);
     printf(" %-4s %-31s %-5s %-6s %.1f\n\r", "f", "FW Current Limit (A)", "0.0", "33.0", I_FW_MAX);
     wait_us(10);
@@ -380,7 +380,7 @@
                         CAN_MASTER = atoi(cmd_val);
                         break;
                     case 'l':
-                        I_MAX = fmaxf(fminf(atof(cmd_val), 40.0f), 0.0f);
+                        I_MAX = fmaxf(fminf(atof(cmd_val), 65.0f), 0.0f);
                         break;
                     case 'f':
                         I_FW_MAX = fmaxf(fminf(atof(cmd_val), 33.0f), 0.0f);