diff --git a/config_examples/vscpd.conf_unix_distro b/config_examples/vscpd.conf_unix_distro index 40388a7de..faa687b10 100644 --- a/config_examples/vscpd.conf_unix_distro +++ b/config_examples/vscpd.conf_unix_distro @@ -254,6 +254,14 @@ /usr/local/lib/vscpl2drv_raweth.so + + + sim1 + 1 + FF:FF:FF:FF:FF:FF:FF:F7:03:00:00:00:00:00:00:00 + /usr/local/lib/vscpl2_simdrv.so + + VSCP Level II 1-wire Driver 1 diff --git a/config_examples/vscpd.conf_windows_distro b/config_examples/vscpd.conf_windows_distro index 0f4307184..fd8afe121 100644 --- a/config_examples/vscpd.conf_windows_distro +++ b/config_examples/vscpd.conf_windows_distro @@ -250,7 +250,7 @@ /usr/local/lib/vscpl2drv_raweth.so - + sim1 1 diff --git a/src/vscp/vscpworks/nbproject/configurations.xml b/src/vscp/vscpworks/nbproject/configurations.xml index dc681e516..bfdbfa46d 100644 --- a/src/vscp/vscpworks/nbproject/configurations.xml +++ b/src/vscp/vscpworks/nbproject/configurations.xml @@ -121,8 +121,15 @@ + + /usr/local/lib/wx/include/gtk2-unicode-3.0 + /usr/local/include/wx-3.0 + ../common + ../../common + USE_FOSSA + WXUSINGDLL _FILE_OFFSET_BITS=64 __WXGTK__ wxUSE_GUI=1 @@ -262,33 +269,11 @@ - - - - /usr/local/lib/wx/include/gtk2-unicode-debug-2.8 - /usr/local/include/wx-2.8 - ../common - ../../common - - - NS_ENABLE_SSL - _LARGE_FILES - __WXDEBUG__ - - - - /usr/local/lib/wx/include/gtk2-unicode-3.0 - /usr/local/include/wx-3.0 - ../common - ../../common . - - WXUSINGDLL - diff --git a/src/vscp/vscpworks/nbproject/private/Default.properties b/src/vscp/vscpworks/nbproject/private/Default.properties index 224d81459..1d1e99443 100644 --- a/src/vscp/vscpworks/nbproject/private/Default.properties +++ b/src/vscp/vscpworks/nbproject/private/Default.properties @@ -4,8 +4,40 @@ /home/akhe/vscp_software/src/vscp/common/guid.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/guid.o ../common/guid.cpp /home/akhe/vscp_software/src/vscp/common/vscphelper.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/vscphelper.o ../common/vscphelper.cpp /home/akhe/vscp_software/src/vscp/common/canalsuperwrapper.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/canalsuperwrapper.o ../common/canalsuperwrapper.cpp -/home/akhe/vscp_software/src/vscp/common/vscpremotetcpif.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/vscpremotetcpif.o ../common/vscpremotetcpif.cpp /home/akhe/vscp_software/src/vscp/common/dllwrapper.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/dllwrapper.o ../common/dllwrapper.cpp +/home/akhe/vscp_software/src/vscp/common/vscpremotetcpif.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/vscpremotetcpif.o ../common/vscpremotetcpif.cpp /home/akhe/vscp_software/src/vscp/common/register.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/register.o ../common/register.cpp /home/akhe/vscp_software/src/vscp/common/vscpeventhelper.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/vscpeventhelper.o ../common/vscpeventhelper.cpp /home/akhe/vscp_software/src/vscp/common/mdf.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o ../common/mdf.o ../common/mdf.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmdeviceconfig.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmdeviceconfig.o frmdeviceconfig.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/bootdevice_pic1.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o bootdevice_pic1.o bootdevice_pic1.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/threadvscpwork.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o threadvscpwork.o threadvscpwork.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmmain.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmmain.o frmmain.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmdaemondecisionmartrixeditor.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmdaemondecisionmartrixeditor.o frmdaemondecisionmartrixeditor.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmsimpleuserinterfacegenerator.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmsimpleuserinterfacegenerator.o frmsimpleuserinterfacegenerator.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/vscpworks.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o vscpworks.o vscpworks.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmscanfordevices.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmscanfordevices.o frmscanfordevices.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/bootdevice.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o bootdevice.o bootdevice.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmdaemonvariableeditor.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmdaemonvariableeditor.o frmdaemonvariableeditor.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgvscpfilter.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgvscpfilter.o dlgvscpfilter.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgabout.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgabout.o dlgabout.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgsetmanufactdata.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgsetmanufactdata.o dlgsetmanufactdata.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgclasstypeselect.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgclasstypeselect.o dlgclasstypeselect.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/vscptxobj.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o vscptxobj.o vscptxobj.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgselectdaemoninterface.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgselectdaemoninterface.o dlgselectdaemoninterface.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgsetfiltermask.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgsetfiltermask.o dlgsetfiltermask.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/gridtable.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o gridtable.o gridtable.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/bootdevice_vscp.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o bootdevice_vscp.o bootdevice_vscp.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/devicebootloaderwizard.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o devicebootloaderwizard.o devicebootloaderwizard.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgabstractionedit.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgabstractionedit.o dlgabstractionedit.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/vscpbootloader.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o vscpbootloader.o vscpbootloader.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmmdfeditor.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmmdfeditor.o frmmdfeditor.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgconfiguration.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgconfiguration.o dlgconfiguration.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgvscpmsg.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgvscpmsg.o dlgvscpmsg.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgvscptrmit.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgvscptrmit.o dlgvscptrmit.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/frmvscpsession.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o frmvscpsession.o frmvscpsession.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgeventfilter.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgeventfilter.o dlgeventfilter.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/merlin.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o merlin.o merlin.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgvscpinterfacesettings.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgvscpinterfacesettings.o dlgvscpinterfacesettings.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgeditlevel1dmrow.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgeditlevel1dmrow.o dlgeditlevel1dmrow.cpp +/home/akhe/vscp_software/src/vscp/vscpworks/dlgnewvscpsession.cpp=/home/akhe/vscp_software/src/vscp/vscpworks#-g -O2 -I/usr/local/lib/wx/include/gtk2-unicode-3.0 -I/usr/local/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -DwxUSE_GUI=1 -DUSE_FOSSA -I../common -I../../common -c -o dlgnewvscpsession.o dlgnewvscpsession.cpp diff --git a/src/vscp/vscpworks/nbproject/private/configurations.xml b/src/vscp/vscpworks/nbproject/private/configurations.xml index 19c60d98f..d14212b57 100644 --- a/src/vscp/vscpworks/nbproject/private/configurations.xml +++ b/src/vscp/vscpworks/nbproject/private/configurations.xml @@ -202,6 +202,8 @@ + +