2.1.10

.github/workflows/linux-release.yml

@@ -17,18 +17,23 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v6.4.0
       with:
-        go-version: '1.26.3'
+        go-version: '1.26.4'
         cache: false
     - name: Get dependencies
       run: sudo apt-get update && sudo apt-get install 7zip gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev libusb-1.0-0-dev libgtk-3-dev libasound2-dev libftdi1 libftdi1-dev
-    - name: Build CanGateway
-      run: GOPATH=$PWD/go go install -tags="j2534" github.com/roffe/gocangateway@latest; mv go/bin/gocangateway cangateway
+    - name: Install Kvaser CANLIB
+      run: |
+        wget -qO- "https://www.kvaser.com/downloads-kvaser/?utm_source=software&utm_ean=7330130980754&utm_status=latest" | tar xz
+        make -C linuxcan/canlib
+        sudo make -C linuxcan/canlib install
+    - name: Build j2534proxy
+      run: make j2534proxy
     - name: Get Go dependencies
       run: go get .
     - name: Build txlogger
       run: make txlogger
     - name: Archive
-      run: 7z a txloger_ubuntu_x64.7z cangateway txlogger
+      run: 7z a txloger_ubuntu_x64.7z j2534proxy.exe txlogger
     - name: Release
       uses: softprops/action-gh-release@v3
       if: github.ref_type == 'tag'

.github/workflows/linux.yml

@@ -17,13 +17,18 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v6.4.0
       with:
-        go-version: '1.26.3'
+        go-version: '1.26.4'
         cache: false
     - name: Get dependencies
       run: sudo apt-get update && sudo apt-get install 7zip gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev libusb-1.0-0-dev libgtk-3-dev libasound2-dev libftdi1 libftdi1-dev
+    - name: Install Kvaser CANLIB
+      run: |
+        wget -qO- "https://www.kvaser.com/downloads-kvaser/?utm_source=software&utm_ean=7330130980754&utm_status=latest" | tar xz
+        make -C linuxcan/canlib
+        sudo make -C linuxcan/canlib install
     - name: Get Go dependencies
       run: go get .
-    - name: Build CanGateway
-      run: GOPATH=$PWD/go go install -tags="j2534" github.com/roffe/gocangateway@latest
+    - name: Build j2534proxy
+      run: make j2534proxy
     - name: Build txlogger
       run: make txlogger

.github/workflows/windows-release.yml

@@ -24,29 +24,51 @@ jobs:
         submodules: recursive
 
     - name: Install NSIS
-      uses: repolevedavaj/install-nsis@v1.2.0
+      uses: repolevedavaj/install-nsis@v1.2.1
       with:
         nsis-version: '3.11'
 
     - name: Set up Go
       uses: actions/setup-go@v6.4.0
       with:
-        go-version: '1.26.3'
+        go-version: '1.26.4'
         cache: false
 
     - name: Install dependencies
       run: |
         go get .
         go install fyne.io/tools/cmd/fyne@latest
-        .\setup_build_env.ps1
+
+    #- name: Install CANUSB SDK
+    #  run: |
+    #    New-Item -ItemType Directory -Path .\canusb -Force | Out-Null
+    #    Invoke-WebRequest -Uri "https://www.canusb.com/files/canusb_dll_driver.zip" -OutFile canusb_dll_driver.zip
+    #    Expand-Archive -Path canusb_dll_driver.zip -DestinationPath .\canusb -Force
+
+    - name: Install CANLIB
+      run: |
+        Invoke-WebRequest -Uri "https://pim.kvaser.com/var/assets/Product_Resources/7330130980150/5.51.461/canlib_5_51_461.exe" -OutFile canlib.exe
+        Start-Process -FilePath .\canlib.exe -ArgumentList "/S" -Wait
+
+    - name: Install llvm-mingw
+      run: |
+        Invoke-WebRequest -Uri "https://github.com/mstorsjo/llvm-mingw/releases/download/20251216/llvm-mingw-20251216-ucrt-x86_64.zip" -OutFile llvm-mingw.zip
+        Expand-Archive -Path llvm-mingw.zip -DestinationPath .\ -Force
+        Rename-Item -Path .\llvm-mingw-20251216-ucrt-x86_64 -NewName llvm-mingw
+
+    - name: Install libusb via vcpkg
+      run: |
+        git clone https://github.com/microsoft/vcpkg.git --depth=1
+        .\vcpkg\bootstrap-vcpkg.bat -disableMetrics
+        .\vcpkg\vcpkg.exe install libusb:x64-windows
 
     - name: Build
       run: |
         $env:PATH += ";D:\a\txlogger\txlogger\llvm-mingw\bin"
-        .\build.ps1 -cangateway -usegitsrc -txlogger -setup
+        .\build.ps1 -j2534proxy -txlogger -setup
 
     - name: Creating Zip
-      run: 7z a txlogger.zip txlogger.exe cangateway.exe .\debug.bat C:\Progra~2\Kvaser\Canlib\Bin\canlib32.dll .\vcpkg\packages\libusb_x64-windows\bin\libusb-1.0.dll .\canusb\dll64\canusbdrv64.dll
+      run: 7z a txlogger.zip txlogger.exe j2534proxy.exe .\debug.bat C:\Progra~2\Kvaser\Canlib\Bin\canlib32.dll .\vcpkg\packages\libusb_x64-windows\bin\libusb-1.0.dll .\dist\canusbdrv64.dll
 
     - name: Creating Setup Zip
       run: 7z a txlogger_setup.zip txlogger_setup.exe

.github/workflows/windows.yml

@@ -27,29 +27,51 @@ jobs:
         submodules: recursive
 
     - name: Install NSIS
-      uses: repolevedavaj/install-nsis@v1.2.0
+      uses: repolevedavaj/install-nsis@v1.2.1
       with:
         nsis-version: '3.11'
 
     - name: Set up Go
       uses: actions/setup-go@v6.4.0
       with:
-        go-version: '1.26.3'
+        go-version: '1.26.4'
         cache: false
 
     - name: Install dependencies
       run: |
         go get .
         go install fyne.io/tools/cmd/fyne@latest
-        .\setup_build_env.ps1
+
+    #- name: Install CANUSB SDK
+    #  run: |
+    #    New-Item -ItemType Directory -Path .\canusb -Force | Out-Null
+    #    Invoke-WebRequest -Uri "https://www.canusb.com/files/canusb_dll_driver.zip" -OutFile canusb_dll_driver.zip
+    #    Expand-Archive -Path canusb_dll_driver.zip -DestinationPath .\canusb -Force
+
+    - name: Install CANLIB
+      run: |
+        Invoke-WebRequest -Uri "https://pim.kvaser.com/var/assets/Product_Resources/7330130980150/5.51.461/canlib_5_51_461.exe" -OutFile canlib.exe
+        Start-Process -FilePath .\canlib.exe -ArgumentList "/S" -Wait
+
+    - name: Install llvm-mingw
+      run: |
+        Invoke-WebRequest -Uri "https://github.com/mstorsjo/llvm-mingw/releases/download/20251216/llvm-mingw-20251216-ucrt-x86_64.zip" -OutFile llvm-mingw.zip
+        Expand-Archive -Path llvm-mingw.zip -DestinationPath .\ -Force
+        Rename-Item -Path .\llvm-mingw-20251216-ucrt-x86_64 -NewName llvm-mingw
+
+    - name: Install libusb via vcpkg
+      run: |
+        git clone https://github.com/microsoft/vcpkg.git --depth=1
+        .\vcpkg\bootstrap-vcpkg.bat -disableMetrics
+        .\vcpkg\vcpkg.exe install libusb:x64-windows
 
     - name: Build
       run: |
         $env:PATH += ";D:\a\txlogger\txlogger\llvm-mingw\bin"
-        .\build.ps1 -cangateway -usegitsrc -txlogger -setup
+        .\build.ps1 -j2534proxy -txlogger -setup
 
     - name: Creating Zip
-      run: 7z a txlogger.zip txlogger.exe cangateway.exe .\debug.bat C:\Progra~2\Kvaser\Canlib\Bin\canlib32.dll .\vcpkg\packages\libusb_x64-windows\bin\libusb-1.0.dll .\canusb\dll64\canusbdrv64.dll
+      run: 7z a txlogger.zip txlogger.exe j2534proxy.exe .\debug.bat C:\Progra~2\Kvaser\Canlib\Bin\canlib32.dll .\vcpkg\packages\libusb_x64-windows\bin\libusb-1.0.dll .\dist\canusbdrv64.dll
 
     - name: Creating Setup Zip
       run: 7z a txlogger_setup.zip txlogger_setup.exe

.gitignore

@@ -1,18 +1,23 @@
 .tmp
 tmp
 tmp2
-dist
 .vscode
 *.afr
 *.t7l
 *.t8l
 *.csv
 *.dif
-*.dll
+/*.dll
 /*.json
 *.dat
 *.exe
 *.zip
+!pkg/dtc/wis/wis.zip
+
+# raw SAAB WIS dumps used by pkg/dtc/wis/gen.go
+/pkg/dtc/9400/
+/pkg/dtc/9440/
+/pkg/dtc/9600/
 debug.log
 symbols.txt
 *.o

FyneApp.toml

@@ -5,7 +5,7 @@ Icon = "Icon.png"
 Name = "txlogger"
 ID = "com.roffe.txlogger"
 Version = "2.1.10"
-Build = 689
+Build = 705
 
 [Migrations]
 fyneDo = true

Makefile

@@ -11,19 +11,36 @@ endif
 
 default: txlogger
 
-cangateway:
-	go build -tags="j2534" -ldflags '-s -w' -o cangateway ../gocangateway
+pkg/ota/firmware.bin: /home/roffe/Documents/PlatformIO/Projects/txbridge/.pio/build/esp32dev/firmware.bin
+	@cp $< $@
 
 txlogger:
 	go build -tags=$(BUILDTAGS) -ldflags '-s -w' -o txlogger .
 
 release:
 	fyne package -tags=$(BUILDTAGS) --release
 
-run: clean cangateway
+debug: clean
 	@echo Using compiler "$(CC)"
-	-go run -tags=$(BUILDTAGS) . 2>&1 | tee run.log
+	-go run -tags=$(BUILDTAGS),debug . 2>&1 | tee run.log
+
+windows:
+	CGO_CFLAGS="-Ivcpkg/packages/libusb_x64-windows/include/libusb-1.0" \
+	CGO_LDFLAGS="-Lvcpkg/packages/libusb_x64-windows/lib" \
+	CGO_ENABLED=1 \
+	CC=x86_64-w64-mingw32-gcc \
+	GOARCH=amd64 \
+	GOOS=windows \
+	fyne package --os windows --icon Icon.png -tags=$(BUILDTAGS) --release
+#	go build -tags=$(BUILDTAGS) -ldflags '-s -w' -o txlogger.exe .
+
+run: clean pkg/ota/firmware.bin
+	@echo Using compiler "$(CC)"
+	-GOEXPERIMENT=simd go run -tags=$(BUILDTAGS) . 2>&1 | tee run.log
 
 clean:
-	rm -f cangateway
-	rm -f txlogger
+	rm -f cangateway j2534proxy.exe
+	rm -f txlogger
+.PHONY: j2534proxy
+j2534proxy:
+	GOOS=windows GOARCH=386 go build -tags="j2534" -ldflags '-s -w' -o j2534proxy.exe ./j2534proxy

build.ps1

@@ -1,59 +1,37 @@
 param(
-    [switch]$cangateway,
+    [Alias("cangateway")]
+    [switch]$j2534proxy,
     [switch]$txlogger,
     [switch]$setup,
     [switch]$release,
     [switch]$usegitsrc
 )
 
-if (-not ($cangateway -or $txlogger -or $setup -or $release)) {
-    Write-Host "Please specify at least one of the following switches: -cangateway, -txlogger, -setup, -release"
+if (-not ($j2534proxy -or $txlogger -or $setup -or $release)) {
+    Write-Host "Please specify at least one of the following switches: -j2534proxy, -txlogger, -setup, -release"
     exit
 }
 
 New-Item -ItemType Directory -Path "dist" -Force | Out-Null
 
 if ($release) {
-    $cangateway = $true
+    $j2534proxy = $true
     $txlogger = $true
     $setup = $true
 }
 
-$env:CGO_ENABLED = "1" 
+$env:CGO_ENABLED = "1"
 $env:GOGC = "100"
 $env:CC = "x86_64-w64-mingw32-clang.exe"
 $env:CXX = "x86_64-w64-mingw32-clang++.exe"
 
 $current_path = Get-Location
 
-if ($cangateway) {
-    Write-Output "Building cangateway.exe"
-    #$includes = @(
-    #    'C:\Progra~2\Kvaser\Canlib\INC'
-    #)
-
-    # $libs = @(
-    #     'C:\Progra~2\Kvaser\Canlib\Lib\MS'
-    # )
-    # $env:PKG_CONFIG_PATH = "$current_path\vcpkg\packages\libusb_x64-windows\lib\pkgconfig"
-    # $env:CGO_CFLAGS = ($includes | ForEach-Object { '-I' + $_ }) -join ' '
-    # $env:CGO_LDFLAGS = ($libs | ForEach-Object { '-L' + $_ }) -join ' '
+if ($j2534proxy) {
+    Write-Output "Building j2534proxy.exe"
+    $env:GOOS = "windows"
     $env:GOARCH = "386"
-    if ($usegitsrc) {
-        # git clone https://github.com/roffe/gocangateway.git
-        # Set-Location -Path ".\gocangateway"
-        # go build -tags="canlib,j2534" -ldflags '-s -w -H=windowsgui' -o cangateway.exe .
-        # Move-Item -Path ".\cangateway.exe" -Destination "$current_path\cangateway.exe" -Force
-        # Set-Location -Path $current_path
-        go install -tags="j2534" -ldflags '-s -w -H=windowsgui' github.com/roffe/gocangateway@latest
-        Move-Item -Path "$Env:USERPROFILE\go\bin\windows_386\gocangateway.exe" -Destination "$current_path\cangateway.exe" -Force
-    }
-    else {
-        #Set-Location -Path "..\gocangateway"
-        go build -tags="j2534" -ldflags '-s -w -H=windowsgui' -o cangateway.exe ..\gocangateway
-        #Move-Item -Path ".\cangateway.exe" -Destination "$current_path\cangateway.exe" -Force
-        #Set-Location -Path $current_path
-    } 
+    go build -tags="j2534" -ldflags '-s -w -H=windowsgui' -o j2534proxy.exe .\j2534proxy
 }
 
 if ($txlogger) {

console_linux.go

@@ -1,4 +1,3 @@
 package main
 
-func InitConsole() {
-}
+func InitConsole() {}

console_windows.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/roffe/gocan/pkg/w32"
+	"github.com/roffe/gocan/v2/pkg/w32"
 )
 
 const (

pkg/analyzer/analyzer.go → experiments/analyzer/analyzer.go

@@ -10,41 +10,41 @@ import (
 
 // 75      125     150     180     240     300     360     420     480     540     600     660     720     800     900     1100    1300    1500
 var tolerancces []int = []int{
-	5, //75
+	5, // 75
 	5,
-	10, //125
+	10, // 125
 	10,
-	10, //150
+	10, // 150
 	10,
-	10, //180
+	10, // 180
 	10,
-	10, //240
+	10, // 240
 	10,
-	15, //300
+	15, // 300
 	15,
-	15, //360
+	15, // 360
 	15,
-	15, //420
+	15, // 420
 	15,
-	15, //480
+	15, // 480
 	15,
-	15, //540
+	15, // 540
 	15,
-	15, //600
+	15, // 600
 	15,
-	20, //660
+	20, // 660
 	20,
-	20, //720
+	20, // 720
 	20,
-	20, //800
+	20, // 800
 	30,
-	30, //900
+	30, // 900
 	40,
-	40, //1100
+	40, // 1100
 	40,
-	50, //1300
+	50, // 1300
 	50,
-	50, //1500
+	50, // 1500
 }
 
 // AnalyzeLambda analyzes lambda values based on stable pedal conditions