rendered paste bodyOnly in ZWave: .#log.txt
Only in ZWave: #log.txt#
Only in ZWave: log.txt
Only in ZWave: Main.d
Only in ZWave: Main.o
diff -ur ZWave.orig/Makefile ZWave/Makefile
--- ZWave.orig/Makefile 2008-03-01 15:22:51.509802634 -0500
+++ ZWave/Makefile 2008-03-01 14:50:37.551732898 -0500
@@ -1,7 +1,7 @@
#<-dceag-mh-b->
GENDEV=../Gen_Devices
-SNR_CPPFLAGS ?= <-mkr_t_compile_defines->
+SNR_CPPFLAGS ?= -DKDE_LMCE -DDEBUG -DTHREAD_LOG -DLOG_ALL_QUERIES -I/opt/libxine1-pluto/include -I/opt/linphone-1.3.5/include
ROOT = ..
CXXFLAGS = -Wall -fPIC -ggdb3
@@ -14,9 +14,7 @@
LDFLAGS += -lmysqlclient_r
#<-mkr_B_use_mysql_wrapper_e->
-#<-mkr_b_use_mysql_wrapper_b->
-CPPFLAGS += -DUSE_MYSQL_WRAPPER
-#<-mkr_b_use_mysql_wrapper_e->
+#
MYNAME = ZWave
VERSION = 2.0.0
@@ -59,7 +57,7 @@
cp $@ ../bin
chmod +x post_make.sh
./post_make.sh $@
-
+
ZWave: $(sources:.cpp=.o)
$(CXX) -o $(MYNAME) $(call cpath,$+) $(LDFLAGS) $(LDLIBS)
cp $@ ../bin
Only in ZWave.orig: Makefile~
diff -ur ZWave.orig/make_package.sh ZWave/make_package.sh
--- ZWave.orig/make_package.sh 2008-03-01 15:22:51.542801545 -0500
+++ ZWave/make_package.sh 2008-03-01 14:50:37.555732781 -0500
@@ -1,133 +1,133 @@
-#!/bin/bash
-
-#<-dceag-mp-b->
-#DCE_Package
-#DCE_TargetDir
-
-if [ "$#" != 3 ]; then
- echo "Syntax: $0 <application name> <version> <device template id>"
- exit 1
-fi
-
-PACK_LOC=../Packages
-ORIG_APPNAME="$1"
-APPNAME=pluto-`echo "$ORIG_APPNAME" | tr 'A-Z_' 'a-z\-'`
-APPVER="$2"
-DEVTMPL_ID="$3"
-
-PACK_NAME="$APPNAME-$APPVER"
-PACK_DIR="$PACK_LOC/$PACK_NAME"
-DISTRO=1 # 1=Debian
-
-GetMySQLResult()
-{
- local Q
-
- Q="$*"
- echo "$Q;" | mysql pluto_main | tail +2
- return "$?"
-}
-
-GetPackageDepends()
-{
- local Package_Number Package_Name
- local Q R
- local Row
-
- Package_Number="$1"
-
- Q="SELECT PK_Package, Name
-FROM Package_Package
-JOIN Package ON Package.PK_Package = FK_Package_DependsOn
-JOIN Package_Source ON Package_Source.FK_Package = PK_Package
-JOIN RepositorySource ON FK_RepositorySource = PK_RepositorySource
-JOIN Package_Source_Compat ON FK_Package_Source = PK_Package_Source
-WHERE Package_Package.FK_Package='$Package_Number' AND FK_RepositoryType=1 AND Package_Source_Compat.FK_Distro='$DISTRO' AND OnlyToBuild=0"
-
- R=$(GetMySQLResult "$Q") # TODO: test result
-
- echo "$R" |
- while read Row; do
- [ -z "$Row" ] && break # weird thing: we have to force an exit, else it loops forever
- Package_Number=$(echo "$Row" | cut -f1)
- Package_Name=$(echo "$Row" | cut -sf2)
- GetPackageDepends "$Package_Number"
- echo -n "$Package_Name "
- done
-}
-
-# return the packages needed by the device plus their dependencies
-GetDevicePackageList()
-{
- local Package_Number Package_Name
- local Q R
- local Row
-
- Device_Number="$1"
-
- Q="SELECT Package_Source.FK_Package,Name
-FROM DeviceTemplate
-JOIN Package_Source ON Package_Source.FK_Package=DeviceTemplate.FK_Package
-JOIN Package_Source_Compat ON FK_Package_Source=PK_Package_Source
-WHERE PK_DeviceTemplate='$Device_Number' AND FK_Distro='$DISTRO'"
-
- R=$(GetMySQLResult "$Q") # TODO: test result
-
- echo "$R" |
- while read Row; do
- [ -z "$Row" ] && break # weird thing: we have to force an exit, else it loops forever
- Package_Number=$(echo "$Row" | cut -f1)
- Package_Name=$(echo "$Row" | cut -sf2)
- GetPackageDepends "$Package_Number"
- echo -n "$Package_Name "
- done
-}
-
-#GetDevicePackageList "$DEVTMPL_ID"; echo
-PackageList=$(GetDevicePackageList "$DEVTMPL_ID")
-
-if [ ! -d "$PACK_LOC" ]; then
- mkdir -p "$PACK_LOC"
-fi
-
-if [ ! -d "$PACK_DIR" ]; then
- cp -a "$PACK_LOC/_Package_template" "$PACK_DIR"
-fi
-
-BIN_LOC="../../bin"
-LIB_LOC="../../lib"
-BIN_FILE="$BIN_LOC/$ORIG_APPNAME"
-PLUGIN_FILE="$BIN_LOC/$ORIG_APPNAME.so"
-LIB_FILE="$LIB_LOC/lib$ORIG_APPNAME.a"
-
-pushd "$PACK_DIR"
-
-mkdir -p root/usr/pluto/bin
-mkdir -p root/usr/pluto/lib
-
-echo "-- $BIN_FILE"
-if [ -f "$BIN_FILE" ]; then
- echo "Found bin file"
- cp "$BIN_FILE" root/usr/pluto/bin
-fi
-
-echo "-- $PLUGIN_FILE"
-if [ -f "$PLUGIN_FILE" ]; then
- echo "Found plugin file"
- cp "$PLUGIN_FILE" root/usr/pluto/bin
-fi
-
-echo "-- $LIB_FILE"
-if [ -f "$LIB_FILE" ]; then
- echo "Found lib file"
- cp "$LIB_FILE" root/usr/pluto/lib
-fi
-
-popd
-
-pushd "$PACK_LOC"
-./propagate.pl "$PACK_NAME" $PackageList
-popd
-
-#<-dceag-mp-e->
-
+#!/bin/bash
+
+#<-dceag-mp-b->
+#DCE_Package
+#DCE_TargetDir
+
+if [ "$#" != 3 ]; then
+ echo "Syntax: $0 <application name> <version> <device template id>"
+ exit 1
+fi
+
+PACK_LOC=../Packages
+ORIG_APPNAME="$1"
+APPNAME=pluto-`echo "$ORIG_APPNAME" | tr 'A-Z_' 'a-z\-'`
+APPVER="$2"
+DEVTMPL_ID="$3"
+
+PACK_NAME="$APPNAME-$APPVER"
+PACK_DIR="$PACK_LOC/$PACK_NAME"
+DISTRO=1 # 1=Debian
+
+GetMySQLResult()
+{
+ local Q
+
+ Q="$*"
+ echo "$Q;" | mysql pluto_main | tail +2
+ return "$?"
+}
+
+GetPackageDepends()
+{
+ local Package_Number Package_Name
+ local Q R
+ local Row
+
+ Package_Number="$1"
+
+ Q="SELECT PK_Package, Name
+FROM Package_Package
+JOIN Package ON Package.PK_Package = FK_Package_DependsOn
+JOIN Package_Source ON Package_Source.FK_Package = PK_Package
+JOIN RepositorySource ON FK_RepositorySource = PK_RepositorySource
+JOIN Package_Source_Compat ON FK_Package_Source = PK_Package_Source
+WHERE Package_Package.FK_Package='$Package_Number' AND FK_RepositoryType=1 AND Package_Source_Compat.FK_Distro='$DISTRO' AND OnlyToBuild=0"
+
+ R=$(GetMySQLResult "$Q") # TODO: test result
+
+ echo "$R" |
+ while read Row; do
+ [ -z "$Row" ] && break # weird thing: we have to force an exit, else it loops forever
+ Package_Number=$(echo "$Row" | cut -f1)
+ Package_Name=$(echo "$Row" | cut -sf2)
+ GetPackageDepends "$Package_Number"
+ echo -n "$Package_Name "
+ done
+}
+
+# return the packages needed by the device plus their dependencies
+GetDevicePackageList()
+{
+ local Package_Number Package_Name
+ local Q R
+ local Row
+
+ Device_Number="$1"
+
+ Q="SELECT Package_Source.FK_Package,Name
+FROM DeviceTemplate
+JOIN Package_Source ON Package_Source.FK_Package=DeviceTemplate.FK_Package
+JOIN Package_Source_Compat ON FK_Package_Source=PK_Package_Source
+WHERE PK_DeviceTemplate='$Device_Number' AND FK_Distro='$DISTRO'"
+
+ R=$(GetMySQLResult "$Q") # TODO: test result
+
+ echo "$R" |
+ while read Row; do
+ [ -z "$Row" ] && break # weird thing: we have to force an exit, else it loops forever
+ Package_Number=$(echo "$Row" | cut -f1)
+ Package_Name=$(echo "$Row" | cut -sf2)
+ GetPackageDepends "$Package_Number"
+ echo -n "$Package_Name "
+ done
+}
+
+#GetDevicePackageList "$DEVTMPL_ID"; echo
+PackageList=$(GetDevicePackageList "$DEVTMPL_ID")
+
+if [ ! -d "$PACK_LOC" ]; then
+ mkdir -p "$PACK_LOC"
+fi
+
+if [ ! -d "$PACK_DIR" ]; then
+ cp -a "$PACK_LOC/_Package_template" "$PACK_DIR"
+fi
+
+BIN_LOC="../../bin"
+LIB_LOC="../../lib"
+BIN_FILE="$BIN_LOC/$ORIG_APPNAME"
+PLUGIN_FILE="$BIN_LOC/$ORIG_APPNAME.so"
+LIB_FILE="$LIB_LOC/lib$ORIG_APPNAME.a"
+
+pushd "$PACK_DIR"
+
+mkdir -p root/usr/pluto/bin
+mkdir -p root/usr/pluto/lib
+
+echo "-- $BIN_FILE"
+if [ -f "$BIN_FILE" ]; then
+ echo "Found bin file"
+ cp "$BIN_FILE" root/usr/pluto/bin
+fi
+
+echo "-- $PLUGIN_FILE"
+if [ -f "$PLUGIN_FILE" ]; then
+ echo "Found plugin file"
+ cp "$PLUGIN_FILE" root/usr/pluto/bin
+fi
+
+echo "-- $LIB_FILE"
+if [ -f "$LIB_FILE" ]; then
+ echo "Found lib file"
+ cp "$LIB_FILE" root/usr/pluto/lib
+fi
+
+popd
+
+pushd "$PACK_LOC"
+./propagate.pl "$PACK_NAME" $PackageList
+popd
+
+#<-dceag-mp-e->
+
Only in ZWave: make_package.sh.prep
Only in ZWave: PlutoZWSerialAPI.d
Only in ZWave: PlutoZWSerialAPI.o
diff -ur ZWave.orig/SerialConnection.cpp ZWave/SerialConnection.cpp
--- ZWave.orig/SerialConnection.cpp 2008-03-01 15:22:51.645797601 -0500
+++ ZWave/SerialConnection.cpp 2008-03-01 15:20:57.225126671 -0500
@@ -295,7 +295,29 @@
LoggerWrapper::GetInstance()->Write(LV_ZWAVE, "SerialConnection::hasCommand() is not connected");
return -1;
}
-
+
+#if 0
+ pthread_mutex_lock( &instance->mutex_buffer );
+ if ((buffer.size() >= 1) && (buffer.front() == 0x18))
+ buffer.pop_front();
+ pthread_mutex_unlock( &instance->mutex_buffer );
+#endif
+
+ if (buffer.size())
+ {
+ cout<<"SerialConnection::hasCommand():";
+ for (uint i = 0; i < buffer.size(); i++)
+ {
+ if (buffer[i] == SERIAL_ACK)
+ cout<<" ACK";
+ else if (buffer[i] == SERIAL_SOF && (i>0) && buffer[i-1] == SERIAL_ACK)
+ cout<<" SOF";
+ else
+ cout<<hex<<" x"<<((int)buffer[i]&0xff)<<dec;
+ }
+ cout<<endl;
+ }
+
int returnValue = 0;
pthread_mutex_lock( &instance->mutex_buffer );
while( 0 < buffer.size() && buffer.front() == SERIAL_ACK )
Only in ZWave: SerialConnection.cpp~
Only in ZWave: SerialConnection.d
Only in ZWave: SerialConnection.o
Only in ZWave: ZWave
Only in ZWave: ZWave.d
Only in ZWave: ZWaveJob.d
Only in ZWave: ZWaveJob.o
Only in ZWave: ZWaveNode.d
Only in ZWave: ZWaveNode.o
Only in ZWave: ZWave.o
Only in ZWave: ZWJobAddNode.d
Only in ZWave: ZWJobAddNode.o
Only in ZWave: ZWJobAssignReturnRoute.d
Only in ZWave: ZWJobAssignReturnRoute.o
Only in ZWave: ZWJobAssociationSet.d
Only in ZWave: ZWJobAssociationSet.o
Only in ZWave: ZWJobConfig.d
Only in ZWave: ZWJobConfig.o
Only in ZWave: ZWJobDeleteRoute.d
Only in ZWave: ZWJobDeleteRoute.o
Only in ZWave: ZWJobGetID.d
Only in ZWave: ZWJobGetID.o
Only in ZWave: ZWJobGetInitData.d
Only in ZWave: ZWJobGetInitData.o
Only in ZWave: ZWJobGetNodeProtocolInfo.d
Only in ZWave: ZWJobGetNodeProtocolInfo.o
Only in ZWave: ZWJobGetSUC.d
Only in ZWave: ZWJobGetSUC.o
Only in ZWave: ZWJobGetVersion.d
Only in ZWave: ZWJobGetVersion.o
Only in ZWave: ZWJobInitialize.d
Only in ZWave: ZWJobInitialize.o
Only in ZWave: ZWJobLightLevel.d
Only in ZWave: ZWJobLightLevel.o
Only in ZWave: ZWJobPool.d
Only in ZWave: ZWJobPool.o
Only in ZWave: ZWJobReceive.d
Only in ZWave: ZWJobReceive.o
Only in ZWave: ZWJobRemoveNode.d
Only in ZWave: ZWJobRemoveNode.o
Only in ZWave: ZWJobReset.d
Only in ZWave: ZWJobReset.o
Only in ZWave: ZWJobSendData.d
Only in ZWave: ZWJobSendData.o
Only in ZWave: ZWJobSetLearnMode.d
Only in ZWave: ZWJobSetLearnMode.o
Only in ZWave: ZWJobSetLearnNodeState.d
Only in ZWave: ZWJobSetLearnNodeState.o
Only in ZWave: ZWJobSwitchBinaryGet.d
Only in ZWave: ZWJobSwitchBinaryGet.o
Only in ZWave: ZWJobSwitchChangeLevel.d
Only in ZWave: ZWJobSwitchChangeLevel.d.9839
Only in ZWave: ZWJobSwitchChangeLevel.o
Only in ZWave: ZWJobWakeUp.d
Only in ZWave: ZWJobWakeUp.o