Skip to content

Commit 22c0b27

Browse files
committed
Updated to VSCP framework v1.0.0
1 parent 5e98939 commit 22c0b27

File tree

96 files changed

+43413
-16417
lines changed

Some content is hidden

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

96 files changed

+43413
-16417
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.0
2+
3+
- Update to VSCP framework v1.0.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v1.0.0) there.
4+
15
## 0.8.0
26

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ More information can be found on the main site http://www.vscp.org
2525

2626
## Library
2727
This is a arduino library of the VSCP software framework for level 1 devices.
28-
It provides several layers according to the [VSCP specification](https://grodansparadis.gitbooks.io/the-vscp-specification/).
28+
It provides several layers according to the [VSCP specification](https://docs.vscp.org/spec/latest).
2929

3030
Recommended is to connect a LED, which shows the node state.
3131

library.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
{
22
"name": "vscp-arduino",
3-
"version": "0.8.0",
3+
"version": "1.0.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.",
6-
"repository":
7-
{
6+
"repository": {
87
"type": "git",
98
"url": "https://github.com/BlueAndi/vscp-arduino"
109
},
11-
"authors":
12-
[
13-
{
14-
"name": "Andreas Merkle",
15-
"email": "vscp@blue-andi.de",
16-
"maintainer": true
17-
}
18-
],
10+
"authors": [{
11+
"name": "Andreas Merkle",
12+
"email": "vscp@blue-andi.de",
13+
"maintainer": true
14+
}],
1915
"frameworks": "arduino",
2016
"platforms": "*"
21-
}
17+
}

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=0.8.0
2+
version=1.0.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.

src/framework/core/vscp_class_l1.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ extern "C"
9393
#define VSCP_CLASS_L1_MULTIMEDIA 40
9494

9595
/** VSCP level 1 class: Alert on LAN */
96-
#define VSCP_CLASS_L1_ALERT_ON_LAN 50
96+
#define VSCP_CLASS_L1_AOL 50
9797

9898
/** VSCP level 1 class: Double precision floating point measurement */
99-
#define VSCP_CLASS_L1_MEASUREMENT_DOUBLE 60
99+
#define VSCP_CLASS_L1_MEASUREMENT64 60
100100

101101
/** VSCP level 1 class: Measurement with zone */
102102
#define VSCP_CLASS_L1_MEASUREZONE 65
103103

104104
/** VSCP level 1 class: Single precision floating point measurement */
105-
#define VSCP_CLASS_L1_MEASUREMENT_SINGLE 70
105+
#define VSCP_CLASS_L1_MEASUREMENT32 70
106106

107107
/** VSCP level 1 class: Set value with zone */
108-
#define VSCP_CLASS_L1_SET_VALUE_WITH_ZONE 85
108+
#define VSCP_CLASS_L1_SETVALUEZONE 85
109109

110110
/** VSCP level 1 class: Weather */
111111
#define VSCP_CLASS_L1_WEATHER 90
@@ -120,10 +120,10 @@ extern "C"
120120
#define VSCP_CLASS_L1_DISPLAY 102
121121

122122
/** VSCP level 1 class: IR Remote i/f */
123-
#define VSCP_CLASS_L1_REMOTE 110
123+
#define VSCP_CLASS_L1_IR 110
124124

125125
/** VSCP level 1 class: Position (GPS) */
126-
#define VSCP_CLASS_L1_GPS 206
126+
#define VSCP_CLASS_L1_GNSS 206
127127

128128
/** VSCP level 1 class: Wireless */
129129
#define VSCP_CLASS_L1_WIRELESS 212

src/framework/core/vscp_class_l1_l2.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,19 @@ extern "C"
100100
#define VSCP_CLASS_L1_L2_MULTIMEDIA (VSCP_CLASS_L1_L2_BASE + 40)
101101

102102
/** VSCP level 1 class over level 2: Alert on LAN */
103-
#define VSCP_CLASS_L1_L2_ALERT_ON_LAN (VSCP_CLASS_L1_L2_BASE + 50)
103+
#define VSCP_CLASS_L1_L2_AOL (VSCP_CLASS_L1_L2_BASE + 50)
104104

105105
/** VSCP level 1 class over level 2: Double precision floating point measurement */
106-
#define VSCP_CLASS_L1_L2_MEASUREMENT_DOUBLE (VSCP_CLASS_L1_L2_BASE + 60)
106+
#define VSCP_CLASS_L1_L2_MEASUREMENT64 (VSCP_CLASS_L1_L2_BASE + 60)
107107

108108
/** VSCP level 1 class over level 2: Measurement with zone */
109109
#define VSCP_CLASS_L1_L2_MEASUREZONE (VSCP_CLASS_L1_L2_BASE + 65)
110110

111111
/** VSCP level 1 class over level 2: Single precision floating point measurement */
112-
#define VSCP_CLASS_L1_L2_MEASUREMENT_SINGLE (VSCP_CLASS_L1_L2_BASE + 70)
112+
#define VSCP_CLASS_L1_L2_MEASUREMENT32 (VSCP_CLASS_L1_L2_BASE + 70)
113113

114114
/** VSCP level 1 class over level 2: Set value with zone */
115-
#define VSCP_CLASS_L1_L2_SET_VALUE_WITH_ZONE (VSCP_CLASS_L1_L2_BASE + 85)
115+
#define VSCP_CLASS_L1_L2_SETVALUEZONE (VSCP_CLASS_L1_L2_BASE + 85)
116116

117117
/** VSCP level 1 class over level 2: Weather */
118118
#define VSCP_CLASS_L1_L2_WEATHER (VSCP_CLASS_L1_L2_BASE + 90)
@@ -127,10 +127,10 @@ extern "C"
127127
#define VSCP_CLASS_L1_L2_DISPLAY (VSCP_CLASS_L1_L2_BASE + 102)
128128

129129
/** VSCP level 1 class over level 2: IR Remote i/f */
130-
#define VSCP_CLASS_L1_L2_REMOTE (VSCP_CLASS_L1_L2_BASE + 110)
130+
#define VSCP_CLASS_L1_L2_IR (VSCP_CLASS_L1_L2_BASE + 110)
131131

132132
/** VSCP level 1 class over level 2: Position (GPS) */
133-
#define VSCP_CLASS_L1_L2_GPS (VSCP_CLASS_L1_L2_BASE + 206)
133+
#define VSCP_CLASS_L1_L2_GNSS (VSCP_CLASS_L1_L2_BASE + 206)
134134

135135
/** VSCP level 1 class over level 2: Wireless */
136136
#define VSCP_CLASS_L1_L2_WIRELESS (VSCP_CLASS_L1_L2_BASE + 212)

src/framework/core/vscp_config.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,13 @@ extern "C"
337337

338338
#endif /* VSCP_CONFIG_BASE_IS_ENABLED( VSCP_CONFIG_ENABLE_LOOPBACK ) */
339339

340+
#ifndef VSCP_CONFIG_START_NODE_PROBE_NICKNAME
341+
342+
/** Number to start probing nickname from. */
343+
#define VSCP_CONFIG_START_NODE_PROBE_NICKNAME 1
344+
345+
#endif /* Undefined VSCP_CONFIG_START_NODE_PROBE_NICKNAME */
346+
340347
/*******************************************************************************
341348
MACROS
342349
*******************************************************************************/

0 commit comments

Comments
 (0)