Skip to content

Commit 07bf3a7

Browse files
committed
Update to vscp-framework v0.7.0
1 parent a876606 commit 07bf3a7

27 files changed

+412
-111
lines changed

CHANGELOG.md

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

37
- The VSCP framework returned the wrong number of used pages.

VSCP/src/framework/vscp_action.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ and next generation) actions.
5959
/*******************************************************************************
6060
INCLUDES
6161
*******************************************************************************/
62-
#include <inttypes.h>
62+
#include <stdint.h>
6363
#include "vscp_config.h"
6464
#include "vscp_types.h"
6565

VSCP/src/framework/vscp_app_reg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ This module contains the access to the application specific registers.
5252
/*******************************************************************************
5353
INCLUDES
5454
*******************************************************************************/
55-
#include <inttypes.h>
55+
#include <stdint.h>
5656

5757
#ifdef __cplusplus
5858
extern "C"

VSCP/src/framework/vscp_config.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,35 @@ extern "C"
195195

196196
#endif /* Undefined VSCP_CONFIG_ENABLE_LOOPBACK */
197197

198+
#ifndef VSCP_CONFIG_ENABLE_SEGMENT_TIME_CALLOUT
199+
200+
/** Enable a time update callout for every received segment master heartbeat,
201+
* in case the event contains a new time since epoch.
202+
*/
203+
#define VSCP_CONFIG_ENABLE_SEGMENT_TIME_CALLOUT VSCP_CONFIG_BASE_DISABLED
204+
205+
#endif /* Undefined VSCP_CONFIG_ENABLE_SEGMENT_TIME_CALLOUT */
206+
207+
#if VSCP_CONFIG_BASE_IS_ENABLED( VSCP_CONFIG_ENABLE_SEGMENT_TIME_CALLOUT )
208+
#if VSCP_CONFIG_BASE_IS_DISABLED( VSCP_CONFIG_HEARTBEAT_SUPPORT_SEGMENT )
209+
#error If the segment time callout is enabled, the segment heartbeat must be enabled too.
210+
#endif /* VSCP_CONFIG_BASE_IS_DISABLED( VSCP_CONFIG_HEARTBEAT_SUPPORT_SEGMENT ) */
211+
#endif /* VSCP_CONFIG_BASE_IS_ENABLED( VSCP_CONFIG_ENABLE_SEGMENT_TIME_CALLOUT ) */
212+
213+
#ifndef VSCP_CONFIG_PROTOCOL_EVENT_NOTIFICATION
214+
215+
/**
216+
* Usually the core handles all protocol class events and they are not
217+
* forwarded to the application. Enable this to forward the events as well.
218+
* If application handles the event, the core won't handle it.
219+
*
220+
* Attention: Handling events which the core is waiting for can cause bad
221+
* behaviour.
222+
*/
223+
#define VSCP_CONFIG_PROTOCOL_EVENT_NOTIFICATION VSCP_CONFIG_BASE_DISABLED
224+
225+
#endif /* Undefined VSCP_CONFIG_PROTOCOL_EVENT_NOTIFICATION */
226+
198227
/*******************************************************************************
199228
CONSTANTS
200229
*******************************************************************************/

VSCP/src/framework/vscp_config_overwrite.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ extern "C"
9494
9595
#define VSCP_CONFIG_ENABLE_LOOPBACK VSCP_CONFIG_BASE_DISABLED
9696
97+
#define VSCP_CONFIG_ENABLE_SEGMENT_TIME_CALLOUT VSCP_CONFIG_BASE_DISABLED
98+
99+
#define VSCP_CONFIG_PROTOCOL_EVENT_NOTIFICATION VSCP_CONFIG_BASE_DISABLED
100+
97101
*/
98102

99103
/*******************************************************************************
@@ -118,6 +122,8 @@ extern "C"
118122
119123
#define VSCP_CONFIG_DM_ROWS 10
120124
125+
#define VSCP_CONFIG_DM_NG_PAGE 2
126+
121127
#define VSCP_CONFIG_DM_NG_RULE_SET_SIZE 80
122128
123129
#define VSCP_CONFIG_LOOPBACK_STORAGE_NUM 4

0 commit comments

Comments
 (0)