Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-22 08:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Started work on tooltips for wizard choices. Tried out some prepackaged components - too complicated! Going to make a custom one.

Browse Source
This commit is contained in:
PAJohnson
2020-09-15 00:48:17 -04:00
parent 90cc43fc6f
commit aab7860d82
4 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GUI/src/assets/images/temp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

GUI/src/assets/wizard/wizard.js
+49 -20
View File
@@ -21,11 +21,13 @@ export let pages = {
imageURL: require("../images/24v_300x300.png"),
text: "ODrive v3.6 24V",
hooks: [],
tooltip: null,
},
{
imageURL: require("../images/56v_300x300.png"),
text: "ODrive v3.6 56V",
hooks: [],
tooltip: null,
},
],
customComponents: [],
@@ -44,6 +46,8 @@ export let pages = {
component: "wizardBrake",
id: 0,
data: {},
tooltip: "When you slow down a motor, the energy has to go somewhere.\n\r \
It either goes to the brake resistor or back to your power supply."
}
],
},
@@ -73,6 +77,7 @@ export let pages = {
},
},
},
tooltip: null,
},
{
imageURL: require("../images/D6374_300x300.png"),
@@ -92,6 +97,7 @@ export let pages = {
},
},
},
tooltip: null,
},
],
customComponents: [
@@ -100,7 +106,8 @@ export let pages = {
id: 0,
data: {
axis: "axis0",
}
},
tooltip: null,
},
],
pageComponents: [
@@ -143,6 +150,7 @@ export let pages = {
}
}
},
tooltip: null,
},
{
imageURL: require("../images/hall_effect_300x300.png"),
@@ -165,6 +173,7 @@ export let pages = {
}
}
},
tooltip: null,
},
],
customComponents: [
@@ -173,14 +182,16 @@ export let pages = {
id: 0,
data: {
axis: "axis0",
}
},
tooltip: null,
},
{
component: "wizardEncoderIncrementalIndex",
id: 1,
data: {
axis: "axis0",
}
},
tooltip: null,
},
],
pageComponents: [
@@ -212,7 +223,7 @@ export let pages = {
requirements: [],
choices: [
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Position Control",
hooks: [],
configStub: {
@@ -224,9 +235,10 @@ export let pages = {
},
},
},
tooltip: "Use this mode to control the position of the motor"
},
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Velocity Control",
hooks: [],
configStub: {
@@ -238,9 +250,10 @@ export let pages = {
},
},
},
tooltip: "Use this mode to control the velocity of the motor"
},
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Torque Control",
hooks: [],
configStub: {
@@ -252,9 +265,10 @@ export let pages = {
},
},
},
tooltip: "Use this mode to control the torque output of the motor"
},
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Voltage Control",
hooks: [],
configStub: {
@@ -266,6 +280,7 @@ export let pages = {
},
},
},
tooltip: "This mode is used for gimbal motors"
},
],
customComponents: [],
@@ -285,7 +300,8 @@ export let pages = {
id: 0,
data: {
axis: "axis0",
}
},
tooltip: null,
},
],
pageComponents: [],
@@ -315,6 +331,7 @@ export let pages = {
},
},
},
tooltip: null,
},
{
imageURL: require("../images/D6374_300x300.png"),
@@ -333,6 +350,7 @@ export let pages = {
},
},
},
tooltip: null,
},
],
customComponents: [
@@ -341,7 +359,8 @@ export let pages = {
id: 0,
data: {
axis: "axis1",
}
},
tooltip: null,
},
],
pageComponents: [
@@ -384,6 +403,7 @@ export let pages = {
}
}
},
tooltip: null,
},
{
imageURL: require("../images/hall_effect_300x300.png"),
@@ -406,6 +426,7 @@ export let pages = {
}
}
},
tooltip: null,
},
],
customComponents: [
@@ -414,14 +435,16 @@ export let pages = {
id: 0,
data: {
axis: "axis1",
}
},
tooltip: null,
},
{
component: "wizardEncoderIncrementalIndex",
id: 1,
data: {
axis: "axis1",
}
},
tooltip: null,
},
],
pageComponents: [
@@ -452,11 +475,11 @@ export let pages = {
requirements: [],
choices: [
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Position Control",
hooks: [],
configStub: {
axis0: {
axis1: {
controller: {
config: {
control_mode: odriveEnums.CONTROL_MODE_POSITION_CONTROL,
@@ -464,13 +487,14 @@ export let pages = {
},
},
},
tooltip: "Use this mode to control the position of the motor"
},
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Velocity Control",
hooks: [],
configStub: {
axis0: {
axis1: {
controller: {
config: {
control_mode: odriveEnums.CONTROL_MODE_VELOCITY_CONTROL,
@@ -478,13 +502,14 @@ export let pages = {
},
},
},
tooltip: "Use this mode to control the velocity of the motor"
},
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Torque Control",
hooks: [],
configStub: {
axis0: {
axis1: {
controller: {
config: {
control_mode: odriveEnums.CONTROL_MODE_TORQUE_CONTROL,
@@ -492,13 +517,14 @@ export let pages = {
},
},
},
tooltip: "Use this mode to control the torque output of the motor"
},
{
imageURL: "",
imageURL: require("../images/temp.png"),
text: "Voltage Control",
hooks: [],
configStub: {
axis0: {
axis1: {
controller: {
config: {
control_mode: odriveEnums.CONTROL_MODE_VOLTAGE_CONTROL,
@@ -506,6 +532,7 @@ export let pages = {
},
},
},
tooltip: "This mode is used for gimbal motors"
},
],
customComponents: [],
@@ -525,7 +552,8 @@ export let pages = {
id: 0,
data: {
axis: "axis1",
}
},
tooltip: null,
},
],
pageComponents: [],
@@ -542,6 +570,7 @@ export let pages = {
{
component: "wizardEnd",
id: 0,
tooltip: null,
}
],
pageComponents: [],
GUI/src/components/wizard/wizardPage.vue
+4 -2
View File
@@ -38,6 +38,7 @@
</template>
<script>
import Tooltip from "vue-directive-tooltip";
import wizardChoice from "./choices/wizardChoice.vue";
import wizardMisc from "./choices/wizardMisc.vue";
import wizardMotor from "./choices/wizardMotor.vue";
@@ -70,6 +71,7 @@ export default {
wizardMotorMeasure,
wizardEncoderCal,
wizardBrake,
Tooltip,
},
data: function () {
return {
@@ -82,8 +84,8 @@ export default {
this.$emit("choice", e);
},
pageCompEvent(e) {
this.$emit('page-comp-event',e);
}
this.$emit("page-comp-event", e);
},
},
};
</script>
GUI/src/main.js
+2 -1
View File
@@ -1,6 +1,7 @@
import Vue from 'vue'
import App from './App.vue'
import store from './store';
import store from './store'
Vue.config.productionTip = false