From 5f3dc745532c08e2c482b4c19ac9292d91475622 Mon Sep 17 00:00:00 2001
From: Joerg Wunsch <j@uriah.heep.sax.de>
Date: Sun, 7 Apr 2024 00:15:32 +0200
Subject: [PATCH] Handle fuse names of avrX devices

For avrX devices, fuses are named according to the datasheet,
rather than their internal naming "fuse<N>". So instead, use
the "memoffset" (which corresponds to <N>).
---
 src/python/adgui.py | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/python/adgui.py b/src/python/adgui.py
index 35b4bd65..c9998d23 100755
--- a/src/python/adgui.py
+++ b/src/python/adgui.py
@@ -251,7 +251,13 @@ def dissect_fuse(config: list, fuse: str, val: int):
     result = []
     for i in config:
         # 'name', 'vlist', 'memstr', 'memoffset', 'mask', 'lsh', 'initval', 'ccomment'
-        if i['memstr'] != fuse:
+        s = i['memstr']
+        if s == 'lock':
+            continue
+        if s.find('fuse') == -1:
+            # avrX where fuseN is an alias only
+            s = 'fuse' + str(i['memoffset']) # make it fuseN
+        if s != fuse:
             continue
         name = i['name']
         vlist = i['vlist']
@@ -276,7 +282,13 @@ def default_fuse(config: list, fuse: str):
     resval = 0xff
     for i in config:
         # 'name', 'vlist', 'memstr', 'memoffset', 'mask', 'lsh', 'initval', 'ccomment'
-        if i['memstr'] != fuse:
+        s = i['memstr']
+        if s == 'lock':
+            continue
+        if s.find('fuse') == -1:
+            # avrX where fuseN is an alias only
+            s = 'fuse' + str(i['memoffset']) # make it fuseN
+        if s != fuse:
             continue
         shift = i['lsh']
         initval = i['initval']
@@ -300,11 +312,18 @@ def synthesize_fuse(config: list, fuse: str, vallist: list) -> int:
     itemlist = []
     for ele in vallist:
         itemlist.append(ele[1])
-    resval = 0
+    resval = 0xff
     for i in config:
         # 'name', 'vlist', 'memstr', 'memoffset', 'mask', 'lsh', 'initval', 'ccomment'
-        if i['memstr'] != fuse:
+        s = i['memstr']
+        if s == 'lock':
             continue
+        if s.find('fuse') == -1:
+            # avrX where fuseN is an alias only
+            s = 'fuse' + str(i['memoffset']) # make it fuseN
+        if s != fuse:
+            continue
+        resval &= ~i['mask']
         vlist = i['vlist']
         shift = i['lsh']
         for j in vlist:
@@ -388,7 +407,13 @@ class FusePopup():
         self.widgets = []
         for i in self.config:
             # 'name', 'vlist', 'memstr', 'memoffset', 'mask', 'lsh', 'initval', 'ccomment'
-            if i['memstr'] != self.fusename:
+            s = i['memstr']
+            if s == 'lock':
+                continue
+            if s.find('fuse') == -1:
+                # avrX where fuseN is an alias only
+                s = 'fuse' + str(i['memoffset']) # make it fuseN
+            if s != self.fusename:
                 continue
             # add one row to grid layout, label with name, combobox with values
             name = i['name']