Merge branch 'master' of https://github.com/grodansparadis/vscp_software

 into main

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vscp 1.0.1.
+# Generated by GNU Autoconf 2.69 for vscp 1.1.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='vscp'
 PACKAGE_TARNAME='vscp'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='vscp 1.0.1'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='vscp 1.1.0'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1267,7 +1267,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vscp 1.0.1 to adapt to many kinds of systems.
+\`configure' configures vscp 1.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1328,7 +1328,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vscp 1.0.1:";;
+     short | recursive ) echo "Configuration of vscp 1.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1433,7 +1433,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vscp configure 1.0.1
+vscp configure 1.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1894,7 +1894,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vscp $as_me 1.0.1, which was
+It was created by vscp $as_me 1.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7667,7 +7667,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vscp $as_me 1.0.1, which was
+This file was extended by vscp $as_me 1.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7729,7 +7729,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-vscp config.status 1.0.1
+vscp config.status 1.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -8474,8 +8474,8 @@ echo
 echo   "           VSCP configuration"
 echo   "--------------------------------------------"
 echo   "VSCP version          : ${PACKAGE_VERSION}"
-echo   "System                : ${host}"
-echo   "Architecture          : ${arch}"
+echo   "System                : `uname -a` "
+echo   "Architecture          : $(arch)"
 echo   "VSCP GUI Build        : ${vscp_gui}"
 
 if test "${vscp_debug}" = "yes"

configure.in

@@ -1,7 +1,7 @@
 dnl Autoconf settings for VSCP
 dnl $Id: configure.in,v 1.5 2005/10/03 16:30:06 akhe Exp $
 
-AC_INIT(vscp, [1.0.1], [[email protected]])
+AC_INIT(vscp, [1.1.0], [[email protected]])
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Ant"
@@ -224,8 +224,8 @@ echo
 echo   "           VSCP configuration"
 echo   "--------------------------------------------"
 echo   "VSCP version          : ${PACKAGE_VERSION}"
-echo   "System                : ${host}"
-echo   "Architecture          : ${arch}"
+echo   "System                : `uname -a` "
+echo   "Architecture          : $(arch)"
 echo   "VSCP GUI Build        : ${vscp_gui}"
 
 if test "${vscp_debug}" = "yes" 

src/vscp/common/vscpwebserver.cpp

@@ -5516,7 +5516,7 @@ void VSCPWebServerThread::websrc_rest_renderTableData( struct mg_connection *con
 
         memset( buf, 0, sizeof( buf ) );
         sprintf( wrkbuf,
-                 "<count>%d</count>\r\n<info>Fetched %d elements of table %s</info>\r\n",
+                 "<count>%ld</count>\r\n<info>Fetched %ld elements of table %s</info>\r\n",
                  nfetchedRecords,
                  nfetchedRecords,
                  ( const char * )strName.mbc_str() );

src/vscp/daemon/linux/nbproject/private/configurations.xml

@@ -135,6 +135,8 @@
         <gdb_interceptlist>
           <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
         </gdb_interceptlist>
+        <gdb_signals>
+        </gdb_signals>
         <gdb_options>
           <DebugOptions>
             <option name="debug_command" value="vscpd -s"/>

src/vscp/daemon/linux/nbproject/private/private.xml

@@ -38,6 +38,9 @@
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/home/akhe/vscp_software/src/vscp/common/controlobject.cpp</file>
+            <file>file:/home/akhe/vscp_software/src/vscp/daemon/linux/vscpd.cpp</file>
+        </group>
     </open-files>
 </project-private>

src/vscp/drivers/level1/can232/linux/vscpl1_can232drv.h

@@ -20,11 +20,7 @@
 // along with this file see the file COPYING.  If not, write to
 // the Free Software Foundation, 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
-//
-// $RCSfile: can232drv.h,v $                                       
-// $Date: 2011/07/28 19:40:16 $                                  
-// $Author: ice $                                              
-// $Revision: 1.2 $ 
+// 
 
 #if !defined(AFX_LOGGERDLL_H__A388C093_AD35_4672_8BF7_DBC702C6B0C8__INCLUDED_)
 #define AFX_LOGGERDLL_H__A388C093_AD35_4672_8BF7_DBC702C6B0C8__INCLUDED_