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

Remove old custom firmware sender and replace it with AI designed UDS firmware sender. Not tested AT ALL.

Browse Source 
Committing merely to give a baseline for further changes
This commit is contained in:
Collin Kidder
2026-05-13 20:46:53 -04:00
parent ad65cf78a8
commit 035b65243b
10 changed files with 771 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/firmwareuploaderwindow.ui
-106
View File
@@ -1,106 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FirmwareUploaderWindow</class>
<widget class="QDialog" name="FirmwareUploaderWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>327</width>
<height>357</height>
</rect>
</property>
<property name="windowTitle">
<string>Firmware Updater</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Loaded File:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblFilename">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnLoadFile">
<property name="text">
<string>Load File</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label">
<property name="text">
<string>Device Token:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="txtToken"/>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_4">
<property name="text">
<string>CAN Bus:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBus"/>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Base Address:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="txtBaseAddr"/>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lblProgress">
<property name="text">
<string>X of Y bytes</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnStartStop">
<property name="text">
<string>Start Upload</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
ui/mainwindow.ui
+19 -14
View File
@@ -43,7 +43,7 @@
<bool>true</bool>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
<enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
</property>
<property name="wordWrap">
<bool>false</bool>
@@ -69,7 +69,7 @@
<string>Remote Connection Active:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@@ -99,7 +99,7 @@
<number>8</number>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
@@ -156,11 +156,11 @@
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<item alignment="Qt::AlignmentFlag::AlignHCenter">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -173,7 +173,7 @@
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<item alignment="Qt::AlignmentFlag::AlignHCenter">
<widget class="QLabel" name="lbNumFrames">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -186,7 +186,7 @@
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<item alignment="Qt::AlignmentFlag::AlignHCenter">
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -199,7 +199,7 @@
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<item alignment="Qt::AlignmentFlag::AlignHCenter">
<widget class="QLabel" name="lbFPS">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -263,7 +263,7 @@
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@@ -294,7 +294,7 @@
<string>Bus Filtering:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@@ -313,7 +313,7 @@
</size>
</property>
<property name="flow">
<enum>QListView::LeftToRight</enum>
<enum>QListView::Flow::LeftToRight</enum>
</property>
</widget>
</item>
@@ -323,7 +323,7 @@
<string>Frame Filtering:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@@ -382,7 +382,7 @@
<x>0</x>
<y>0</y>
<width>1177</width>
<height>26</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menu_RE_Tools">
@@ -411,7 +411,7 @@
<addaction name="actionScripting_INterface"/>
<addaction name="actionFuzzing"/>
<addaction name="actionUDS_Scanner"/>
<addaction name="actionFirmware_Update"/>
<addaction name="actionUDS_Firmware_Update"/>
<addaction name="actionMotorControlConfig"/>
<addaction name="actionCAN_Bridge"/>
</widget>
@@ -641,6 +641,11 @@
<string>CAN Bridge</string>
</property>
</action>
<action name="actionUDS_Firmware_Update">
<property name="text">
<string>UDS Firmware Update</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
ui/udsfirmwareuploaderwindow.ui
+181
View File
@@ -0,0 +1,181 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UDSFirmwareUploaderWindow</class>
<widget class="QDialog" name="UDSFirmwareUploaderWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>520</width>
<height>520</height>
</rect>
</property>
<property name="windowTitle">
<string>UDS Firmware Uploader</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelBus">
<property name="text">
<string>CAN Bus:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBus"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelTargetID">
<property name="text">
<string>Target Request ID:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="txtTargetID">
<property name="text">
<string>0x7E0</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelRespID">
<property name="text">
<string>Target Response ID:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="txtResponseID">
<property name="text">
<string>0x7E8</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelSession">
<property name="text">
<string>Session Type:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="cbSessionType">
<item>
<property name="text">
<string>Programming (0x02)</string>
</property>
</item>
<item>
<property name="text">
<string>Extended (0x03)</string>
</property>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelSecurity">
<property name="text">
<string>Security Level:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSpinBox" name="spinSecurityLevel">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckUseSecurity">
<property name="text">
<string>Enable Security</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelAddr">
<property name="text">
<string>Flash Address:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="txtFlashAddr">
<property name="text">
<string>0x08000000</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="btnLoadFile">
<property name="text">
<string>Load Firmware File...</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblFilename">
<property name="text">
<string>No file loaded</string>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="txtLog">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="btnStartStop">
<property name="text">
<string>Start Upload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnAbort">
<property name="text">
<string>Abort</string>
</property>
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>