Skip to content

Update to VSCP framework v2.1.0 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.1.0

- Update to VSCP framework v2.1.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.1.0) there.

## 2.0.4

- Fixed problem with backslashes in include paths.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/Generic/Generic.ino
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion examples/LampAndButtonTest/LampAndButtonTest.ino
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vscp-arduino",
"version": "2.0.4",
"version": "2.1.0",
"keywords": "vscp, arduino-library, vscp-arduino, automation, home automation",
"description": "Very Simple Control Procotol (VSCP) Level 1 Library for the arduino IDE.",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=VSCP
version=2.0.4
version=2.1.0
author=Andreas Merkle
maintainer=Andreas Merkle <vscp@blue-andi.de>
sentence=Very Simple Control Protocol L1 framework for all Arduino boards.
Expand Down
2 changes: 1 addition & 1 deletion mdf_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

Expand Down
2 changes: 1 addition & 1 deletion src/DigInDebounce.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/SwTimer.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/VSCP.cpp
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/VSCP.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_class_l1.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_class_l1_l2.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_config.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_config_base.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
14 changes: 13 additions & 1 deletion src/framework/core/vscp_core.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -1551,6 +1551,18 @@ static inline void vscp_core_handleProtocolClassType(void)
/* Boot loader specific event. Not supported. */
break;

case VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_ACK:
/* Boot loader specific event. Not supported. */
break;

case VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_NACK:
/* Boot loader specific event. Not supported. */
break;

case VSCP_TYPE_PROTOCOL_BOOT_LOADER_CHECK:
/* Boot loader specific event. Not supported. */
break;

/* Not handled type */
default:
break;
Expand Down
10 changes: 5 additions & 5 deletions src/framework/core/vscp_core.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -93,16 +93,16 @@ extern "C"
#define VSCP_CORE_VERSION_MAJOR (1)

/** VSCP specification minor version number, the framework is compliant to. */
#define VSCP_CORE_VERSION_MINOR (13)
#define VSCP_CORE_VERSION_MINOR (15)

/** VSCP specification sub-minor version number, the framework is compliant to. */
#define VSCP_CORE_VERSION_SUB_MINOR (1)
#define VSCP_CORE_VERSION_SUB_MINOR (9)

/** VSCP specification version string, the framework is compliant to. */
#define VSCP_CORE_VERSION_STR "v1.13.1"
#define VSCP_CORE_VERSION_STR "v1.15.9"

/** VSCP framework version string */
#define VSCP_CORE_FRAMEWORK_VERSION "v2.0.3"
#define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0"

/*******************************************************************************
MACROS
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_data_coding.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_data_coding.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dev_data.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dev_data.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dev_data_config.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dm.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dm.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dm_ng.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_dm_ng.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_logger.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_logger.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_ps.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_ps.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_transport.c
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_transport.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_alarm.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_aol.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_configuration.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_control.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_data.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_diagnostic.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
8 changes: 4 additions & 4 deletions src/framework/core/vscp_type_display.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -116,12 +116,12 @@ extern "C"
/**
* This event contains information that should be displayed on LED(s) pointed out by zone/sub-zone.
*/
#define VSCP_TYPE_DISPLAY_SHOW_LED 48
#define VSCP_TYPE_DISPLAY_SET_LED 48

/**
* This event set the color for LED(s) pointed out by zone/sub-zone.
* This event set the color for LED(s) (or similar device) pointed out by zone/sub-zone.
*/
#define VSCP_TYPE_DISPLAY_SHOW_LED_COLOR 49
#define VSCP_TYPE_DISPLAY_SET_COLOR 49

/*******************************************************************************
MACROS
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_error.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion src/framework/core/vscp_type_gnss.h
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down
Loading
Loading