BlueAndi · BlueAndi · Jan 15, 2025 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
+    branches: [ feature/** ]
   pull_request:
     branches: [ master ]
 
@@ -22,11 +22,15 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
         with:
           submodules: recursive
 
+      - name: Setup for linux
+        run: |
+          sudo ./setup_linux.sh
+
       - name: Build logger (release)
         run: |
           cd ./logger

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.0
+
+  * Build environment updated for using MSYS2 MinGW UCRT 64-bit.
+  * Using VSCP-framework v ...
+  * Using VSCP-bootloader v ...
+
 ## 2.0.0
 
   * [VSCP-framework repository](https://github.com/BlueAndi/vscp-framework) was restructured and the CLI tools moved to this dedicated repository.

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 - 2024 Andreas Merkle
+Copyright (c) 2014 - 2025 Andreas Merkle
 http://www.blue-andi.de
 vscp@blue-andi.de
 

diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ Command line interface tools used to maintain or simulate VSCP nodes.
   - [1 Clone The Repository](#1-clone-the-repository)
   - [2 Choose Project](#2-choose-project)
   - [3 Build](#3-build)
+- [Used Libraries](#used-libraries)
 - [Issues, Ideas And Bugs](#issues-ideas-and-bugs)
 - [License](#license)
 - [Contribution](#contribution)
@@ -41,17 +42,21 @@ More information can be found on the main site http://www.vscp.org
 ## Prerequisite
 
 ### Linux
-
-Get the standard gcc build environment:
-```
-$ sudo apt update
-$ sudo apt install build-essential
-```
+1. Open a terminal.
+2. Call ```setup_linux.sh```
 
 ### Windows
 
 1. Install MSYS2 (https://www.msys2.org/) and follow the complete installation instructions there. Only installing the MSYS2 binary is not enough! There are several steps in the MSYS2 shell necessary.
-2. The gcc build environment will be available in the "MSYS MinGW 64-bit" shell.
+2. The gcc build environment will be available in the "MSYS2 MinGW UCRT 64-bit" shell.
+3. Install expat packages:
+    ```bash
+    pacman -S libexpat
+    pacman -S libexpat-devel
+    ```
+4. Install required visual studio runtime packages:
+   * https://aka.ms/vs/17/release/vc_redist.x86.exe
+   * https://aka.ms/vs/17/release/vc_redist.x64.exe
 
 ## 1 Clone The Repository
 
@@ -74,6 +79,14 @@ Choose the project by entering the corresponding folder, e.g. ```/nodeSim```.
 Build debug variant with ```make debug``` or use ```make release``` for the release variant.
 The result will be in the ```/<project>/bin``` folder.
 
+# Used Libraries
+
+| Library | Description | License |
+| - | - | - |
+| [Expat](https://github.com/libexpat/libexpat) | Fast streaming XML parser. | MIT |
+| [OpenSSL](https://github.com/openssl/openssl) | OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit for the TLS (formerly SSL), DTLS and QUIC (currently client side only) protocols. | Apache-2.0 |
+| [vscp-helper-lib](https://github.com/grodansparadis/vscp-helper-lib) | VSCP helper functionality | MIT |
+
 # Issues, Ideas And Bugs
 
 If you have further ideas or you found some bugs, great! Create a [issue](https://github.com/BlueAndi/vscp-cli-tools/issues) or if you are able and willing to fix it by yourself, clone the repository and create a pull request.

diff --git a/common/cmdLineParser.c b/common/cmdLineParser.c
@@ -1,6 +1,6 @@
 /* The MIT License (MIT)
  * 
- * Copyright (c) 2014 - 2024 Andreas Merkle
+ * Copyright (c) 2014 - 2025 Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
  * 

diff --git a/common/cmdLineParser.h b/common/cmdLineParser.h
@@ -1,6 +1,6 @@
 /* The MIT License (MIT)
  * 
- * Copyright (c) 2014 - 2024 Andreas Merkle
+ * Copyright (c) 2014 - 2025 Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
  * 

diff --git a/common/log.c b/common/log.c
@@ -1,6 +1,6 @@
 /* The MIT License (MIT)
  *
- * Copyright (c) 2014 - 2024 Andreas Merkle
+ * Copyright (c) 2014 - 2025 Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
  *

diff --git a/common/log.h b/common/log.h
@@ -1,6 +1,6 @@
 /* The MIT License (MIT)
  *
- * Copyright (c) 2014 - 2024 Andreas Merkle
+ * Copyright (c) 2014 - 2025 Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
  *

diff --git a/common/platform.c b/common/platform.c
@@ -1,6 +1,6 @@
 /* The MIT License (MIT)
  *
- * Copyright (c) 2014 - 2024 Andreas Merkle
+ * Copyright (c) 2014 - 2025 Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
  *

diff --git a/common/platform.h b/common/platform.h
@@ -1,6 +1,6 @@
 /* The MIT License (MIT)
  *
- * Copyright (c) 2014 - 2024 Andreas Merkle
+ * Copyright (c) 2014 - 2025 Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
  *

diff --git a/common/vscp-bootloader b/common/vscp-bootloader
diff --git a/common/vscp-framework b/common/vscp-framework
diff --git a/common/vscphelper/vscp_class.h → common/vscphelper/vscp-class.h b/common/vscphelper/vscp_class.h → common/vscphelper/vscp-class.h
@@ -15,7 +15,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2000-2021 Ake Hedman, 
+ * Copyright (C) 2000-2022 Ake Hedman, 
  * The VSCP Project <info@grodansparadis.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -47,7 +47,7 @@
             !!!!!!!!!!!!!!!!!!!!  W A R N I N G  !!!!!!!!!!!!!!!!!!!!
                            This file is auto-generated
                 see https://github.com/grodansparadis/vscp-classes
-                        Generated: 2021-10-06 18:25:21.030489
+                        Generated: 2024-12-12 17:07:55.637062
 */
 
 #ifndef VSCP_CLASS_H
@@ -151,6 +151,7 @@
 #define VSCP_CLASS2_HLO                      1028      /* Level II High Level Object */
 #define VSCP_CLASS2_CUSTOM                   1029      /* Level II Custom */
 #define VSCP_CLASS2_DISPLAY                  1030      /* Level II Display */
+#define VSCP_CLASS2_SECURITY                 1034      /* Level II Security */
 #define VSCP_CLASS2_MEASUREMENT_STR          1040      /* Level II Measurement string */
 #define VSCP_CLASS2_MEASUREMENT_FLOAT        1060      /* Level II Measurement float */
 #define VSCP_CLASS2_VSCPD                    65535     /* Level II VSCP Daemon internal events */

diff --git a/common/vscphelper/vscp_type.h → common/vscphelper/vscp-type.h b/common/vscphelper/vscp_type.h → common/vscphelper/vscp-type.h
@@ -16,7 +16,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2000-2021 Ake Hedman, The VSCP Project <info@grodansparadis.com>
+ * Copyright (C) 2000-2022 Ake Hedman, The VSCP Project <info@grodansparadis.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -48,7 +48,7 @@
             !!!!!!!!!!!!!!!!!!!!  W A R N I N G  !!!!!!!!!!!!!!!!!!!!
                            This file is auto-generated
                 see https://github.com/grodansparadis/vscp-classes
-                        Generated: 2021-10-06 18:25:21.608236
+                        Generated: 2024-12-12 17:07:56.200428
 */
 
 #ifndef VSCP_TYPE_H
@@ -101,8 +101,11 @@
 #define VSCP_TYPE_PROTOCOL_GET_EVENT_INTEREST_RESPONSE 41 /* Get event interest response. */
 #define VSCP_TYPE_PROTOCOL_ACTIVATE_NEW_IMAGE_ACK   48  /* Activate new image ACK. */
 #define VSCP_TYPE_PROTOCOL_ACTIVATE_NEW_IMAGE_NACK  49  /* Activate new image NACK. */
-#define VSCP_TYPE_PROTOCOL_START_BLOCK_ACK          50  /* Block data transfer ACK. */
-#define VSCP_TYPE_PROTOCOL_START_BLOCK_NACK         51  /* Block data transfer NACK. */
+#define VSCP_TYPE_PROTOCOL_START_BLOCK_ACK          50  /* Start Block ACK. */
+#define VSCP_TYPE_PROTOCOL_START_BLOCK_NACK         51  /* Start Block NACK. */
+#define VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_ACK          52  /* Block Data Chunk ACK. */
+#define VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_NACK         53  /* Block Data Chunk NACK. */
+#define VSCP_TYPE_PROTOCOL_BOOT_LOADER_CHECK        54  /* Bootloader CHECK. */
 
 /*  CLASS1.ALARM = 1  -  Alarm functionality */
 #define VSCP_TYPE_ALARM_GENERAL                     0   /* General event */
@@ -595,8 +598,8 @@
 #define VSCP_TYPE_DISPLAY_SHOW_DISPLAY_BUFFER       5   /* Show Display Buffer */
 #define VSCP_TYPE_DISPLAY_SET_DISPLAY_BUFFER_PARAM  6   /* Set Display Buffer Parameter */
 #define VSCP_TYPE_DISPLAY_SHOW_TEXT                 32  /* Show Text */
-#define VSCP_TYPE_DISPLAY_SHOW_LED                  48  /* Set LED */
-#define VSCP_TYPE_DISPLAY_SHOW_LED_COLOR            49  /* Set RGB Color */
+#define VSCP_TYPE_DISPLAY_SET_LED                   48  /* Set LED */
+#define VSCP_TYPE_DISPLAY_SET_COLOR                 49  /* Set RGB Color */
 
 /*  CLASS1.IR = 110  -  IR Remote I/f */
 #define VSCP_TYPE_REMOTE_GENERAL                    0   /* General event */
@@ -916,6 +919,11 @@
 #define VSCP2_TYPE_PROTOCOL_READ_WRITE_RESPONSE     3   /* Read Write Response */
 #define VSCP2_TYPE_PROTOCOL_HIGH_END_SERVER_CAPS    20  /* High end server/service capabilities */
 #define VSCP2_TYPE_PROTOCOL_WHO_IS_THERE_RESPONSE   32  /* Level II who is there response */
+#define VSCP2_TYPE_PROTOCOL_GET_MATRIX_INFO_RESPONSE 34 /* Level II get DM info response */
+#define VSCP2_TYPE_PROTOCOL_GET_EMBEDDED_MDF_RESPONSE 36 /* Level II get embedded MDF response */
+#define VSCP2_TYPE_PROTOCOL_GET_EVENT_INTEREST_RESPONSE 41 /* Level II events of interest response */
+#define VSCP2_TYPE_PROTOCOL_READ_REGISTER_DIRECT    43  /* Read a Level II register from the 32-bit register space direct */
+#define VSCP2_TYPE_PROTOCOL_WRITE_REGISTER_DIRECT   44  /* Write a Level II register to the 32-bit register space direct */
 
 /*  CLASS2.CONTROL = 1025  -  Level II Control */
 #define VSCP2_TYPE_CONTROL_GENERAL                  0   /* General event */
@@ -942,6 +950,10 @@
 /*  CLASS2.DISPLAY = 1030  -  Level II Display */
 #define VSCP2_TYPE_DISPLAY_GENERAL                  0   /* General event */
 
+/*  CLASS2.SECURITY = 1034  -  Level II Security */
+#define VSCP2_TYPE_SECURITY_GENERAL                 0   /* General event */
+#define VSCP2_TYPE_SECURITY_SETKEY                  1   /* Set key */
+
 /*  CLASS2.MEASUREMENT_STR = 1040  -  Level II Measurement string */
 /* 	Event types is the same as  CLASS1.MEASUREMENT = 10  -  Measurement */
+7 −0		CHANGELOG.md
+1 −1		LICENSE
+1 −1		src/crc16ccitt.c
+1 −1		src/crc16ccitt.h
+56 −67		src/vscp_bootloader.c
+1 −1		src/vscp_bootloader.h
+1 −1		templates/vscp_bl_adapter.c
+1 −1		templates/vscp_bl_adapter.h
+1 −1		templates/vscp_platform.h
+1 −1		templates/vscp_tp_adapter.c
+1 −1		templates/vscp_tp_adapter.h