Skip to content

Commit

Permalink
Merge pull request #58 from dmg210/main
Browse files Browse the repository at this point in the history 
introduce bsl support for simk41/43 ecus
add exception for key teach if the ecu doesn't response
bump python-version: '3.12.8' as 3.12.7 no longer available via pip
  • Loading branch information
@dmg210
dmg210 authored Dec 16, 2024
2 parents 43d8cf4 + 678471c commit a4c4ead
Show file tree
Hide file tree
Showing 6 changed files with 1,321 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v1
with:
python-version: '3.12.7'
python-version: '3.12.8'
architecture: 'x64'

- name: Install GKFlasher Requirements
Expand Down
41 changes: 23 additions & 18 deletions .github/workflows/product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,52 +45,57 @@
<File Id="ApplicationFile23" Source="dist\gui\python312.dll" />
<File Id="ApplicationFile24" Source="dist\gui\select.pyd" />
<File Id="ApplicationFile25" Source="dist\gui\unicodedata.pyd" />
<File Id="ApplicationFile26" Source="bsl.py" />
</Component>
<Directory Id="FLASHERDIR" Name="flasher">
<Component Id="ApplicationFilesB" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE8}">
<File Id="ApplicationFile26" Source="flasher\checksum.py" />
<File Id="ApplicationFile27" Source="flasher\ecu.py" />
<File Id="ApplicationFile28" Source="flasher\gkflasher.ui" />
<File Id="ApplicationFile29" Source="flasher\gkflasher.qss" />
<File Id="ApplicationFile30" Source="flasher\immo.py" />
<File Id="ApplicationFile31" Source="flasher\logging.py" />
<File Id="ApplicationFile32" Source="flasher\memory.py" />
<File Id="ApplicationFile27" Source="flasher\checksum.py" />
<File Id="ApplicationFile28" Source="flasher\ecu.py" />
<File Id="ApplicationFile29" Source="flasher\gkflasher.ui" />
<File Id="ApplicationFile30" Source="flasher\gkflasher.qss" />
<File Id="ApplicationFile31" Source="flasher\immo.py" />
<File Id="ApplicationFile32" Source="flasher\logging.py" />
<File Id="ApplicationFile33" Source="flasher\memory.py" />
</Component>
</Directory>
<Directory Id="ASSETSDIR" Name="assets">
<Component Id="ApplicationFilesC" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE7}">
<File Id="ApplicationFile33" Source="assets\Siemens_T_Logo.ico" />
<File Id="ApplicationFile34" Source="assets\Siemens_T_Logo.ico" />
<File Id="ApplicationFile35" Source="assets\simk4x_bootstrap.bin" />
<File Id="ApplicationFile36" Source="assets\simk4x_kernel.bin" />
<File Id="ApplicationFile37" Source="assets\simk4x_driver_i4_a29fx00bx.bin" />
<File Id="ApplicationFile38" Source="assets\simk4x_driver_v6_a29fx00bx.bin" />
</Component>
</Directory>
<Directory Id="PYQT5DIR" Name="PyQt5">
<Component Id="ApplicationFilesD" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE6}">
<File Id="ApplicationFile34" Source="dist\gui\PyQt5\QtCore.pyd" />
<File Id="ApplicationFile35" Source="dist\gui\PyQt5\QtGui.pyd" />
<File Id="ApplicationFile36" Source="dist\gui\PyQt5\QtWidgets.pyd" />
<File Id="ApplicationFile37" Source="dist\gui\PyQt5\sip.cp312-win_amd64.pyd" />
<File Id="ApplicationFile39" Source="dist\gui\PyQt5\QtCore.pyd" />
<File Id="ApplicationFile40" Source="dist\gui\PyQt5\QtGui.pyd" />
<File Id="ApplicationFile41" Source="dist\gui\PyQt5\QtWidgets.pyd" />
<File Id="ApplicationFile42" Source="dist\gui\PyQt5\sip.cp312-win_amd64.pyd" />
</Component>
<Directory Id="QT5DIR" Name="Qt5">
<Directory Id="PYQT5BINDIR" Name="bin">
<Component Id="ApplicationFilesE" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE5}">
<File Id="ApplicationFile38" Source="dist\gui\PyQt5\Qt5\bin\Qt5Core.dll" />
<File Id="ApplicationFile39" Source="dist\gui\PyQt5\Qt5\bin\Qt5Gui.dll" />
<File Id="ApplicationFile40" Source="dist\gui\PyQt5\Qt5\bin\Qt5Widgets.dll" />
<File Id="ApplicationFile43" Source="dist\gui\PyQt5\Qt5\bin\Qt5Core.dll" />
<File Id="ApplicationFile44" Source="dist\gui\PyQt5\Qt5\bin\Qt5Gui.dll" />
<File Id="ApplicationFile45" Source="dist\gui\PyQt5\Qt5\bin\Qt5Widgets.dll" />
</Component>
</Directory>
<Directory Id="PYQT5PLUGINSDIR" Name="plugins">
<Directory Id="PLATFORMDIR" Name="platforms">
<Component Id="ApplicationFilesF" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE4}">
<File Id="ApplicationFile41" Source="dist\gui\PyQt5\Qt5\plugins\platforms\qwindows.dll" />
<File Id="ApplicationFile46" Source="dist\gui\PyQt5\Qt5\plugins\platforms\qwindows.dll" />
</Component>
</Directory>
<Directory Id="STYLESDIR" Name="styles">
<Component Id="ApplicationFilesG" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE3}">
<File Id="ApplicationFile42" Source="dist\gui\PyQt5\Qt5\plugins\styles\qwindowsvistastyle.dll" />
<File Id="ApplicationFile47" Source="dist\gui\PyQt5\Qt5\plugins\styles\qwindowsvistastyle.dll" />
</Component>
</Directory>
<Directory Id="IMAGEFORMATSDIR" Name="imageformats">
<Component Id="ApplicationFilesH" Guid="{652E355F-4E96-40FB-8B34-A9593CE42CE2}">
<File Id="ApplicationFile43" Source="dist\gui\PyQt5\Qt5\plugins\imageformats\qico.dll" />
<File Id="ApplicationFile48" Source="dist\gui\PyQt5\Qt5\plugins\imageformats\qico.dll" />
</Component>
</Directory>
</Directory>
Expand Down
Loading

0 comments on commit a4c4ead

Please sign in to comment.