From b0fba1b6dec5a76264484c41fec73fc7b865f56c Mon Sep 17 00:00:00 2001
From: alessandro negrin <alessandro.negrin@gmail.com>
Date: Wed, 26 Mar 2025 19:09:16 +0100
Subject: [PATCH] setting proper system time

---
 .github/workflows/build.yml   | 97 ++---------------------------------
 connections/canconmanager.cpp |  3 +-
 2 files changed, 7 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2c7e6f..4a48d2d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,72 +1,13 @@
 name: Build
 
 on:
+  pull_request:
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - "master"
       
-jobs:
-  buildlinux:
-    name: Linux x64
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Prepare Environment
-        run: |
-            sudo apt-get install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-randr0 libxkbcommon-x11-0
-
-      - name: Prepare Qt Libraries
-        uses: jurplel/install-qt-action@v3
-
-      - name: Clone
-        uses: actions/checkout@v3
-
-      - name: Compile
-        run: |
-          qmake CONFIG+=release PREFIX=/usr SavvyCAN.pro
-          make -j`grep -c ^processor /proc/cpuinfo`
-          
-      - name: Package     
-        run: |
-          make INSTALL_ROOT=appdir install
-          wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-          chmod a+x linuxdeployqt-continuous-x86_64.AppImage
-          ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so,canbus
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: SavvyCAN-Linux_x64.AppImage
-          path: SavvyCAN-*x86_64.AppImage
-      
-  buildmacos:
-    name: macOS x64
-    runs-on: macos-12
-
-    steps:
-      - name: Prepare macOS Environment
-        run: |
-            brew install qt5
-            brew link qt5 --force
-
-      - name: Clone
-        uses: actions/checkout@v3
-
-      - name: Compile     
-        run: |
-          qmake CONFIG+=release CONFIG+=sdk_no_version_check SavvyCAN.pro
-          make -j`sysctl kern.aioprocmax | awk '{print $2}'`
-
-      - name: Package     
-        run: |
-          mkdir -p SavvyCAN.app/Contents/MacOS/help
-          cp -R help/* SavvyCAN.app/Contents/MacOS/help
-          macdeployqt SavvyCAN.app -dmg
-      
-      - uses: actions/upload-artifact@v4
-        with:
-          name: SavvyCAN-macOS_x64.dmg
-          path: SavvyCAN.dmg
-          
+jobs:        
   buildwindows:
     name: Windows x64
     runs-on: windows-2019
@@ -121,7 +62,7 @@ jobs:
   pre-release:
     name: "pre-release"
     runs-on: "ubuntu-latest"
-    needs: [buildwindows, buildmacos, buildlinux]
+    needs: [buildwindows]
 
     steps:
       - uses: actions/checkout@v3
@@ -137,33 +78,5 @@ jobs:
           prerelease: true
           title: "Development Build"
           files: |
-            SavvyCAN-Linux_x64.AppImage/SavvyCAN-*x86_64.AppImage
             SavvyCAN-Windows_x64_CIBuild.zip
-            SavvyCAN-macOS_x64.dmg/SavvyCAN.dmg
-          
-  notify:
-    name: Notify Discord
-    runs-on: ubuntu-latest
-    needs: [buildwindows, buildmacos, buildlinux]
-    steps:
-      - id: msg_var
-        name: remove newlines
-        run: |
-          export release_msg=$(cat << EOF
-          ${{ github.event.head_commit.message }} 
-          EOF
-          )
-          release_msg="${release_msg//$'\n'/'-'}"
-          release_msg="${release_msg//$'\r'/'-'}"
-          release_msg="${release_msg//$'('/'-'}"
-          release_msg="${release_msg//$')'/'-'}"
-          echo $release_msg
-          echo "::set-output name=msg::$release_msg"
-                                                                  
-      - name: Notify Discord
-        run: |
-          curl -i -H "Accept: application/json" \
-          -H "Content-Type:application/json" \
-          -X POST \
-          --data "{\"content\": null,\"embeds\": [{\"title\": \"${{ github.repository }} Build Complete\",      \"description\": \"${{ steps.msg_var.outputs.msg }} \\nCommit: ${{ github.sha }}\\n[Build Artifacts](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}#artifacts)\",      \"color\": 5131997,      \"author\": {        \"name\": \"Github Builds\"      }    }  ]}" \
-          https://discord.com/api/webhooks/${{ secrets.WEBHOOK_ID }}/${{ secrets.WEBHOOK_TOKEN }}
+
diff --git a/connections/canconmanager.cpp b/connections/canconmanager.cpp
index 9496b9e..d0f2053 100644
--- a/connections/canconmanager.cpp
+++ b/connections/canconmanager.cpp
@@ -222,7 +222,8 @@ bool CANConManager::sendFrame(const CANFrame& pFrame)
             workingFrame.isReceived = false;
             if (useSystemTime)
             {
-                workingFrame.setTimeStamp(QCanBusFrame::TimeStamp(0,QDateTime::currentMSecsSinceEpoch() * 1000));
+                qint64 currentTimeMs = QDateTime::currentMSecsSinceEpoch();
+                workingFrame.setTimeStamp(QCanBusFrame::TimeStamp(currentTimeMs / 1000, (currentTimeMs % 1000) * 1000));
             }
             else
             {