Merge branch 'devel' of github.com:madcowswe/ODrive into devel

mp1994 · Dec 20, 2020 · aa7a7ea · aa7a7ea
2 parents 862a6b6 + 95a7c22
commit aa7a7ea
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/Firmware/MotorControl/motor.cpp b/Firmware/MotorControl/motor.cpp
@@ -332,7 +332,7 @@ bool Motor::setup() {
     max_dc_calib_ = 0.1f * max_allowed_current_;
 
     if (!gate_driver_.init())
-        return true;
+        return false;
 
     return true;
 }

diff --git a/Firmware/ThirdParty/FreeRTOS/Source/tasks.c b/Firmware/ThirdParty/FreeRTOS/Source/tasks.c
@@ -331,7 +331,7 @@ typedef tskTCB TCB_t;
 
 /*lint -save -e956 A manual analysis and inspection has been used to determine
 which static variables must be declared volatile. */
-PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;
+__attribute__((used)) PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;
 
 /* Lists for ready and blocked tasks. --------------------
 xDelayedTaskList1 and xDelayedTaskList2 could be move to function scople but

diff --git a/GUI/src/assets/dashboards/Tuning_0_4_12.json b/GUI/src/assets/dashboards/Tuning_0_4_12.json
@@ -102,11 +102,11 @@
       "vars": [
         {
           "path": "odrives.odrive0.axis0.controller.pos_setpoint",
-          "color": "#195bd7"
+          "color": "#1f77b4"
         },
         {
           "path": "odrives.odrive0.axis0.encoder.pos_estimate",
-          "color": "#d6941a"
+          "color": "#ff7f0e"
         }
       ]
     },
@@ -115,11 +115,11 @@
       "vars": [
         {
           "path": "odrives.odrive0.axis0.controller.vel_setpoint",
-          "color": "#195bd7"
+          "color": "#1f77b4"
         },
         {
           "path": "odrives.odrive0.axis0.encoder.vel_estimate",
-          "color": "#d6941a"
+          "color": "#ff7f0e"
         }
       ]
     }

diff --git a/GUI/src/assets/dashboards/Tuning_0_5_1.json b/GUI/src/assets/dashboards/Tuning_0_5_1.json
@@ -102,11 +102,11 @@
       "vars": [
         {
           "path": "odrives.odrive0.axis0.controller.input_pos",
-          "color": "#195bd7"
+          "color": "#1f77b4"
         },
         {
           "path": "odrives.odrive0.axis0.encoder.pos_estimate",
-          "color": "#d6941a"
+          "color": "#ff7f0e"
         }
       ]
     },
@@ -115,11 +115,11 @@
       "vars": [
         {
           "path": "odrives.odrive0.axis0.controller.vel_setpoint",
-          "color": "#195bd7"
+          "color": "#1f77b4"
         },
         {
           "path": "odrives.odrive0.axis0.encoder.vel_estimate",
-          "color": "#d6941a"
+          "color": "#ff7f0e"
         }
       ]
     }

diff --git a/GUI/src/views/Dashboard.vue b/GUI/src/views/Dashboard.vue
@@ -81,11 +81,16 @@ import { JSONView } from "vue-json-component";
 import { v4 as uuidv4 } from "uuid";
 
 let plotColors = [
-  "#195bd7", // blue
-  "#d6941a", // orange
-  "#1ad636", // green
-  "#d61aba", // purple
-  "#d5241a", // red
+  "#1f77b4", // blue
+  "#ff7f0e", // orange
+  "#2ca02c", // green
+  "#d62728", // red
+  "#9467bd", // purple
+  "#8c564b", // brown
+  "#e377c2", // pink
+  "#7f7f7f", // gray
+  "#bcbd22", // olive
+  "#17becf", // cyan
 ];
 
 let odriveEnums = {
@@ -100,7 +105,7 @@ let odriveEnums = {
       value: 1,
     },
     {
-      text: "Starup Sequence",
+      text: "Startup Sequence",
       value: 2,
     },
     {
@@ -150,7 +155,7 @@ let odriveEnums = {
       value: 1,
     },
     {
-      text: "Starup Sequence",
+      text: "Startup Sequence",
       value: 2,
     },
     {