Attachment 180442 Details for Bug 217499 – svn(1) diff of added patches to comms/chirp and gtk2 dependency added

[patch] svn(1) diff of added patches to comms/chirp and gtk2 dependency added

chirp-0.4.1_4.diff (text/plain), 23.72 KB, created by Kyle Evans on 2017-03-02 17:03:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2017-03-02 17:03:45 UTC

Size: 23.72 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433920)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	chirp
> PORTVERSION=	0.4.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	comms hamradio
> MASTER_SITES=	http://chirp.danplanet.com/download/${PORTVERSION}/ \
> 		LOCAL/db
>@@ -15,7 +15,8 @@
> BUILD_DEPENDS=	${CHIRP_DEPENDS}
> RUN_DEPENDS=	${CHIRP_DEPENDS}
> CHIRP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 \
>-		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial
>+		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
>+		${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2
> 
> USES=		desktop-file-utils gettext python
> USE_PYTHON=	distutils
>Index: files/patch-chirp_anytone.py
>===================================================================
>--- files/patch-chirp_anytone.py	(nonexistent)
>+++ files/patch-chirp_anytone.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/anytone.py.orig	2014-01-11 08:01:32 UTC
>++++ chirp/anytone.py
>+@@ -193,7 +193,7 @@ def _read(radio, length):
>+ valid_model = ['QX588UV', 'HR-2040', 'DB-50M\x00', 'DB-750X']
>+ 
>+ def _ident(radio):
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.timeout = 1
>+     _echo_write(radio, "PROGRAM")
>+     response = radio.pipe.read(3)
>+     if response != "QX\x06":
>
>Property changes on: files/patch-chirp_anytone.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_detect.py
>===================================================================
>--- files/patch-chirp_detect.py	(nonexistent)
>+++ files/patch-chirp_detect.py	(working copy)
>@@ -0,0 +1,29 @@
>+--- chirp/detect.py.orig	2017-03-02 16:41:11 UTC
>++++ chirp/detect.py
>+@@ -37,7 +37,7 @@ def _detect_icom_radio(ser):
>+     # ICOM VHF/UHF Clone-type radios @ 9600 baud
>+ 
>+     try:
>+-        ser.setBaudrate(9600)
>++        ser.baudrate = 9600
>+         md = icf.get_model_data(ser)
>+         return _icom_model_data_to_rclass(md)
>+     except errors.RadioError, e:
>+@@ -45,7 +45,7 @@ def _detect_icom_radio(ser):
>+ 
>+     # ICOM IC-91/92 Live-mode radios @ 4800/38400 baud
>+ 
>+-    ser.setBaudrate(4800)
>++    ser.baudrate = 4800
>+     try:
>+         ic9x_ll.send_magic(ser)
>+         return _icom_model_data_to_rclass("ic9x")
>+@@ -56,7 +56,7 @@ def _detect_icom_radio(ser):
>+ 
>+     for rate in [9600, 4800, 19200]:
>+         try:
>+-            ser.setBaudrate(rate)
>++            ser.baudrate = rate
>+             return icomciv.probe_model(ser)
>+         except errors.RadioError:
>+             pass
>
>Property changes on: files/patch-chirp_detect.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ft2800.py
>===================================================================
>--- files/patch-chirp_ft2800.py	(nonexistent)
>+++ files/patch-chirp_ft2800.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/ft2800.py.orig	2012-09-11 07:00:53 UTC
>++++ chirp/ft2800.py
>+@@ -205,7 +205,7 @@ class FT2800Radio(YaesuCloneModeRadio):
>+         self.process_mmap()
>+ 
>+     def sync_out(self):
>+-        self.pipe.setTimeout(1)
>++        self.pipe.timeout = 1
>+         self.pipe.setParity("E")
>+         start = time.time()
>+         try:
>
>Property changes on: files/patch-chirp_ft2800.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ft50__ll.py
>===================================================================
>--- files/patch-chirp_ft50__ll.py	(nonexistent)
>+++ files/patch-chirp_ft50__ll.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/ft50_ll.py.orig	2012-02-15 19:46:54 UTC
>++++ chirp/ft50_ll.py
>+@@ -60,7 +60,7 @@ def read_exact(s, count):
>+ def download(radio):
>+     data = ""
>+ 
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.timeout = 1
>+ 
>+     for block in radio._block_lengths:
>+         print "Doing block %i" % block
>
>Property changes on: files/patch-chirp_ft50__ll.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ft817.py
>===================================================================
>--- files/patch-chirp_ft817.py	(nonexistent)
>+++ files/patch-chirp_ft817.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/ft817.py.orig	2014-10-07 21:59:49 UTC
>++++ chirp/ft817.py
>+@@ -329,7 +329,7 @@ class FT817Radio(yaesu_clone.YaesuCloneM
>+     
>+     def _clone_in(self):
>+         # Be very patient with the radio
>+-        self.pipe.setTimeout(2)
>++        self.pipe.timeout = 2
>+     
>+         start = time.time()
>+     
>
>Property changes on: files/patch-chirp_ft817.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ft90.py
>===================================================================
>--- files/patch-chirp_ft90.py	(nonexistent)
>+++ files/patch-chirp_ft90.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/ft90.py.orig	2014-02-22 08:01:32 UTC
>++++ chirp/ft90.py
>+@@ -252,7 +252,7 @@ class FT90Radio(yaesu_clone.YaesuCloneMo
>+     
>+     def _clone_in(self):
>+         # Be very patient with the radio
>+-        self.pipe.setTimeout(4)
>++        self.pipe.timeout = 4
>+         start = time.time()
>+     
>+         data = ""
>
>Property changes on: files/patch-chirp_ft90.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ftm350.py
>===================================================================
>--- files/patch-chirp_ftm350.py	(nonexistent)
>+++ files/patch-chirp_ftm350.py	(working copy)
>@@ -0,0 +1,20 @@
>+--- chirp/ftm350.py.orig	2013-05-28 07:01:34 UTC
>++++ chirp/ftm350.py
>+@@ -109,7 +109,7 @@ def _safe_read(radio, length):
>+ def _clone_in(radio):
>+     data = ""
>+ 
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.timeout = 1
>+     attempts = 30
>+ 
>+     data = memmap.MemoryMap("\x00" * (radio._memsize + 128))
>+@@ -156,7 +156,7 @@ def _clone_in(radio):
>+     return data
>+ 
>+ def _clone_out(radio):
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.timeout = 1
>+ 
>+     # Seriously, WTF Yaesu?
>+     ranges = [
>
>Property changes on: files/patch-chirp_ftm350.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ic9x.py
>===================================================================
>--- files/patch-chirp_ic9x.py	(nonexistent)
>+++ files/patch-chirp_ic9x.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/ic9x.py.orig	2014-10-07 21:59:50 UTC
>++++ chirp/ic9x.py
>+@@ -94,7 +94,7 @@ class IC9xRadio(icf.IcomLiveRadio):
>+         icf.IcomLiveRadio.__init__(self, *args, **kwargs)
>+ 
>+         if self.pipe:
>+-            self.pipe.setTimeout(0.1)
>++            self.pipe.timeout = 0.1
>+ 
>+         self.__memcache = {}
>+         self.__bankcache = {}
>
>Property changes on: files/patch-chirp_ic9x.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_ic9x__ll.py
>===================================================================
>--- files/patch-chirp_ic9x__ll.py	(nonexistent)
>+++ files/patch-chirp_ic9x__ll.py	(working copy)
>@@ -0,0 +1,33 @@
>+--- chirp/ic9x_ll.py.orig	2017-03-02 16:42:21 UTC
>++++ chirp/ic9x_ll.py
>+@@ -419,9 +419,9 @@ def send_magic(pipe):
>+         if resp:
>+             return
>+         print "Switching from 38400 to 4800"
>+-        pipe.setBaudrate(4800)
>++        pipe.baudrate = 4800
>+         resp = _send_magic_4800(pipe)
>+-        pipe.setBaudrate(38400)
>++        pipe.baudrate = 38400
>+         if resp:
>+             return
>+         raise errors.RadioError("Radio not responding")
>+@@ -430,15 +430,15 @@ def send_magic(pipe):
>+         if resp:
>+             return
>+         print "Switching from 4800 to 38400"
>+-        pipe.setBaudrate(38400)
>++        pipe.baudrate = 38400
>+         resp = _send_magic_38400(pipe)
>+         if resp:
>+             return
>+-        pipe.setBaudrate(4800)
>++        pipe.baudrate = 4800
>+         raise errors.RadioError("Radio not responding")
>+     else:
>+         raise errors.InvalidDataError("Radio in unknown state (%i)" % \
>+-                                          pipe.getBaudrate())    
>++                                          pipe.baudrate)    
>+ 
>+ def get_memory_frame(pipe, vfo, number):
>+     """Get the memory frame for @vfo and @number via @pipe"""
>
>Property changes on: files/patch-chirp_ic9x__ll.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_icf.py
>===================================================================
>--- files/patch-chirp_icf.py	(nonexistent)
>+++ files/patch-chirp_icf.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/icf.py.orig	2017-03-02 16:43:26 UTC
>++++ chirp/icf.py
>+@@ -239,7 +239,7 @@ def start_hispeed_clone(radio, cmd):
>+     print "Response:\n%s" % util.hexprint(resp)
>+ 
>+     print "Switching to 38400 baud"
>+-    radio.pipe.setBaudrate(38400)
>++    radio.pipe.baudrate = 38400
>+ 
>+     buf = ("\xFE" * 14) + \
>+         "\xEE\xEF" + \
>
>Property changes on: files/patch-chirp_icf.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_icomciv.py
>===================================================================
>--- files/patch-chirp_icomciv.py	(nonexistent)
>+++ files/patch-chirp_icomciv.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/icomciv.py.orig	2012-09-11 07:00:53 UTC
>++++ chirp/icomciv.py
>+@@ -198,7 +198,7 @@ class IcomCIVRadio(icf.IcomLiveRadio):
>+         if self.pipe:
>+             self._willecho = self._detect_echo()
>+             print "Interface echo: %s" % self._willecho
>+-            self.pipe.setTimeout(1)
>++            self.pipe.timeout = 1
>+ 
>+         #f = Frame()
>+         #f.set_command(0x19, 0x00)
>
>Property changes on: files/patch-chirp_icomciv.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_kenwood__live.py
>===================================================================
>--- files/patch-chirp_kenwood__live.py	(nonexistent)
>+++ files/patch-chirp_kenwood__live.py	(working copy)
>@@ -0,0 +1,20 @@
>+--- chirp/kenwood_live.py.orig	2014-02-22 08:01:32 UTC
>++++ chirp/kenwood_live.py
>+@@ -77,7 +77,7 @@ def get_id(ser):
>+ 
>+     for i in bauds:
>+         print "Trying ID at baud %i" % i
>+-        ser.setBaudrate(i)
>++        ser.baudrate = i
>+         ser.write("\r")
>+         ser.read(25)
>+         resp = command(ser, "ID")
>+@@ -119,7 +119,7 @@ class KenwoodLiveRadio(chirp_common.Live
>+         self.__memcache = {}
>+ 
>+         if self.pipe:
>+-            self.pipe.setTimeout(0.1)
>++            self.pipe.timeout = 0.1
>+             radio_id = get_id(self.pipe)
>+             if radio_id != self.MODEL.split(" ")[0]:
>+                 raise Exception("Radio reports %s (not %s)" % (radio_id,
>
>Property changes on: files/patch-chirp_kenwood__live.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_puxing.py
>===================================================================
>--- files/patch-chirp_puxing.py	(nonexistent)
>+++ files/patch-chirp_puxing.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/puxing.py.orig	2013-07-17 07:00:51 UTC
>++++ chirp/puxing.py
>+@@ -351,7 +351,7 @@ class Puxing777Radio(chirp_common.CloneM
>+ 
>+ def puxing_2r_prep(radio):
>+     """Do the Puxing 2R identification dance"""
>+-    radio.pipe.setTimeout(0.2)
>++    radio.pipe.timeout = 0.2
>+     radio.pipe.write("PROGRAM\x02")
>+     ack = radio.pipe.read(1)
>+     if ack != "\x06":
>
>Property changes on: files/patch-chirp_puxing.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_th__uv3r.py
>===================================================================
>--- files/patch-chirp_th__uv3r.py	(nonexistent)
>+++ files/patch-chirp_th__uv3r.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/th_uv3r.py.orig	2013-07-06 07:01:34 UTC
>++++ chirp/th_uv3r.py
>+@@ -97,7 +97,7 @@ class TYTUV3RRadio(chirp_common.CloneMod
>+         return rf
>+ 
>+     def sync_in(self):
>+-        self.pipe.setTimeout(2)
>++        self.pipe.timeout = 2
>+         self._mmap = tyt_uv3r_download(self)
>+         self.process_mmap()
>+ 
>
>Property changes on: files/patch-chirp_th__uv3r.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_th__uvf8d.py
>===================================================================
>--- files/patch-chirp_th__uvf8d.py	(nonexistent)
>+++ files/patch-chirp_th__uvf8d.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/th_uvf8d.py.orig	2013-11-18 08:01:30 UTC
>++++ chirp/th_uvf8d.py
>+@@ -79,7 +79,7 @@ def tyt_uvf8d_upload(radio):
>+     """Upload to TYT TH-UVF8D"""
>+     data = uvf8d_identify(radio)
>+ 
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.timeout = 1
>+ 
>+     if data != radio._mmap[:32]:
>+         raise errors.RadioError("Model mis-match: \n%s\n%s" % (util.hexprint(data),
>
>Property changes on: files/patch-chirp_th__uvf8d.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_thd72.py
>===================================================================
>--- files/patch-chirp_thd72.py	(nonexistent)
>+++ files/patch-chirp_thd72.py	(working copy)
>@@ -0,0 +1,41 @@
>+--- chirp/thd72.py.orig	2017-03-02 16:44:23 UTC
>++++ chirp/thd72.py
>+@@ -198,7 +198,7 @@ class THD72Radio(chirp_common.CloneModeR
>+ 
>+     def _detect_baud(self):
>+         for baud in [9600, 19200, 38400, 57600]:
>+-            self.pipe.setBaudrate(baud)
>++            self.pipe.baudrate = baud
>+             try:
>+                 self.pipe.write("\r\r")
>+             except:
>+@@ -388,9 +388,11 @@ class THD72Radio(chirp_common.CloneModeR
>+             raise errors.RadioError("No response from self")
>+ 
>+         allblocks = range(self._memsize/256)
>+-        self.pipe.setBaudrate(57600)
>+-        self.pipe.getCTS()
>+-        self.pipe.setRTS()
>++        self.pipe.baudrate = 57600
>++        try:
>++            self.pipe.setRTS()
>++        except AttributeError:
>++            self.pipe.rts = True
>+         self.pipe.read(1)
>+         data = ""
>+         print "reading blocks %d..%d" % (blocks[0], blocks[-1])
>+@@ -424,9 +426,11 @@ class THD72Radio(chirp_common.CloneModeR
>+         if self.command("0M PROGRAM") != "0M":
>+             raise errors.RadioError("No response from self")
>+ 
>+-        self.pipe.setBaudrate(57600)
>+-        self.pipe.getCTS()
>+-        self.pipe.setRTS()
>++        self.pipe.baudrate = 57600
>++        try:
>++            self.pipe.setRTS()
>++        except AttributeError:
>++            self.pipe.rts = True
>+         self.pipe.read(1)
>+         print "writing blocks %d..%d" % (blocks[0], blocks[-1])
>+         total = len(blocks)
>
>Property changes on: files/patch-chirp_thd72.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_thuv1f.py
>===================================================================
>--- files/patch-chirp_thuv1f.py	(nonexistent)
>+++ files/patch-chirp_thuv1f.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/thuv1f.py.orig	2014-01-02 08:01:50 UTC
>++++ chirp/thuv1f.py
>+@@ -68,7 +68,7 @@ def uvf1_upload(radio):
>+     """Upload to TYT TH-UVF1"""
>+     data = uvf1_identify(radio)
>+ 
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.timeout = 1
>+ 
>+     if data != radio._mmap[:16]:
>+         raise errors.RadioError("Unable to talk to this model")
>
>Property changes on: files/patch-chirp_thuv1f.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_tk8102.py
>===================================================================
>--- files/patch-chirp_tk8102.py	(nonexistent)
>+++ files/patch-chirp_tk8102.py	(working copy)
>@@ -0,0 +1,24 @@
>+--- chirp/tk8102.py.orig	2014-10-07 21:59:50 UTC
>++++ chirp/tk8102.py
>+@@ -91,8 +91,8 @@ def do_ident(radio):
>+     ack = radio.pipe.read(1)
>+ 
>+ def do_download(radio):
>+-    radio.pipe.setParity("E")
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.parity = "E"
>++    radio.pipe.timeout = 1
>+     do_ident(radio)
>+ 
>+     data = ""
>+@@ -120,8 +120,8 @@ def do_download(radio):
>+     return memmap.MemoryMap(data)
>+ 
>+ def do_upload(radio):
>+-    radio.pipe.setParity("E")
>+-    radio.pipe.setTimeout(1)
>++    radio.pipe.parity = "E"
>++    radio.pipe.timeout = 1
>+     do_ident(radio)
>+ 
>+     for addr in range(0, 0x0400, 8):
>
>Property changes on: files/patch-chirp_tk8102.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_tmv71.py
>===================================================================
>--- files/patch-chirp_tmv71.py	(nonexistent)
>+++ files/patch-chirp_tmv71.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/tmv71.py.orig	2017-03-02 16:55:55 UTC
>++++ chirp/tmv71.py
>+@@ -32,7 +32,7 @@ class TMV71ARadio(chirp_common.CloneMode
>+ 
>+     def _detect_baud(self):
>+         for baud in [9600, 19200, 38400, 57600]:
>+-            self.pipe.setBaudrate(baud)
>++            self.pipe.baudrate = baud
>+             self.pipe.write("\r\r")
>+             self.pipe.read(32)
>+             try:
>
>Property changes on: files/patch-chirp_tmv71.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_uv5r.py
>===================================================================
>--- files/patch-chirp_uv5r.py	(nonexistent)
>+++ files/patch-chirp_uv5r.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/uv5r.py.orig	2014-10-07 21:59:50 UTC
>++++ chirp/uv5r.py
>+@@ -372,7 +372,7 @@ def _special_block_from_image(radio):
>+ 
>+ def _do_ident(radio, magic):
>+     serial = radio.pipe
>+-    serial.setTimeout(1)
>++    serial.timeout = 1
>+ 
>+     print "Sending Magic: %s" % util.hexprint(magic)
>+     for byte in magic:
>
>Property changes on: files/patch-chirp_uv5r.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_uvb5.py
>===================================================================
>--- files/patch-chirp_uvb5.py	(nonexistent)
>+++ files/patch-chirp_uvb5.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- chirp/uvb5.py.orig	2014-10-07 21:59:50 UTC
>++++ chirp/uvb5.py
>+@@ -170,7 +170,7 @@ struct {
>+ """
>+ 
>+ def do_ident(radio):
>+-    radio.pipe.setTimeout(3)
>++    radio.pipe.timeout = 3
>+     radio.pipe.write("PROGRAM")
>+     ack = radio.pipe.read(1)
>+     if ack != '\x06':
>
>Property changes on: files/patch-chirp_uvb5.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-chirp_vxa700.py
>===================================================================
>--- files/patch-chirp_vxa700.py	(nonexistent)
>+++ files/patch-chirp_vxa700.py	(working copy)
>@@ -0,0 +1,20 @@
>+--- chirp/vxa700.py.orig	2012-09-11 07:00:53 UTC
>++++ chirp/vxa700.py
>+@@ -168,7 +168,7 @@ class VXA700Radio(chirp_common.CloneMode
>+ 
>+     def sync_in(self):
>+         try:
>+-            self.pipe.setTimeout(2)
>++            self.pipe.timeout = 2
>+             self._mmap = _download(self)
>+         except errors.RadioError:
>+             raise
>+@@ -183,7 +183,7 @@ class VXA700Radio(chirp_common.CloneMode
>+         #            0x01 <- air band only
>+         #            0x02 <- air band only
>+         try:
>+-            self.pipe.setTimeout(2)
>++            self.pipe.timeout = 2
>+             _upload(self)
>+         except errors.RadioError:
>+             raise
>
>Property changes on: files/patch-chirp_vxa700.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217499: 180442 | 180452 | 180454