Skip to content

Commit 43763d9

Browse files
committed
Updated to VSCP framework v0.3.0
1 parent b6630eb commit 43763d9

File tree

9 files changed

+160
-111
lines changed

9 files changed

+160
-111
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
## 0.2.0 (unreleased)
1+
## 0.2.0
2+
3+
Updated to VSCP framework v0.3.0, please see the ![changelog](https://github.com/BlueAndi/vscp-framework/blob/v0.3.0/README.md) there.
24

35
## 0.1.0
46

VSCP/src/framework/vscp_class_l1_l2.h

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,73 +80,73 @@ extern "C"
8080
#define VSCP_CLASS_L1_L2_BASE 512
8181

8282
/** VSCP level 1 class over level 2: VSCP protocol functionality */
83-
#define VSCP_CLASS_L1_PROTOCOL (VSCP_CLASS_L1_L2_BASE + 0)
83+
#define VSCP_CLASS_L1_L2_PROTOCOL (VSCP_CLASS_L1_L2_BASE + 0)
8484

8585
/** VSCP level 1 class over level 2: Alarm */
86-
#define VSCP_CLASS_L1_ALARM (VSCP_CLASS_L1_L2_BASE + 1)
86+
#define VSCP_CLASS_L1_L2_ALARM (VSCP_CLASS_L1_L2_BASE + 1)
8787

8888
/** VSCP level 1 class over level 2: Security */
89-
#define VSCP_CLASS_L1_SECURITY (VSCP_CLASS_L1_L2_BASE + 2)
89+
#define VSCP_CLASS_L1_L2_SECURITY (VSCP_CLASS_L1_L2_BASE + 2)
9090

9191
/** VSCP level 1 class over level 2: Measurement */
92-
#define VSCP_CLASS_L1_MEASUREMENT (VSCP_CLASS_L1_L2_BASE + 10)
92+
#define VSCP_CLASS_L1_L2_MEASUREMENT (VSCP_CLASS_L1_L2_BASE + 10)
9393

9494
/** VSCP level 1 class over level 2: Data */
95-
#define VSCP_CLASS_L1_DATA (VSCP_CLASS_L1_L2_BASE + 15)
95+
#define VSCP_CLASS_L1_L2_DATA (VSCP_CLASS_L1_L2_BASE + 15)
9696

9797
/** VSCP level 1 class over level 2: Information */
98-
#define VSCP_CLASS_L1_INFORMATION (VSCP_CLASS_L1_L2_BASE + 20)
98+
#define VSCP_CLASS_L1_L2_INFORMATION (VSCP_CLASS_L1_L2_BASE + 20)
9999

100100
/** VSCP level 1 class over level 2: Control */
101-
#define VSCP_CLASS_L1_CONTROL (VSCP_CLASS_L1_L2_BASE + 30)
101+
#define VSCP_CLASS_L1_L2_CONTROL (VSCP_CLASS_L1_L2_BASE + 30)
102102

103103
/** VSCP level 1 class over level 2: Multimedia */
104-
#define VSCP_CLASS_L1_MULTIMEDIA (VSCP_CLASS_L1_L2_BASE + 40)
104+
#define VSCP_CLASS_L1_L2_MULTIMEDIA (VSCP_CLASS_L1_L2_BASE + 40)
105105

106106
/** VSCP level 1 class over level 2: Alert on LAN */
107-
#define VSCP_CLASS_L1_ALERT_ON_LAN (VSCP_CLASS_L1_L2_BASE + 50)
107+
#define VSCP_CLASS_L1_L2_ALERT_ON_LAN (VSCP_CLASS_L1_L2_BASE + 50)
108108

109109
/** VSCP level 1 class over level 2: Double precision floating point measurement */
110-
#define VSCP_CLASS_L1_MEASUREMENT_DOUBLE (VSCP_CLASS_L1_L2_BASE + 60)
110+
#define VSCP_CLASS_L1_L2_MEASUREMENT_DOUBLE (VSCP_CLASS_L1_L2_BASE + 60)
111111

112112
/** VSCP level 1 class over level 2: Measurement with zone */
113-
#define VSCP_CLASS_L1_MEASUREZONE (VSCP_CLASS_L1_L2_BASE + 65)
113+
#define VSCP_CLASS_L1_L2_MEASUREZONE (VSCP_CLASS_L1_L2_BASE + 65)
114114

115115
/** VSCP level 1 class over level 2: Single precision floating piont measurement */
116-
#define VSCP_CLASS_L1_MEASUREMENT_SINGLE (VSCP_CLASS_L1_L2_BASE + 70)
116+
#define VSCP_CLASS_L1_L2_MEASUREMENT_SINGLE (VSCP_CLASS_L1_L2_BASE + 70)
117117

118118
/** VSCP level 1 class over level 2: Set value with zone */
119-
#define VSCP_CLASS_L1_SET_VALUE_WITH_ZONE (VSCP_CLASS_L1_L2_BASE + 85)
119+
#define VSCP_CLASS_L1_L2_SET_VALUE_WITH_ZONE (VSCP_CLASS_L1_L2_BASE + 85)
120120

121121
/** VSCP level 1 class over level 2: Weather */
122-
#define VSCP_CLASS_L1_WEATHER (VSCP_CLASS_L1_L2_BASE + 90)
122+
#define VSCP_CLASS_L1_L2_WEATHER (VSCP_CLASS_L1_L2_BASE + 90)
123123

124124
/** VSCP level 1 class over level 2: Weather forecast */
125-
#define VSCP_CLASS_L1_WEATHER_FORECAST (VSCP_CLASS_L1_L2_BASE + 95)
125+
#define VSCP_CLASS_L1_L2_WEATHER_FORECAST (VSCP_CLASS_L1_L2_BASE + 95)
126126

127127
/** VSCP level 1 class over level 2: Phone */
128-
#define VSCP_CLASS_L1_PHONE (VSCP_CLASS_L1_L2_BASE + 100)
128+
#define VSCP_CLASS_L1_L2_PHONE (VSCP_CLASS_L1_L2_BASE + 100)
129129

130130
/** VSCP level 1 class over level 2: Display */
131-
#define VSCP_CLASS_L1_DISPLAY (VSCP_CLASS_L1_L2_BASE + 102)
131+
#define VSCP_CLASS_L1_L2_DISPLAY (VSCP_CLASS_L1_L2_BASE + 102)
132132

133133
/** VSCP level 1 class over level 2: IR Remote i/f */
134-
#define VSCP_CLASS_L1_REMOTE (VSCP_CLASS_L1_L2_BASE + 110)
134+
#define VSCP_CLASS_L1_L2_REMOTE (VSCP_CLASS_L1_L2_BASE + 110)
135135

136136
/** VSCP level 1 class over level 2: Positon (GPS) */
137-
#define VSCP_CLASS_L1_GPS (VSCP_CLASS_L1_L2_BASE + 206)
137+
#define VSCP_CLASS_L1_L2_GPS (VSCP_CLASS_L1_L2_BASE + 206)
138138

139139
/** VSCP level 1 class over level 2: Wireless */
140-
#define VSCP_CLASS_L1_WIRELESS (VSCP_CLASS_L1_L2_BASE + 212)
140+
#define VSCP_CLASS_L1_L2_WIRELESS (VSCP_CLASS_L1_L2_BASE + 212)
141141

142142
/** VSCP level 1 class over level 2: Logging i/f */
143-
#define VSCP_CLASS_L1_LOG (VSCP_CLASS_L1_L2_BASE + 509)
143+
#define VSCP_CLASS_L1_L2_LOG (VSCP_CLASS_L1_L2_BASE + 509)
144144

145145
/** VSCP level 1 class over level 2: Laboratory use */
146-
#define VSCP_CLASS_L1_LABORATORY (VSCP_CLASS_L1_L2_BASE + 510)
146+
#define VSCP_CLASS_L1_L2_LABORATORY (VSCP_CLASS_L1_L2_BASE + 510)
147147

148148
/** VSCP level 1 class over level 2: Local use */
149-
#define VSCP_CLASS_L1_LOCAL (VSCP_CLASS_L1_L2_BASE + 511)
149+
#define VSCP_CLASS_L1_L2_LOCAL (VSCP_CLASS_L1_L2_BASE + 511)
150150

151151
/*******************************************************************************
152152
MACROS

VSCP/src/framework/vscp_config.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,21 @@ extern "C"
7474
COMPILER SWITCHES
7575
*******************************************************************************/
7676

77+
#ifndef VSCP_CONFIG_SILENT_NODE
78+
79+
/** Silent node configuration, which is used for e. g. RS-485 connections.
80+
* This type of nodes only listen to traffic before they get initialized
81+
* by a host. In this case the nickname discovery process is not started
82+
* for a node when it is powered up for the first time.
83+
* This type on node instead starts to listen for the
84+
* CLASS1.PROTOCOL, Type=23 (GUID drop nickname-ID / reset device.) event.
85+
* When this series of events is received and the GUID is the same as for
86+
* the module the module starts the nickname discovery procedure as of above.
87+
*/
88+
#define VSCP_CONFIG_SILENT_NODE VSCP_CONFIG_BASE_DISABLED
89+
90+
#endif /* VSCP_CONFIG_SILENT_NODE */
91+
7792
#ifndef VSCP_CONFIG_HARD_CODED_NODE
7893

7994
/** Hard-coded node (fixed nickname id)
@@ -182,7 +197,7 @@ extern "C"
182197
#ifndef VSCP_CONFIG_NODE_SEGMENT_INIT_TIMEOUT
183198

184199
/** Timeout in ms for the node segment initialization.
185-
* See VSCP v1.10.12, chapter 3.2.1, step 2
200+
* See VSCP v1.10.15, chapter VSCP Level I Specifics, Node segment initialization. Dynamic nodes, Step 2
186201
*/
187202
#define VSCP_CONFIG_NODE_SEGMENT_INIT_TIMEOUT ((uint16_t)5000)
188203

VSCP/src/framework/vscp_config_overwrite.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ extern "C"
7272
/* ---------- Define here your preferred configuration setup. ---------- */
7373

7474
/*
75+
#define VSCP_CONFIG_SILENT_NODE VSCP_CONFIG_BASE_DISABLED
76+
7577
#define VSCP_CONFIG_HARD_CODED_NODE VSCP_CONFIG_BASE_DISABLED
7678
7779
#define VSCP_CONFIG_HEARTBEAT_SUPPORT_SEGMENT VSCP_CONFIG_BASE_DISABLED

0 commit comments

Comments
 (0)