PIC1 bootloader working

grodansparadis · Apr 25, 2024 · 0c326ed · 0c326ed
1 parent 5d272a9
commit 0c326ed
Show file tree

Hide file tree

Showing 28 changed files with 1,316 additions and 2,109 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -3,7 +3,7 @@
         {
           "taskName": "build",
           "type": "shell",
-          "command": "cd build; make -j4",
+          "command": "cd build; make -j4 -Wall",
           "args": [],
           "group": {
               "kind": "build",
@@ -14,7 +14,7 @@
         {
           "taskName": "clean & build all",
           "type": "shell",
-          "command": "cd build; make clean; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4",
+          "command": "cd build; make clean; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4 -Wall",
           "args": [],
           "group": {
               "kind": "build",
@@ -36,7 +36,7 @@
         {
           "taskName": "Clean & build all 5.15.2",
           "type": "shell",
-          "command": "cd build; make clean; export CMAKE_PREFIX_PATH=/home/akhe/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4",
+          "command": "cd build; make clean; export CMAKE_PREFIX_PATH=/home/akhe/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4 -Wall",
           "args": [],
           "group": {
               "kind": "build",
@@ -56,9 +56,9 @@
           }
         },
         {
-          "taskName": "Clean & build all 6.5.1",
+          "taskName": "Clean & build all 6.6.2",
           "type": "shell",
-          "command": "cd build; make clean; export CMAKE_PREFIX_PATH=/home/akhe/Qt/6.5.1/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4",
+          "command": "cd build; make clean; export CMAKE_PREFIX_PATH=/home/akhe/Qt/6.6.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4",
           "args": [],
           "group": {
               "kind": "build",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Build instructions for VSCP Works.
 #
-# Copyright (c) 2000-2023 Åke Hedman, Grodans Paradis AB
+# Copyright (c) 2000-2024 Åke Hedman, Grodans Paradis AB
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -192,7 +192,6 @@ endif()
 # set(UI )
 qt5_wrap_ui(UI src/mainwindow.ui    
   src/cdlgmainsettings.ui
-  src/cdlgconnsettingslocal.ui
   src/cdlgconnsettingscanal.ui
   src/cdlgconnsettingstcpip.ui
   src/cdlgconnsettingssocketcan.ui
@@ -201,7 +200,6 @@ qt5_wrap_ui(UI src/mainwindow.ui
   src/cdlgconnsettingsws2.ui
   src/cdlgconnsettingsudp.ui
   src/cdlgconnsettingsmulticast.ui
-  src/cdlgconnsettingsrest.ui
   src/cdlgconnsettingsrawcan.ui
   src/cdlgconnsettingsrawmqtt.ui
   src/cdlgnewconnection.ui
@@ -286,6 +284,8 @@ qt5_wrap_ui(UI src/mainwindow.ui
   src/cdlgselectmqtttopics.ui
 
   src/cdlgbootfirmware.ui
+
+  src/cdlgselectbootalgorithm.ui
 )
 
 add_executable(${PROJECT_NAME}
@@ -304,10 +304,6 @@ add_executable(${PROJECT_NAME}
   src/cdlgmainsettings.h
   src/cdlgmainsettings.cpp
 
-  src/cdlgconnsettingslocal.ui
-  src/cdlgconnsettingslocal.h
-  src/cdlgconnsettingslocal.cpp
-
   src/cdlgconnsettingscanal.ui
   src/cdlgconnsettingscanal.h
   src/cdlgconnsettingscanal.cpp
@@ -360,10 +356,6 @@ add_executable(${PROJECT_NAME}
   src/cdlgconnsettingsrawmqtt.h
   src/cdlgconnsettingsrawmqtt.cpp
 
-  src/cdlgconnsettingsrest.ui
-  src/cdlgconnsettingsrest.h
-  src/cdlgconnsettingsrest.cpp
-
   src/cdlgknownguid.ui
   src/cdlgknownguid.h
   src/cdlgknownguid.cpp
@@ -637,8 +629,12 @@ add_executable(${PROJECT_NAME}
   src/bootloaderwizard.cpp
 
   src/cdlgbootfirmware.ui
-  src/cdlgbootfirmware.cpp
   src/cdlgbootfirmware.h
+  src/cdlgbootfirmware.cpp
+
+  src/cdlgselectbootalgorithm.ui
+  src/cdlgselectbootalgorithm.h
+  src/cdlgselectbootalgorithm.cpp
 
   ${VSCP_PATH}/src/vscp/common/version.h
   ${VSCP_PATH}/src/vscp/common/vscp.h
@@ -662,8 +658,6 @@ add_executable(${PROJECT_NAME}
   ${VSCP_PATH}/src/vscp/common/register.cpp
   ${VSCP_PATH}/src/vscp/common/vscp_client_base.h
   ${VSCP_PATH}/src/vscp/common/vscp_client_base.cpp
-  ${VSCP_PATH}/src/vscp/common/vscp_client_local.h
-  ${VSCP_PATH}/src/vscp/common/vscp_client_local.cpp
   ${VSCP_PATH}/src/vscp/common/vscp_client_canal.h
   ${VSCP_PATH}/src/vscp/common/vscp_client_canal.cpp    
   ${VSCP_PATH}/src/vscp/common/vscp_client_mqtt.h
@@ -680,16 +674,10 @@ add_executable(${PROJECT_NAME}
   ${VSCP_PATH}/src/vscp/common/vscp_client_udp.cpp 
   ${VSCP_PATH}/src/vscp/common/vscp_client_multicast.h
   ${VSCP_PATH}/src/vscp/common/vscp_client_multicast.cpp 
-  ${VSCP_PATH}/src/vscp/common/vscp_client_rest.h
-  ${VSCP_PATH}/src/vscp/common/vscp_client_rest.cpp
   ${VSCP_PATH}/src/vscp/common/vscp_client_rawcan.h
   ${VSCP_PATH}/src/vscp/common/vscp_client_rawcan.cpp
   ${VSCP_PATH}/src/vscp/common/vscp_client_rawmqtt.h
   ${VSCP_PATH}/src/vscp/common/vscp_client_rawmqtt.cpp
-  ${VSCP_PATH}/src/vscp/common/vscp_client_rs232.h
-  ${VSCP_PATH}/src/vscp/common/vscp_client_rs232.cpp
-  ${VSCP_PATH}/src/vscp/common/vscp_client_rs485.h
-  ${VSCP_PATH}/src/vscp/common/vscp_client_rs485.cpp
   ${VSCP_PATH}/src/vscp/common/vscp_bootdevice.h
   ${VSCP_PATH}/src/vscp/common/vscp_bootdevice.cpp
   ${VSCP_PATH}/src/vscp/common/vscp_bootdevice_pic1.h

diff --git a/TODO.md b/TODO.md
@@ -56,10 +56,13 @@ https://stackoverflow.com/questions/400257/how-can-i-pass-a-class-member-functio
  - search register / next 
   - search remote variable /next
   - Remove ctrl+0/1/2... from menu keep functionality.
+  - Change node id after scan does not work
+  - From firmware file -> boot of that file.
 
 ## Scan window
   - Go to firmware update directly from window
   - Full Level II device scan.
+  - Go to bootload
 
 ## Bootloader window