Project

General

Profile

Bug #5275 » chirp_bugfix_5275_v2.patch

Revisited v2 patch for this bug - Mathias Weyland, 11/03/2017 02:28 AM

View differences:

chirp/drivers/alinco.py Thu Oct 19 12:02:09 2017 -0700 → chirp/drivers/alinco.py Fri Nov 03 10:13:57 2017 +0100
577 577
ul16 special_bank[7];
578 578
#seekto 0x1200;
579 579
struct {
580
    u8   unknown;
580
    u8   empty;
581 581
    ul32 freq;
582 582
    u8   mode;
583 583
    u8   step;
......
587 587
    u8   tx_tone;
588 588
    u8   rx_tone;
589 589
    u8   dcs;
590
#seek 3;
590
    ul24 unknown1;
591 591
    u8   skip;
592
#seek 12;
592
    ul32 unknown2;
593
    ul32 unknown3;
594
    ul32 unknown4;
593 595
    char name[32];
594 596
} memory[1000];
595 597
"""
......
740 742
                status.msg = "Uploading to radio"
741 743
                self.status_fn(status)
742 744

  
745
    def _get_empty_flag(self, freq):
746
        if     (freq >=  136000000 and freq <  174000000) or \
747
               (freq >=  400000000 and freq <  470000000) or \
748
               (freq >= 1240000000 and freq < 1300000000):
749
            return 0x02
750
        else:
751
            return 0x01
752

  
753
    def _check_channel_consistency(self, number):
754
        _mem = self._memobj.memory[number]
755
        if _mem.empty != 0x00:
756
            if _mem.unknown1 == 0xffffff:
757
                # Previous versions of this code have skipped the unknown
758
                # fields. They contain bytes of value if the channel is empty and
759
                # thus those bytes remain 0xff when the channel is put to use.
760
                # The radio is totally fine with this but the Alinco programming
761
                # software is not (see #5275). Here, we check for this and
762
                # report if it is encountered.
763
                LOG.warning("Channel %d is inconsistent: Found 0xff in non-empty channel. Touch channel to fix." % number)
764

  
765
            if _mem.empty != self._get_empty_flag(_mem.freq):
766
                LOG.warning("Channel %d is inconsistent: Found out of band frequency. Touch channel to fix." % number)
767

  
743 768
    def process_mmap(self):
744 769
        self._memobj = bitwise.parse(DJG7EG_MEM_FORMAT, self._mmap)
770
        # We check all channels for corruption (see bug #5275) but we don't fix
771
        # it automatically because it would be unpolite to modify something on a
772
        # read operation. A log message is emitted though for the user to take
773
        # actions.
774
        for number in range(len(self._memobj.memory)):
775
            self._check_channel_consistency(number)
745 776

  
746 777
    def get_memory(self, number):
747 778
        _mem = self._memobj.memory[number]
748 779
        mem = chirp_common.Memory()
749 780
        mem.number = number
750
        if _mem.unknown == 0:
781
        if _mem.empty == 0:
751 782
            mem.empty = True
752 783
        else:
753 784
            mem.freq = int(_mem.freq)
......
774 805
        # Get a low-level memory object mapped to the image
775 806
        _mem = self._memobj.memory[mem.number]
776 807
        if mem.empty:
777
            _mem.unknown = 0x00  # Maybe 0 is empty, 2 is used?
808
            _mem.set_raw("\xff" * (_mem.size()/8))
809
            _mem.empty = 0x00
778 810
        else:
779
            _mem.unknown = 0x02
811
            _mem.empty = self._get_empty_flag(mem.freq)
780 812
            _mem.freq = mem.freq
781 813
            _mem.mode = self.MODES.index(mem.mode)
782 814
            _mem.step = self.STEPS.index(mem.tuning_step)
......
819 851
            _mem.dcs = DCS_CODES[self.VENDOR].index(mem.dtcs)
820 852
            _mem.skip = (mem.skip == "S")
821 853
            _mem.name = "\x00".join(mem.name).ljust(32, "\x00")
854
            _mem.unknown1 = 0x3e001c
855
            _mem.unknown2 = 0x0000000a
856
            _mem.unknown3 = 0x00000000
857
            _mem.unknown4 = 0x00000000
(4-4/5)