diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml index d1c289e10..e4dc16553 100644 --- a/nbproject/private/configurations.xml +++ b/nbproject/private/configurations.xml @@ -162,8 +162,6 @@ - - diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index a2a3ef75e..5a4ddf3b2 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -43,31 +43,6 @@ - - file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.h - file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/tcpipclientthread.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscprestserver.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpeventhelper.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmmain.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebsocketserver.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/daemon/linux/vscpd.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/webserver_websocket.h - file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/variablecodes.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/clientlist.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.h - file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/devicebootloaderwizard_images.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.h - + diff --git a/src/vscp/common/version.h b/src/vscp/common/version.h index 04d62645d..c01565e83 100644 --- a/src/vscp/common/version.h +++ b/src/vscp/common/version.h @@ -26,10 +26,10 @@ #define VSCPD_MAJOR_VERSION 1 #define VSCPD_MINOR_VERSION 12 -#define VSCPD_SUB_VERSION 3 -#define VSCPD_BUILD_VERSION 15 +#define VSCPD_SUB_VERSION 4 +#define VSCPD_BUILD_VERSION 0 -#define VSCPD_DISPLAY_VERSION "1.12.3.15 Magnesium" +#define VSCPD_DISPLAY_VERSION "1.12.4.0 Magnesium" #define VSCPD_COPYRIGHT "Copyright (C) 2000-2016, Grodans Paradis AB, http://www.paradiseofthefrog.com" #define VSCPD_COPYRIGHT_HTML "Copyright (C) 2000-2016, Paradise of the Frog, http://www.paradiseofthefrog.com" diff --git a/src/vscp/daemon/linux/codelite_vscpd/.codelite/codelite_vscpd.session b/src/vscp/daemon/linux/codelite_vscpd/.codelite/codelite_vscpd.session index 5879cb854..f2dba3038 100644 --- a/src/vscp/daemon/linux/codelite_vscpd/.codelite/codelite_vscpd.session +++ b/src/vscp/daemon/linux/codelite_vscpd/.codelite/codelite_vscpd.session @@ -1,6 +1,6 @@ - + @@ -171,6 +171,13 @@ + + + + + + + diff --git a/src/vscp/daemon/linux/codelite_vscpd/.codelite/refactoring.db b/src/vscp/daemon/linux/codelite_vscpd/.codelite/refactoring.db index cec06db58..5fa8e589f 100644 Binary files a/src/vscp/daemon/linux/codelite_vscpd/.codelite/refactoring.db and b/src/vscp/daemon/linux/codelite_vscpd/.codelite/refactoring.db differ diff --git a/src/vscp/daemon/linux/nbproject/configurations.xml b/src/vscp/daemon/linux/nbproject/configurations.xml index ccfb2d8e5..88304cbbc 100644 --- a/src/vscp/daemon/linux/nbproject/configurations.xml +++ b/src/vscp/daemon/linux/nbproject/configurations.xml @@ -486,6 +486,9 @@ MG_ENABLE_THREADS VSCP_ENABLE_LUA + VSCP_ENABLE_SQLITE3 + VSCP_ENABLE_SQLITE3 + VSCP_ENABLE_SQLITE3 WXUSINGDLL _FILE_OFFSET_BITS=64 __WXGTK__ @@ -495,6 +498,8 @@ MG_ENABLE_THREADS VSCP_ENABLE_LUA + VSCP_ENABLE_SQLITE3 + VSCP_ENABLE_SQLITE3 WXUSINGDLL _FILE_OFFSET_BITS=64 __WXGTK__ @@ -1293,39 +1298,6 @@ - - - - VSCP_ENABLE_SQLITE3 - - - - - - - VSCP_ENABLE_SQLITE3 - - - - - VSCP_ENABLE_SQLITE3 - - - - - - - VSCP_ENABLE_SQLITE3 - - - - - - - VSCP_ENABLE_SQLITE3 - - - diff --git a/src/vscp/daemon/linux/nbproject/private/private.xml b/src/vscp/daemon/linux/nbproject/private/private.xml index 3b21b9596..31fe89144 100644 --- a/src/vscp/daemon/linux/nbproject/private/private.xml +++ b/src/vscp/daemon/linux/nbproject/private/private.xml @@ -9,6 +9,25 @@ - + + file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/tcpipclientthread.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscprestserver.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpeventhelper.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebsocketserver.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpwebserver.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/daemon/linux/vscpd.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/webserver_websocket.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/variablecodes.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/register.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpautomation.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/clientlist.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpvariable.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/controlobject.h + diff --git a/src/vscp/drivers/level2/socketcan/linux/nbproject/private/private.xml b/src/vscp/drivers/level2/socketcan/linux/nbproject/private/private.xml index 3b21b9596..f2758c189 100644 --- a/src/vscp/drivers/level2/socketcan/linux/nbproject/private/private.xml +++ b/src/vscp/drivers/level2/socketcan/linux/nbproject/private/private.xml @@ -9,6 +9,11 @@ - + + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscp.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscphelper.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.h + file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.cpp + diff --git a/src/vscp/drivers/level2/wire1/linux/nbproject/private/private.xml b/src/vscp/drivers/level2/wire1/linux/nbproject/private/private.xml index f2758c189..3b21b9596 100644 --- a/src/vscp/drivers/level2/wire1/linux/nbproject/private/private.xml +++ b/src/vscp/drivers/level2/wire1/linux/nbproject/private/private.xml @@ -9,11 +9,6 @@ - - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscp.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscphelper.cpp - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.h - file:/home/akhe/development/VSCP/vscp/src/vscp/common/vscpremotetcpif.cpp - + diff --git a/src/vscp/vscpworks/nbproject/private/private.xml b/src/vscp/vscpworks/nbproject/private/private.xml index 3b21b9596..16c27ae12 100644 --- a/src/vscp/vscpworks/nbproject/private/private.xml +++ b/src/vscp/vscpworks/nbproject/private/private.xml @@ -9,6 +9,13 @@ - + + file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.h + file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmmain.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/frmdeviceconfig.h + file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/vscpworks.cpp + file:/home/akhe/development/VSCP/vscp/src/vscp/vscpworks/devicebootloaderwizard_images.h +