t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LAWICEL CAN-FD support, CAN-FD data rate selection

Browse Source
This commit is contained in:
maciek16c
2023-11-22 14:39:36 +01:00
parent 7fef6eb49f
commit 190d51ae90
23 changed files with 354 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/connectionwindow.ui
+11 -1
View File
@@ -104,7 +104,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QPushButton" name="btnSaveBus">
<property name="text">
<string>Save Bus Settings</string>
@@ -121,6 +121,16 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="cbDataRate"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="dataRate_label">
<property name="text">
<string>CAN FD Data Rate</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
ui/newconnectiondialog.ui
+17 -7
View File
@@ -78,13 +78,6 @@
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QRadioButton" name="rbCanlogserver">
<property name="text">
<string>CANlogserver</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -150,6 +143,23 @@
<item>
<widget class="QComboBox" name="cbCANSpeed"/>
</item>
<item>
<widget class="QCheckBox" name="cbCanFd">
<property name="text">
<string>CAN-FD</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblDataRate">
<property name="text">
<string>CAN-FD data rate</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbDataRate"/>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">