Unverified Commit 894c177d authored by Fabio Vitello's avatar Fabio Vitello Committed by GitHub
Browse files

Merge pull request #692 from discos/fix-issue-655

Fix issue 655
parents 16df0940 f46a2148
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/

## [next release]
## Added
    issue #655 - ACU Component for Noto and Medicina is now capble to prevent seldom mode changes coming from ACU reset
    issue #653 - added a couple of scriptsto ease vnc conection from remote a file copying. The scripts support 
                 linux and macos
## Fixed
+11 −4
Original line number Diff line number Diff line
@@ -560,17 +560,24 @@ CExternalClientsSocketServer::cmdToScheduler ()
	      printf("dentro ans==false\n");
	    }*/
	}
	out.ReplaceAll('\n','-');
	/*out.Replace('\n','-');
	out.Replace('\n','-');
	out.Replace('\n','-');
	out.Replace('\n','-');*/
      Len = out.GetLength ();
      int i;
      for (i = 0; i < Len; i++)
	{
      for (i = 0; i < Len; i++) {
	//if (out.CharAt(i)=='\n')
	  // break;	
	outBuffer[i] = out.CharAt (i);
      }
      out.Empty();
      outBuffer[Len] = '\n';
      //outBuffer[i] = '\n';
      //printf ("Command returned = %s", outBuffer);
      Res = sendBuffer (outBuffer, Len + 1);
      //Res = sendBuffer (outBuffer, i + 1);
      if (Res == WOULDBLOCK || Res == FAIL)
	{
	  _EXCPT (SocketErrorExImpl, impl,
+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ class PyCalmuxImpl(CalMux, cc, services, lcycle):
        """
        s.sendall(command)

#        time.sleep(0.1)

        response = s.recv(1024)
        response = response.strip().split()
        if len(response) == 1:
+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
               ControlThreadPeriod="200000"
               RepetitionCacheTime="2000000"
               RepetitionExpireTime="5000000"
               CheckMode="false"
               CheckOscillation="true"
			   OscillationThreshold="0.01"
			   OscillationAlarmDuration="2000000"	
+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
               ControlThreadPeriod="200000"
               RepetitionCacheTime="2000000"
               RepetitionExpireTime="5000000"
               CheckMode="false"
               CheckOscillation="true"
			   OscillationThreshold="0.01"
			   OscillationAlarmDuration="2000000"	
Loading