mirror of
https://github.com/seahu/rflink.git
synced 2025-12-10 07:57:23 +01:00
some LOG LEVEL change and repair init.d scrit to load configuration file
This commit is contained in:
Binary file not shown.
@@ -66,7 +66,7 @@ int StopScanEventTheader(){
|
||||
// This function only fill in RawSignal struture and unlock condition varible used in function ScanEvent() who do main work for process data.
|
||||
void setRawSignal(int RawCodeLength){
|
||||
sprintf(pbuffer,"Spracovani paketu delky:: %d",RawCodeLength);
|
||||
log(LOG_STATUS,pbuffer);
|
||||
log(LOG_DEBUG,pbuffer);
|
||||
|
||||
pthread_mutex_lock(&thread_flag_mutex);
|
||||
|
||||
@@ -106,7 +106,7 @@ void handleInterrupt() {
|
||||
// Some modules do not set RawSignal.Repeats=true and use own solve.
|
||||
if (RawSignal.Repeats==true){
|
||||
if (log_repeat==true){
|
||||
log(LOG_STATUS,"RawSignal: RawSignal.Repeats=true.");
|
||||
log(LOG_DEBUG,"RawSignal: RawSignal.Repeats=true.");
|
||||
log_repeat=false;
|
||||
}
|
||||
//if ((RawSignal.Time+SIGNAL_REPEAT_TIME)>millis()) {
|
||||
@@ -115,12 +115,12 @@ void handleInterrupt() {
|
||||
//log(LOG_STATUS,"return back from interput.");
|
||||
return;
|
||||
}
|
||||
log(LOG_STATUS,"RawSignal: end Repeats by log impuls");
|
||||
log(LOG_DEBUG,"RawSignal: end Repeats by log impuls");
|
||||
RawSignal.Repeats=false;
|
||||
RawCodeLength=1;
|
||||
}
|
||||
else {
|
||||
log(LOG_STATUS,"RawSignal: end Repeats by end REPEAT_TIME");
|
||||
log(LOG_DEBUG,"RawSignal: end Repeats by end REPEAT_TIME");
|
||||
RawSignal.Repeats=false;
|
||||
RawCodeLength=1;
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -18,7 +18,7 @@ user=""
|
||||
TCP_port=5050
|
||||
PIN_TX=28
|
||||
PIN_RX=29
|
||||
log_level=1
|
||||
log_level=3
|
||||
log_file=""
|
||||
|
||||
#include config file if exist (may redefine TCP_port, log_level, log_file)
|
||||
@@ -26,7 +26,9 @@ if [ -f "$config_file" ]; then
|
||||
. /etc/rflink.conf
|
||||
fi
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
CONFIG="$TCP_port $PIN_TX $PIN_RX $log_level"
|
||||
|
||||
#. /lib/lsb/init-functions
|
||||
|
||||
name=`basename $0`
|
||||
PIDFILE="/var/run/$name.pid"
|
||||
@@ -37,15 +39,16 @@ case "$1" in
|
||||
if [ -z "$user" ]; then
|
||||
#start-stop-daemon --start --verbose --background --pidfile $PIDFILE --make-pidfile --exec $DAEMON
|
||||
if [ -z "$log_file" ]; then
|
||||
start-stop-daemon -S -x $DAEMON -b -C -v -m -p $PIDFILE -- | logger -t $name &
|
||||
echo "start-stop-daemon -S -x $DAEMON -b -C -v -m -p $PIDFILE -- $CONFIG | logger -t $name &"
|
||||
start-stop-daemon -S -x $DAEMON -b -C -v -m -p $PIDFILE -- $CONFIG | logger -t $name &
|
||||
else
|
||||
start-stop-daemon -S -x $DAEMON -b -C -v -m -p $PIDFILE -- >> $log_file
|
||||
start-stop-daemon -S -x $DAEMON -b -C -v -m -p $PIDFILE -- $CONFIG >> $log_file
|
||||
fi
|
||||
else
|
||||
if [ -z "$log_file" ]; then
|
||||
start-stop-daemon -S -c $user -x $DAEMON -b -C -v -m -p $PIDFILE -- | logger -t $name &
|
||||
start-stop-daemon -S -c $user -x $DAEMON -b -C -v -m -p $PIDFILE -- $CONFIG | logger -t $name &
|
||||
else
|
||||
start-stop-daemon -S -c $user -x $DAEMON -b -C -v -m -p $PIDFILE -- >> $log_file
|
||||
start-stop-daemon -S -c $user -x $DAEMON -b -C -v -m -p $PIDFILE -- $CONFIG >> $log_file
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -40,8 +40,8 @@ int socket_getline(char* buf, int size)
|
||||
|
||||
int socket_send(const char* buf, const int size)
|
||||
{
|
||||
log(LOG_DEBUG,"TCP server send: ",false);
|
||||
log(LOG_DEBUG,buf);
|
||||
log(LOG_STATUS,"TCP server send: ",false);
|
||||
log(LOG_STATUS,buf);
|
||||
int ret=send(clientSocket, buf, size, 0);
|
||||
if ( ret == -1 ) { // +1 for NUL terminator
|
||||
clientSocket=-1;
|
||||
@@ -93,7 +93,9 @@ int TCPserver(int port)
|
||||
log(LOG_ERROR,"TCP server: Problem conect with client.");
|
||||
return -1;
|
||||
}
|
||||
log(LOG_STATUS,"TCP server: Client connect.");
|
||||
sprintf(pbuffer, "TCP server: Connect client with addr: %s.", inet_ntoa((in_addr)clientInfo.sin_addr) );
|
||||
log(LOG_STATUS, pbuffer);
|
||||
//log(LOG_STATUS,"TCP server: Client connect.");
|
||||
// --------------------- conction is stored now can work -----------------------------
|
||||
Serial.set_send_function(socket_send); // enable Serial.println send line by socket
|
||||
Serial.print(WELCOME);
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user