Skip to content

Commit 9ec7754

Browse files
BlueAndiBlueAndi
committed
Update to VSCP framework v0.8.0, including folder structure change.
1 parent f0cddfe commit 9ec7754

Some content is hidden

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

55 files changed

+60
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions

‎src/VSCP.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
INCLUDES
4242
*******************************************************************************/
4343
#include "VSCP.h"
44-
#include "framework/vscp_core.h"
45-
#include "framework/vscp_portable.h"
46-
#include "framework/vscp_timer.h"
47-
#include "framework/vscp_dev_data.h"
48-
#include "framework/vscp_tp_adapter.h"
49-
#include "framework/vscp_action.h"
44+
#include "framework/core/vscp_core.h"
45+
#include "framework/user/vscp_portable.h"
46+
#include "framework/user/vscp_timer.h"
47+
#include "framework/core/vscp_dev_data.h"
48+
#include "framework/user/vscp_tp_adapter.h"
49+
#include "framework/user/vscp_action.h"
5050

5151
/*******************************************************************************
5252
COMPILER SWITCHES

‎src/VSCP.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,23 @@ This module provides a C++ wrapper for the VSCP framework.
6060

6161
#include "DigInDebounce.h"
6262
#include "SwTimer.h"
63-
#include "framework/vscp_platform.h"
64-
#include "framework/vscp_types.h"
63+
#include "framework/user/vscp_platform.h"
64+
#include "framework/core/vscp_types.h"
6565

66-
#include "framework/vscp_class_l1.h"
67-
#include "framework/vscp_class_l1_l2.h"
68-
#include "framework/vscp_type_alarm.h"
69-
#include "framework/vscp_type_control.h"
70-
#include "framework/vscp_type_display.h"
71-
#include "framework/vscp_type_information.h"
72-
#include "framework/vscp_type_log.h"
73-
#include "framework/vscp_type_measurement.h"
74-
#include "framework/vscp_type_measurezone.h"
75-
#include "framework/vscp_type_phone.h"
76-
#include "framework/vscp_type_remote.h"
77-
#include "framework/vscp_type_security.h"
78-
#include "framework/vscp_type_weather.h"
79-
#include "framework/vscp_type_weather_forecast.h"
66+
#include "framework/core/vscp_class_l1.h"
67+
#include "framework/core/vscp_class_l1_l2.h"
68+
#include "framework/core/vscp_type_alarm.h"
69+
#include "framework/core/vscp_type_control.h"
70+
#include "framework/core/vscp_type_display.h"
71+
#include "framework/core/vscp_type_information.h"
72+
#include "framework/core/vscp_type_log.h"
73+
#include "framework/core/vscp_type_measurement.h"
74+
#include "framework/core/vscp_type_measurezone.h"
75+
#include "framework/core/vscp_type_phone.h"
76+
#include "framework/core/vscp_type_remote.h"
77+
#include "framework/core/vscp_type_security.h"
78+
#include "framework/core/vscp_type_weather.h"
79+
#include "framework/core/vscp_type_weather_forecast.h"
8080

8181
#ifdef __cplusplus
8282
extern "C"

src/framework/vscp_class_l1.h renamed to src/framework/core/vscp_class_l1.h

File renamed without changes.

src/framework/vscp_class_l1_l2.h renamed to src/framework/core/vscp_class_l1_l2.h

File renamed without changes.

src/framework/vscp_config.h renamed to src/framework/core/vscp_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ for VSCP core and decision matrix.
5858
INCLUDES
5959
*******************************************************************************/
6060
#include "vscp_config_base.h"
61-
#include "vscp_config_overwrite.h"
61+
#include "../user/vscp_config_overwrite.h"
6262
#include <stdint.h>
6363

6464
#ifdef __cplusplus

src/framework/vscp_config_base.h renamed to src/framework/core/vscp_config_base.h

File renamed without changes.

src/framework/vscp_core.c renamed to src/framework/core/vscp_core.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@
4242
*******************************************************************************/
4343
#include "vscp_core.h"
4444
#include "vscp_dev_data.h"
45-
#include "vscp_portable.h"
45+
#include "../user/vscp_portable.h"
4646
#include "vscp_transport.h"
4747
#include "vscp_class_l1.h"
4848
#include "vscp_type_protocol.h"
4949
#include "vscp_type_information.h"
50-
#include "vscp_information.h"
50+
#include "../events/vscp_information.h"
5151
#include "vscp_ps.h"
52-
#include "vscp_timer.h"
53-
#include "vscp_app_reg.h"
52+
#include "../user/vscp_timer.h"
53+
#include "../user/vscp_app_reg.h"
5454
#include "vscp_dm.h"
5555
#include "vscp_dm_ng.h"
5656
#include "vscp_util.h"
57-
#include "vscp_action.h"
57+
#include "../user/vscp_action.h"
5858
#include "vscp_logger.h"
5959

6060
/*******************************************************************************

src/framework/vscp_core.h renamed to src/framework/core/vscp_core.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ extern "C"
9999
#define VSCP_CORE_VERSION_SUB_MINOR (8)
100100

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

104104
/** VSCP framework version string */
105-
#define VSCP_CORE_FRAMEWORK_VERSION "v0.7.0"
105+
#define VSCP_CORE_FRAMEWORK_VERSION "v0.8.0"
106106

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

src/framework/vscp_data_coding.c renamed to src/framework/core/vscp_data_coding.c

File renamed without changes.

0 commit comments

Comments
 (0)