Skip to content

Commit 9b29860

Browse files
committed
Updated to vscp-framework v2.2.0
1 parent 08b2c5e commit 9b29860

31 files changed

+2328
-2157
lines changed

CHANGELOG.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1+
## 2.2.0
2+
3+
- Update to VSCP framework v2.2.0, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.2.0) there.
4+
15
## 2.1.0
26

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

59
## 2.0.4
610

711
- Fixed problem with backslashes in include paths.
8-
- Fixed problem with wrong include path in vscp_evt_information.c module. Thanks to michpro!
12+
- Fixed problem with wrong include path in `vscp_evt_information.c` module. Thanks to michpro!
913
- Examples updated to be working with latest CAN libraries.
1014

1115
## 2.0.3
1216

1317
- Update to VSCP framework v2.0.3, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v2.0.3) there.
14-
- Deprecated "dataNum" replaced with "dataSize". Thanks to michpro!
18+
- Deprecated `dataNum` replaced with `dataSize`. Thanks to michpro!
1519

1620
## 2.0.2
1721

@@ -42,7 +46,7 @@
4246
- Update to VSCP framework v0.9.0, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v0.9.0) there.
4347
- The update includes the following bugfixes:
4448
- Bugfix: Fix of misspellings/typos, thanks to TomasRoj.
45-
- Bugfix: VSCP measurement events fixed, because internal the parameters unit and index in the vscp_data_coding_getFormatByte() call were reversed. Thanks to troky!
49+
- Bugfix: VSCP measurement events fixed, because internally the parameters `unit` and `index` in the `vscp_data_coding_getFormatByte()` call were reversed. Thanks to troky!
4650

4751
## 0.7.1
4852

@@ -53,11 +57,11 @@
5357

5458
- Update to VSCP framework v0.8.0, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v0.8.0) there.
5559
- Folder structure changed inside framework folder, in preparation for the abstract event modules.
56-
- Abstract event modules introduced, see framework/events.
60+
- Abstract event modules introduced, see `framework/events`.
5761

5862
## 0.6.1
5963

60-
- Folder structure changed, please see https://www.arduino.cc/en/Guide/Libraries#toc4 for easier installation.
64+
- Folder structure changed, please see [Arduino Library Guide](https://www.arduino.cc/en/Guide/Libraries#toc4) for easier installation.
6165

6266
## 0.6.0
6367

@@ -76,14 +80,14 @@
7680

7781
## 0.3.0
7882

79-
- DigInDebounce class for digital input debouncing implemented.
83+
- `DigInDebounce` class for digital input debouncing implemented.
8084
- Update to VSCP framework v0.4.0, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v0.4.0) there.
8185
- Status lamp and init button connection fixed.
8286

8387
## 0.2.0
8488

85-
Updated to VSCP framework v0.3.0, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v0.3.0) there.
89+
- Updated to VSCP framework v0.3.0, please see the [changelog](https://github.com/BlueAndi/vscp-framework/releases/tag/v0.3.0) there.
8690

8791
## 0.1.0
8892

89-
Base is the VSCP framework v0.2.2
93+
- Base is the VSCP framework v0.2.2

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.1.0",
3+
"version": "2.2.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.1.0
2+
version=2.2.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_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ extern "C"
102102
#define VSCP_CORE_VERSION_STR "v1.15.9"
103103

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

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

src/framework/core/vscp_type_control.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,22 +155,23 @@ extern "C"
155155
#define VSCP_TYPE_CONTROL_DEACTIVATE 16
156156

157157
/**
158-
* Reserved.
158+
* Turn off all devices identified by zone/subzone/index.
159159
*/
160-
#define VSCP_TYPE_CONTROL_RESERVED17 17
160+
#define VSCP_TYPE_CONTROL_TURN_ALL_OFF 17
161161

162162
/**
163-
* Reserved.
163+
* Turn on all devices identified by zone/subzone/index.
164164
*/
165-
#define VSCP_TYPE_CONTROL_RESERVED18 18
165+
#define VSCP_TYPE_CONTROL_TURN_ALL_ON 18
166166

167167
/**
168-
* Reserved.
168+
* Turn on/off all devices identified by zone/subzone/index.
169169
*/
170-
#define VSCP_TYPE_CONTROL_RESERVED19 19
170+
#define VSCP_TYPE_CONTROL_TURN_ALL_X 19
171171

172172
/**
173173
* Dim all dimmer devices on a segment to a specified dim value.
174+
* This is mainly constructed for dimming of lamps but is general for all dimmable devices.
174175
*/
175176
#define VSCP_TYPE_CONTROL_DIM_LAMPS 20
176177

src/framework/events/vscp_evt_alarm.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ extern BOOL vscp_evt_alarm_sendGeneralEvent(void)
9191
* Warning
9292
*
9393
* @param[in] onOff Alarm is on/off.
94-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
95-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
94+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
95+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
9696
*
9797
* @return If event is sent, it will return TRUE otherwise FALSE.
9898
*/
@@ -122,8 +122,8 @@ extern BOOL vscp_evt_alarm_sendWarning(uint8_t onOff, uint8_t zone, uint8_t subZ
122122
*
123123
* @param[in] alarmRegister Alarm byte from standard register 128/0x80 or a code of choice describing
124124
* the alarm.
125-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
126-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
125+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
126+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
127127
*
128128
* @return If event is sent, it will return TRUE otherwise FALSE.
129129
*/
@@ -152,8 +152,8 @@ extern BOOL vscp_evt_alarm_sendAlarmOccurred(uint8_t alarmRegister, uint8_t zone
152152
* Alarm sound on/off
153153
*
154154
* @param[in] onOff Alarm is on/off.
155-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
156-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
155+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
156+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
157157
*
158158
* @return If event is sent, it will return TRUE otherwise FALSE.
159159
*/
@@ -182,8 +182,8 @@ extern BOOL vscp_evt_alarm_sendAlarmSoundOnOff(uint8_t onOff, uint8_t zone, uint
182182
* Alarm light on/off
183183
*
184184
* @param[in] onOff Alarm is on/off.
185-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
186-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
185+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
186+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
187187
*
188188
* @return If event is sent, it will return TRUE otherwise FALSE.
189189
*/
@@ -212,8 +212,8 @@ extern BOOL vscp_evt_alarm_sendAlarmLightOnOff(uint8_t onOff, uint8_t zone, uint
212212
* Power on/off
213213
*
214214
* @param[in] onOff Alarm is on/off.
215-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
216-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
215+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
216+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
217217
*
218218
* @return If event is sent, it will return TRUE otherwise FALSE.
219219
*/
@@ -242,8 +242,8 @@ extern BOOL vscp_evt_alarm_sendPowerOnOff(uint8_t onOff, uint8_t zone, uint8_t s
242242
* Emergency Stop
243243
*
244244
* @param[in] onOff Alarm is on/off.
245-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
246-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
245+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
246+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
247247
*
248248
* @return If event is sent, it will return TRUE otherwise FALSE.
249249
*/
@@ -272,8 +272,8 @@ extern BOOL vscp_evt_alarm_sendEmergencyStop(uint8_t onOff, uint8_t zone, uint8_
272272
* Emergency Pause
273273
*
274274
* @param[in] onOff Alarm is on/off.
275-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
276-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
275+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
276+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
277277
*
278278
* @return If event is sent, it will return TRUE otherwise FALSE.
279279
*/
@@ -302,8 +302,8 @@ extern BOOL vscp_evt_alarm_sendEmergencyPause(uint8_t onOff, uint8_t zone, uint8
302302
* Emergency Reset
303303
*
304304
* @param[in] onOff Alarm is on/off.
305-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
306-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
305+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
306+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
307307
*
308308
* @return If event is sent, it will return TRUE otherwise FALSE.
309309
*/
@@ -332,8 +332,8 @@ extern BOOL vscp_evt_alarm_sendEmergencyReset(uint8_t onOff, uint8_t zone, uint8
332332
* Emergency Resume
333333
*
334334
* @param[in] onOff Alarm is on/off.
335-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
336-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
335+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
336+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
337337
*
338338
* @return If event is sent, it will return TRUE otherwise FALSE.
339339
*/
@@ -362,8 +362,8 @@ extern BOOL vscp_evt_alarm_sendEmergencyResume(uint8_t onOff, uint8_t zone, uint
362362
* Arm
363363
*
364364
* @param[in] onOff Alarm is on/off.
365-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
366-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
365+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
366+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
367367
*
368368
* @return If event is sent, it will return TRUE otherwise FALSE.
369369
*/
@@ -392,8 +392,8 @@ extern BOOL vscp_evt_alarm_sendArm(uint8_t onOff, uint8_t zone, uint8_t subZone)
392392
* Disarm
393393
*
394394
* @param[in] onOff Alarm is on/off.
395-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
396-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
395+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
396+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
397397
*
398398
* @return If event is sent, it will return TRUE otherwise FALSE.
399399
*/
@@ -422,8 +422,8 @@ extern BOOL vscp_evt_alarm_sendDisarm(uint8_t onOff, uint8_t zone, uint8_t subZo
422422
* Watchdog
423423
*
424424
* @param[in] index index.
425-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
426-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
425+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
426+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
427427
*
428428
* @return If event is sent, it will return TRUE otherwise FALSE.
429429
*/
@@ -453,8 +453,8 @@ extern BOOL vscp_evt_alarm_sendWatchdog(uint8_t index, uint8_t zone, uint8_t sub
453453
*
454454
* @param[in] alarmRegister Alarm byte from standard register 128/0x80 or a code of choice describing
455455
* the alarm.
456-
* @param[in] zone Zone for which event applies to (0-255). 255 is all zones.
457-
* @param[in] subZone Sub-zone for which event applies to (0-255). 255 is all sub-zones.
456+
* @param[in] zone Zone for which event applies to (0-254). 255 is all zones.
457+
* @param[in] subZone Sub-zone for which event applies to (0-254). 255 is all sub-zones.
458458
*
459459
* @return If event is sent, it will return TRUE otherwise FALSE.
460460
*/

0 commit comments

Comments
 (0)