Added VSCP bootloader functionality

grodansparadis · Dec 12, 2024 · 7b6ea80 · 7b6ea80
1 parent f05ccea
commit 7b6ea80
Show file tree

Hide file tree

Showing 377 changed files with 464 additions and 120,473 deletions.
diff --git a/.clang-format b/.clang-format
@@ -18,5 +18,5 @@ AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
 BreakBeforeBraces: Stroustrup
-
+SortIncludes: false
 # google-readability-braces-around-statements
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
         "request": "launch",
         "program": "${workspaceFolder}/build/vscp-works-qt",
         "args": [],
-        "preLaunchTask": "build",
+        "preLaunchTask": "CMake: build",
       },
       {
         "name": "(gdb) Launch X",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -118,7 +118,7 @@
     ],
     "cmake.clearOutputBeforeBuild": false,
     "cmake.configureEnvironment": {
-      "CMAKE_PREFIX_PATH": "~/Qt/6.7.2/gcc_64"
+      "CMAKE_PREFIX_PATH": "~/Qt/6.8.0/gcc_64"
     },
     "vcpkg.general.enable": true,
     "vcpkg.target.hostTriplet": "x64-windows",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,49 +7,9 @@
         "targets": [
           "all"
         ],
-        "group": "build",
-        "problemMatcher": [],
-        "detail": "CMake template build task",
-        "isDefault": true
-      },
-      {
-        "taskName": "make",
-        "label": "build",
-        "type": "shell",
-        "command": "cd build; make -j4 -Wall ",
-        "args": [],
-        "group": "build",
-        "problemMatcher": "$gcc"        
-      },
-      {
-        "taskName": "clean & build all",
-        "type": "shell",
-        "command": "cd build; make clean; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4 -Wall",
-        "args": [],
-        "group": "build",
-        "problemMatcher": {
-          "owner": "cpp",
-          "fileLocation": [
-            "relative",
-            "${workspaceFolder}"
-          ],
-          "pattern": {
-            "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
-            "file": 1,
-            "line": 2,
-            "column": 3,
-            "severity": 4,
-            "message": 5
-          }
+        "group": {
+          "kind": "build"        
         },
-        "label": "clean & build all"
-      },      
-      {
-        "taskName": "Clean & build all 6.8.0",
-        "type": "shell",
-        "command": "rm -rf build; mkdir build; cd build; export CMAKE_PREFIX_PATH=~/Qt/6.8.0/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.8.0/gcc_64 .. ;  make -j4 -Wall",
-        "args": [],
-        "group": "build",
         "problemMatcher": {
           "owner": "cpp",
           "fileLocation": [
@@ -65,13 +25,15 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 6.8.0"
-      },
+        "detail": "CMake template build task"
+      }, 
       {
-        "taskName": "Clean & build all 6.7.3",
-        "type": "shell",
-        "command": "rm -rf build; mkdir build; cd build; export CMAKE_PREFIX_PATH=~/Qt/6.7.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/7.3.0/gcc_64 .. ;  make -j4 -Wall",
-        "args": [],
+        "type": "cmake",
+        "label": "CMake: clean rebuild",
+        "command": "cleanRebuild",
+        "targets": [
+          "all"
+        ],
         "group": "build",
         "problemMatcher": {
           "owner": "cpp",
@@ -88,31 +50,18 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 6.7.3"
+        "detail": "CMake template clean rebuild task"
       },
       {
-        "taskName": "Clean & build all 6.5.3",
         "type": "shell",
-        "command": "rm -rf build; mkdir build; cd build; export CMAKE_PREFIX_PATH=~/Qt/6.5.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.5.3/gcc_64 .. ;  make -j4 -Wall",
-        "args": [],
-        "group": "build",
-        "problemMatcher": {
-          "owner": "cpp",
-          "fileLocation": [
-            "relative",
-            "${workspaceFolder}"
-          ],
-          "pattern": {
-            "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
-            "file": 1,
-            "line": 2,
-            "column": 3,
-            "severity": 4,
-            "message": 5
-          }
+        "label": "Update submodules",
+        "command": "git submodule update --recursive --remote",
+        "group": {
+          "kind": "build",
+          "isDefault": false
         },
-        "label": "Clean & build all 6.5.3"
-      },
+        "detail": "Update submodules"
+      }
       {
         "type": "shell",
         "label": "g++ build active file",
@@ -129,4 +78,4 @@
       }
     ],
     "version": "2.0.0"
-}
+}       
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -545,64 +545,64 @@ qt_add_executable(${PROJECT_NAME}
   src/cdlgselectbootalgorithm.h
   src/cdlgselectbootalgorithm.cpp
 
-  $ENV{VSCP_ROOT}/src/vscp/common/version.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpdatetime.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpdatetime.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/guid.h
-  $ENV{VSCP_ROOT}/src/vscp/common/guid.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/mdf.h
-  $ENV{VSCP_ROOT}/src/vscp/common/mdf.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscphelper.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscphelper.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/canal.h
-  $ENV{VSCP_ROOT}/src/vscp/common/canaldlldef.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpcanaldeviceif.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpcanaldeviceif.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/canal-xmlconfig.h
-  $ENV{VSCP_ROOT}/src/vscp/common/canal-xmlconfig.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/register.h
-  $ENV{VSCP_ROOT}/src/vscp/common/register.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-base.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-base.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-canal.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-canal.cpp    
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-mqtt.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-mqtt.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-tcp.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-tcp.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-socketcan.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-socketcan.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws1.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws1.cpp 
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws2.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-ws2.cpp 
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-udp.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-udp.cpp 
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-multicast.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-client-multicast.cpp 
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-pic1.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-pic1.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-vscp.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscp-bootdevice-vscp.cpp
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpunit.h
-  $ENV{VSCP_ROOT}/src/vscp/common/vscpunit.cpp     
-  $ENV{VSCP_ROOT}/src/common/sockettcp.h
-  $ENV{VSCP_ROOT}/src/common/sockettcp.c
-  $ENV{VSCP_ROOT}/src/common/vscpbase64.h
-  $ENV{VSCP_ROOT}/src/common/vscpbase64.c
-  $ENV{VSCP_ROOT}/src/common/vscp-aes.h
-  $ENV{VSCP_ROOT}/src/common/vscp-aes.c
-  $ENV{VSCP_ROOT}/src/common/crc.h
-  $ENV{VSCP_ROOT}/src/common/crc.c
-  $ENV{VSCP_ROOT}/src/common/crc8.h
-  $ENV{VSCP_ROOT}/src/common/crc8.c
-  $ENV{VSCP_ROOT}/src/common/vscpmd5.h
-  $ENV{VSCP_ROOT}/src/common/vscpmd5.c
+  ./third_party/vscp/src/vscp/common/version.h
+  ./third_party/vscp/src/vscp/common/vscp.h
+  ./third_party/vscp/src/vscp/common/vscpremotetcpif.h
+  ./third_party/vscp/src/vscp/common/vscpremotetcpif.cpp
+  ./third_party/vscp/src/vscp/common/vscpdatetime.h
+  ./third_party/vscp/src/vscp/common/vscpdatetime.cpp
+  ./third_party/vscp/src/vscp/common/guid.h
+  ./third_party/vscp/src/vscp/common/guid.cpp
+  ./third_party/vscp/src/vscp/common/mdf.h
+  ./third_party/vscp/src/vscp/common/mdf.cpp
+  ./third_party/vscp/src/vscp/common/vscphelper.h
+  ./third_party/vscp/src/vscp/common/vscphelper.cpp
+  ./third_party/vscp/src/vscp/common/canal.h
+  ./third_party/vscp/src/vscp/common/canaldlldef.h
+  ./third_party/vscp/src/vscp/common/vscpcanaldeviceif.h
+  ./third_party/vscp/src/vscp/common/vscpcanaldeviceif.cpp
+  ./third_party/vscp/src/vscp/common/canal-xmlconfig.h
+  ./third_party/vscp/src/vscp/common/canal-xmlconfig.cpp
+  ./third_party/vscp/src/vscp/common/register.h
+  ./third_party/vscp/src/vscp/common/register.cpp
+  ./third_party/vscp/src/vscp/common/vscp-client-base.h
+  ./third_party/vscp/src/vscp/common/vscp-client-base.cpp
+  ./third_party/vscp/src/vscp/common/vscp-client-canal.h
+  ./third_party/vscp/src/vscp/common/vscp-client-canal.cpp    
+  ./third_party/vscp/src/vscp/common/vscp-client-mqtt.h
+  ./third_party/vscp/src/vscp/common/vscp-client-mqtt.cpp
+  ./third_party/vscp/src/vscp/common/vscp-client-tcp.h
+  ./third_party/vscp/src/vscp/common/vscp-client-tcp.cpp
+  ./third_party/vscp/src/vscp/common/vscp-client-socketcan.h
+  ./third_party/vscp/src/vscp/common/vscp-client-socketcan.cpp
+  ./third_party/vscp/src/vscp/common/vscp-client-ws1.h
+  ./third_party/vscp/src/vscp/common/vscp-client-ws1.cpp 
+  ./third_party/vscp/src/vscp/common/vscp-client-ws2.h
+  ./third_party/vscp/src/vscp/common/vscp-client-ws2.cpp 
+  ./third_party/vscp/src/vscp/common/vscp-client-udp.h
+  ./third_party/vscp/src/vscp/common/vscp-client-udp.cpp 
+  ./third_party/vscp/src/vscp/common/vscp-client-multicast.h
+  ./third_party/vscp/src/vscp/common/vscp-client-multicast.cpp 
+  ./third_party/vscp/src/vscp/common/vscp-bootdevice.h
+  ./third_party/vscp/src/vscp/common/vscp-bootdevice.cpp
+  ./third_party/vscp/src/vscp/common/vscp-bootdevice-pic1.h
+  ./third_party/vscp/src/vscp/common/vscp-bootdevice-pic1.cpp
+  ./third_party/vscp/src/vscp/common/vscp-bootdevice-vscp.h
+  ./third_party/vscp/src/vscp/common/vscp-bootdevice-vscp.cpp
+  ./third_party/vscp/src/vscp/common/vscpunit.h
+  ./third_party/vscp/src/vscp/common/vscpunit.cpp     
+  ./third_party/vscp/src/common/sockettcp.h
+  ./third_party/vscp/src/common/sockettcp.c
+  ./third_party/vscp/src/common/vscpbase64.h
+  ./third_party/vscp/src/common/vscpbase64.c
+  ./third_party/vscp/src/common/vscp-aes.h
+  ./third_party/vscp/src/common/vscp-aes.c
+  ./third_party/vscp/src/common/crc.h
+  ./third_party/vscp/src/common/crc.c
+  ./third_party/vscp/src/common/crc8.h
+  ./third_party/vscp/src/common/crc8.c
+  ./third_party/vscp/src/common/vscpmd5.h
+  ./third_party/vscp/src/common/vscpmd5.c
   ./third_party/mustache/mustache.hpp
   ./third_party/spdlog/include/
   ./third_party/crypto-algorithms/sha256.h
@@ -620,8 +620,8 @@ if (MSVC)
     ./src 
     ./build
     ./ui
-    $ENV{VSCP_ROOT}/src/vscp/common/  
-    $ENV{VSCP_ROOT}/src/common
+    ./third_party/vscp/src/vscp/common/  
+    ./third_party/vscp/src/common
     ./third_party
     ./third_party/nlohmann/include/
     ./third_party/spdlog/include/
@@ -644,10 +644,10 @@ else()
     ./src 
     ./build
     ./ui
-    third_party/mqtt
-    third_party/mqtt/clib
-    $ENV{VSCP_ROOT}/src/vscp/common/
-    $ENV{VSCP_ROOT}/src/common
+    ./third_party/mqtt
+    ./third_party/mqtt/clib
+    ./third_party/vscp/src/vscp/common/
+    ./third_party/vscp/src/common
     ./third_party
     ./third_party/nlohmann/include/
     ./third_party/spdlog/include/

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ If you still want to build this project
 
 ### Install Qt.
 
-Go to the qt site and download qt using the [Qt Online Installer](https://www.qt.io/download-open-source). Any version above 5.15 should work.
+Go to the qt site and download qt using the [Qt Online Installer](https://www.qt.io/download-open-source). Any version 6.x should work.
 
 ### Install other needed libs
 
@@ -141,13 +141,11 @@ vcpkg integrate install
 Install the required libs
 
 ```bash
-vcpkg install qt5:x64-windows
 vcpkg install pthread:x64-windows
 vcpkg install dlfcn-win32:x64-windows
 vcpkg install expat:x64-windows
 vcpkg install openssl:x64-windows
 vcpkg install paho-mqtt:x64-windows
-vcpkg install qtcharts:x64-windows
 ```
 
 The Qt installation may take some time
@@ -308,10 +306,7 @@ cmake ..
 
 ## Linux
 
-  * Need to install libqt5serialport5-dev
 
-  sudo apt-get install libqt5serialport5
-  sudo apt-get install libqt5serialport5-dev
 
 ## Enable debug