Merge branch 'master' of pwrcvs:/data1/git/pwr

profibus/lib/rt/src/os_linux/rt_io_m_pb_profiboard.c

@@ -931,8 +931,8 @@ void *handle_events(void *ptr) {
       op->Status = PB__NOTINIT;
     } else {
       if (local->slave_diag_requested) {
-	errh_Info( "Profibus - Diag re-request");
-	dp_get_slave_diag(hDevice);
+	//	errh_Info( "Profibus - Diag re-request");
+	//	dp_get_slave_diag(hDevice);
       }
     }    
     pthread_mutex_unlock(&local->mutex);

profibus/lib/rt/src/os_linux/rt_pn_iface.cpp

@@ -643,9 +643,9 @@ void pack_download_req(T_PNAK_SERVICE_REQ_RES *ServiceReqRes, GsdmlDeviceData *d
     pIOCR->SequenceHighByte = 0;
     pIOCR->SequenceLowByte  = 0;
     pIOCR->WatchdogFactorHighByte = 0;
-    pIOCR->WatchdogFactorLowByte  = 3;
+    pIOCR->WatchdogFactorLowByte  = 10;
     pIOCR->DataHoldFactorHighByte = 0;
-    pIOCR->DataHoldFactorLowByte  = 3;
+    pIOCR->DataHoldFactorLowByte  = 10;
     pIOCR->FrameSendOffsetHighWordHighByte = 0xFF; // As fast as possible
     pIOCR->FrameSendOffsetHighWordLowByte  = 0xFF;
     pIOCR->FrameSendOffsetLowWordHighByte  = 0xFF;