[uts-cvs] uts/src/tel/telgo.paramount telgo,1.1,1.2 telgo.paramount.py,1.1,1.2 telgo.server.py,1.1,1.2

[Paulo H. S. de S. <ph...@us...>]

Update of /cvsroot/uts/uts/src/tel/telgo.paramount
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3342/src/tel/telgo.paramount

Modified Files:
	telgo telgo.paramount.py telgo.server.py 
Log Message:
- better support for non connected telescope


Index: telgo
===================================================================
RCS file: /cvsroot/uts/uts/src/tel/telgo.paramount/telgo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** telgo	4 Mar 2004 20:56:20 -0000	1.1
--- telgo	18 Mar 2004 16:06:00 -0000	1.2
***************
*** 22,30 ****
  
      """ % (__description__, __version__, __date__,
!            sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0])
  
      sys.exit(-1)
  
  
  # get target host and port from command line
  if ":" in sys.argv[2]:
--- 22,34 ----
  
      """ % (__description__, __version__, __date__,
!            sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0])
  
      sys.exit(-1)
  
  
+ 
+ 
+ 
+ 
  # get target host and port from command line
  if ":" in sys.argv[2]:
***************
*** 59,63 ****
  
      # wait until telescope move
!     wait = select.select([skt], [], [skt], 180)
  
      if len(wait[0]) or len(wait[2]):
--- 63,67 ----
  
      # wait until telescope move
!     wait = select.select([skt], [], [skt], 60)
  
      if len(wait[0]) or len(wait[2]):

Index: telgo.paramount.py
===================================================================
RCS file: /cvsroot/uts/uts/src/tel/telgo.paramount/telgo.paramount.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** telgo.paramount.py	4 Mar 2004 20:56:20 -0000	1.1
--- telgo.paramount.py	18 Mar 2004 16:06:00 -0000	1.2
***************
*** 22,30 ****
  
      """ % (__description__, __version__, __date__,
!            sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0])
  
      sys.exit(-1)
  
  
  # get target host and port from command line
  if ":" in sys.argv[2]:
--- 22,34 ----
  
      """ % (__description__, __version__, __date__,
!            sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0])
  
      sys.exit(-1)
  
  
+ 
+ 
+ 
+ 
  # get target host and port from command line
  if ":" in sys.argv[2]:
***************
*** 59,63 ****
  
      # wait until telescope move
!     wait = select.select([skt], [], [skt], 180)
  
      if len(wait[0]) or len(wait[2]):
--- 63,67 ----
  
      # wait until telescope move
!     wait = select.select([skt], [], [skt], 60)
  
      if len(wait[0]) or len(wait[2]):

Index: telgo.server.py
===================================================================
RCS file: /cvsroot/uts/uts/src/tel/telgo.paramount/telgo.server.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** telgo.server.py	4 Mar 2004 20:56:20 -0000	1.1
--- telgo.server.py	18 Mar 2004 16:06:00 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  #!/bin/python
+ # -*- coding: cp1252 -*-
  import sys
  import time
***************
*** 8,12 ****
  
  sk = socket(AF_INET, SOCK_STREAM)
! sk.bind(('localhost', 10000))
  sk.listen(5)
  
--- 9,13 ----
  
  sk = socket(AF_INET, SOCK_STREAM)
! sk.bind(('localhost', 80))
  sk.listen(5)
  
***************
*** 19,24 ****
      sys.exit(1)
  
! obj.Connected = True
! #obj.FindHome()
  
  targetRA = 0
--- 20,32 ----
      sys.exit(1)
  
! try:
!     obj.Connected = True
! #    obj.FindHome()
! except AttributeError, e:
!     print "Não foi possível conectar-se ao telescópio.\nVerifique se o telescópio está ligado e devidamente conectado " \
!           "ao computador"
!     thesky.Quit()
!     sys.exit(1)
!     
  
  targetRA = 0
***************
*** 27,32 ****
  conn = addr = None
  
  try:
!     while 1:
          conn, addr = sk.accept()
          print "Entrando... %s:%d" % addr
--- 35,42 ----
  conn = addr = None
  
+ fim = False
+ 
  try:
!     while not fim:
          conn, addr = sk.accept()
          print "Entrando... %s:%d" % addr
***************
*** 60,63 ****
--- 70,74 ----
                  obj.Connected = False
                  thesky.Quit()
+                 fim = True
                  break                
  
***************
*** 66,70 ****
          conn.close()
  
- 
  except KeyboardInterrupt:
      print "Ctrl+C... saindo."
--- 77,80 ----
***************
*** 108,111 ****
--- 118,123 ----
      sys.exit(1)
  
+ sys.exit(0)
+