Add a new window that can be used to bridge two CAN buses with

selective ID forwarding.
This commit is contained in:
Collin Kidder
2023-02-22 21:06:23 -05:00
parent e0fe807c38
commit 51ba7a2e76
10 changed files with 315 additions and 6 deletions
+89
View File
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CANBridgeWindow</class>
<widget class="QDialog" name="CANBridgeWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>480</height>
</rect>
</property>
<property name="windowTitle">
<string>CAN Bridger</string>
</property>
<property name="sizeGripEnabled">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Side 1</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbSide1"/>
</item>
<item>
<widget class="QCheckBox" name="ckEnableSide1">
<property name="text">
<string>Enable forwarding</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>IDs to forward to side 2</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="listSide1"/>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Side 2</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbSide2"/>
</item>
<item>
<widget class="QCheckBox" name="ckEnableSide2">
<property name="text">
<string>Enable forwarding</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>IDs to forward to side 1</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="listSide2"/>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>HelpWindow</class>
<widget class="QDialog" name="HelpWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
<height>700</height>
</rect>
</property>
<property name="windowTitle">
<string>SavvyCAN Help</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QTextBrowser" name="textHelp"/>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
+10 -4
View File
@@ -32,7 +32,6 @@
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@@ -81,7 +80,6 @@
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@@ -138,7 +136,6 @@
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<italic>true</italic>
<bold>true</bold>
</font>
@@ -338,6 +335,9 @@
<height>16777215</height>
</size>
</property>
<property name="alternatingRowColors">
<bool>false</bool>
</property>
</widget>
</item>
<item>
@@ -368,7 +368,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>21</height>
<height>26</height>
</rect>
</property>
<widget class="QMenu" name="menu_RE_Tools">
@@ -399,6 +399,7 @@
<addaction name="actionUDS_Scanner"/>
<addaction name="actionFirmware_Update"/>
<addaction name="actionMotorControlConfig"/>
<addaction name="actionCAN_Bridge"/>
</widget>
<widget class="QMenu" name="menuFile">
<property name="title">
@@ -621,6 +622,11 @@
<string>Save Decoded Frames CSV</string>
</property>
</action>
<action name="actionCAN_Bridge">
<property name="text">
<string>CAN Bridge</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>