Skip to content

Commit c8257ce

Browse files
BlueAndiBlueAndi
authored
Merge pull request #14 from BlueAndi/feature/new_boot_loader_events
Update to VSCP framework v2.1.0
2 parents a197137 + b79bc88 commit c8257ce

File tree

125 files changed

+828
-754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+828
-754
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 - 2024 Andreas Merkle
3+
Copyright (c) 2014 - 2025 Andreas Merkle
44
http://www.blue-andi.de
55
vscp@blue-andi.de
66

‎examples/Generic/Generic.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024, Andreas Merkle
3+
* Copyright (c) 2014 - 2025, Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎examples/LampAndButtonTest/LampAndButtonTest.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024, Andreas Merkle
3+
* Copyright (c) 2014 - 2025, Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎examples/Seeed-Studio-CAN_BUS_Shield/Seeed-Studio-CAN_BUS_Shield.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024, Andreas Merkle
3+
* Copyright (c) 2014 - 2025, Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎examples/Sparkfun_CAN-BUS_Shield/Sparkfun_CAN-BUS_Shield.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024, Andreas Merkle
3+
* Copyright (c) 2014 - 2025, Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vscp-arduino",
3-
"version": "2.0.4",
3+
"version": "2.1.0",
44
"keywords": "vscp, arduino-library, vscp-arduino, automation, home automation",
55
"description": "Very Simple Control Procotol (VSCP) Level 1 Library for the arduino IDE.",
66
"repository": {

‎library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=VSCP
2-
version=2.0.4
2+
version=2.1.0
33
author=Andreas Merkle
44
maintainer=Andreas Merkle <vscp@blue-andi.de>
55
sentence=Very Simple Control Protocol L1 framework for all Arduino boards.

‎mdf_template.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
The MIT License (MIT)
66
7-
Copyright (c) 2014 - 2024 Andreas Merkle
7+
Copyright (c) 2014 - 2025 Andreas Merkle
88
http://www.blue-andi.de
99
vscp@blue-andi.de
1010

‎src/DigInDebounce.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/SwTimer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/VSCP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024, Andreas Merkle
3+
* Copyright (c) 2014 - 2025, Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/VSCP.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_class_l1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_class_l1_l2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_config_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_core.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*
@@ -1551,6 +1551,18 @@ static inline void vscp_core_handleProtocolClassType(void)
15511551
/* Boot loader specific event. Not supported. */
15521552
break;
15531553

1554+
case VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_ACK:
1555+
/* Boot loader specific event. Not supported. */
1556+
break;
1557+
1558+
case VSCP_TYPE_PROTOCOL_BLOCK_CHUNK_NACK:
1559+
/* Boot loader specific event. Not supported. */
1560+
break;
1561+
1562+
case VSCP_TYPE_PROTOCOL_BOOT_LOADER_CHECK:
1563+
/* Boot loader specific event. Not supported. */
1564+
break;
1565+
15541566
/* Not handled type */
15551567
default:
15561568
break;

‎src/framework/core/vscp_core.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*
@@ -93,16 +93,16 @@ extern "C"
9393
#define VSCP_CORE_VERSION_MAJOR (1)
9494

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

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

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

104104
/** VSCP framework version string */
105-
#define VSCP_CORE_FRAMEWORK_VERSION "v2.0.3"
105+
#define VSCP_CORE_FRAMEWORK_VERSION "v2.1.0"
106106

107107
/*******************************************************************************
108108
MACROS

‎src/framework/core/vscp_data_coding.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_data_coding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dev_data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dev_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dev_data_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dm_ng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_dm_ng.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_logger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_logger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_ps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_ps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_transport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_transport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_alarm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_aol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_control.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_diagnostic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_display.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*
@@ -116,12 +116,12 @@ extern "C"
116116
/**
117117
* This event contains information that should be displayed on LED(s) pointed out by zone/sub-zone.
118118
*/
119-
#define VSCP_TYPE_DISPLAY_SHOW_LED 48
119+
#define VSCP_TYPE_DISPLAY_SET_LED 48
120120

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

126126
/*******************************************************************************
127127
MACROS

‎src/framework/core/vscp_type_error.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

‎src/framework/core/vscp_type_gnss.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* The MIT License (MIT)
22
*
3-
* Copyright (c) 2014 - 2024 Andreas Merkle
3+
* Copyright (c) 2014 - 2025 Andreas Merkle
44
* http://www.blue-andi.de
55
* vscp@blue-andi.de
66
*

0 commit comments

Comments
 (0)