Skip to content

Commit

Permalink
Changed spelling of some fields
Browse files Browse the repository at this point in the history
  • Loading branch information
Ultrawipf committed Jan 9, 2023
1 parent 6fb7b20 commit 4922afe
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 45 deletions.
9 changes: 6 additions & 3 deletions res/ffbclass.ui
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@
<item row="0" column="3">
<widget class="QSlider" name="horizontalSlider_cffilter">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constant force effect filter&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constant force effect low pass filter frequency&lt;/p&gt;&lt;p&gt;Be careful to prevent oscillations by not limiting the bandwidth too much.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>10</number>
Expand Down Expand Up @@ -487,7 +487,7 @@
<item row="0" column="2">
<widget class="QLabel" name="label_11">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constant force effect filter&lt;/p&gt;&lt;p&gt;Be careful to not aggressively use low pass filter to not add oscilation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Constant force effect low pass filter frequency&lt;/p&gt;&lt;p&gt;Be careful to prevent oscillations by not limiting the bandwidth too much.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Freq.</string>
Expand Down Expand Up @@ -531,6 +531,9 @@
</item>
<item row="1" column="3">
<widget class="QSlider" name="horizontalSlider_CFq">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Q Factor for constant force low pass filter.&lt;/p&gt;&lt;p&gt;Be careful to prevent oscillations by not limiting the bandwidth too much.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>0</number>
</property>
Expand All @@ -554,7 +557,7 @@
<item row="1" column="2">
<widget class="QLabel" name="label">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Q Factor to low pass filtering constant force.&lt;/p&gt;&lt;p&gt;Be careful to not aggressively use low pass filter to not add oscilation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Q Factor for constant force low pass filter.&lt;/p&gt;&lt;p&gt;Be careful to prevent oscillations by not limiting the bandwidth too much.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Q</string>
Expand Down
2 changes: 1 addition & 1 deletion res/odrive.ui
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Torque:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Because the ODrive only allows Nm values as torque input you have to set a maximum torque value scaler (full FFB = this value sent to ODrive). This depends on your motor. &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;A value too high causes early clipping.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;A value too high causes early clipping if it is not possible for the ODrive to reach this value.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;CAN speeds:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;FFB requires a 1kHz update rate for encoder positions and torque. &lt;/p&gt;
Expand Down
Loading

0 comments on commit 4922afe

Please sign in to comment.