[chirp_devel] [PATCH] [RT22] Remove FRS and PMR446 Frequency Tables

[Jim Unroe]

Here are the image files that can be used to test with.

Jim KC9HI

On Thu, Dec 17, 2020 at 4:31 PM Jim Unroe <rock.unroe at gmail.com> wrote:
>
> # HG changeset patch
> # User Jim Unroe <rock.unroe at gmail.com>
> # Date 1608240558 18000
> #      Thu Dec 17 16:29:18 2020 -0500
> # Node ID 3ecdabd2fa7139961929bdca5060bb79b73a0ac4
> # Parent  16374d1150ae44d39f45b1bb11314bb99f1ccb4b
> [RT22] Remove FRS and PMR446 Frequency Tables
>
> This driver was coded in a way that erasing a memory row would preselect the
> appropriate FRS or PMR446 frequency, bandwidth and transmit power level. This
> would similar to how the OEM programming software functions (actually the OEM
> software has the frequencies, bandwidth and power level settings fixed so that
> they cannot be edited).
>
> While getting ready to submit test images for these models, I rediscovered that
> the CHIRP test suite regards this as a memory that can't be erased and reports
> an error.
>
> This patch removes the frequency tables and other code related to this so that
> the test suite will pass when tested with the related "image" files.
>
> related to #6467
>
> diff -r 16374d1150ae -r 3ecdabd2fa71 chirp/drivers/retevis_rt22.py
> --- a/chirp/drivers/retevis_rt22.py     Wed Dec 16 23:00:32 2020 -0500
> +++ b/chirp/drivers/retevis_rt22.py     Thu Dec 17 16:29:18 2020 -0500
> @@ -103,16 +103,6 @@
>  VALID_CHARS = chirp_common.CHARSET_ALPHANUMERIC + \
>      "`{|}!\"#$%&'()*+,-./:;<=>?@[]^_"
>
> -FRS_FREQS = [462.5625, 462.5875, 462.6125, 462.6375,
> -             462.6625, 462.6250, 462.7250, 462.6875,
> -             462.7125, 462.5500, 462.5750, 462.6000,
> -             462.6500, 462.6750, 462.7000, 462.7250]
> -
> -PMR_FREQS = [446.00625, 446.01875, 446.03125, 446.04375,
> -             446.05625, 446.06875, 446.08125, 446.09375,
> -             446.10625, 446.11875, 446.13125, 446.14375,
> -             446.15625, 446.16875, 446.18125, 446.19375]
> -
>
>  def _ident_from_data(data):
>      return data[0x1B8:0x1C0]
> @@ -549,19 +539,7 @@
>          _skp = self._memobj.skipflags[bytepos]
>
>          if mem.empty:
> -            _mem.set_raw("\xFF" * 13 + "\x00" * 3)
> -            if self.MODEL == "RT22FRS":
> -                FRS_FREQ = int(FRS_FREQS[mem.number - 1] * 100000)
> -                _mem.rxfreq = _mem.txfreq = FRS_FREQ
> -                _mem.wide = False
> -                _mem.highpower = True
> -            elif self.MODEL == "RT622":
> -                PMR_FREQ = int(PMR_FREQS[mem.number - 1] * 100000)
> -                _mem.rxfreq = _mem.txfreq = PMR_FREQ
> -                _mem.wide = False
> -                _mem.highpower = False
> -            else:
> -                _mem.set_raw("\xFF" * (_mem.size() / 8))
> +            _mem.set_raw("\xFF" * (_mem.size() / 8))
>              return
>
>          _mem.rxfreq = mem.freq / 10
> @@ -735,12 +713,8 @@
>      VENDOR = "Retevis"
>      MODEL = "RT22FRS"
>
> -    _fileid = ["P3207!", ]
> -
>
>  @directory.register
>  class RT622(RT22Radio):
>      VENDOR = "Retevis"
>      MODEL = "RT622"
> -
> -    _fileid = ["P3207!", ]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Retevis_RT22FRS.img
Type: application/octet-stream
Size: 1197 bytes
Desc: not available
Url : http://intrepid.danplanet.com/pipermail/chirp_devel/attachments/20201217/94859463/attachment-0002.img 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Retevis_RT622.img
Type: application/octet-stream
Size: 1189 bytes
Desc: not available
Url : http://intrepid.danplanet.com/pipermail/chirp_devel/attachments/20201217/94859463/attachment-0003.img