Merge pull request #2155 from dl8dtl/fix_2148_avr_la

Fix GUI for AVR LA

Add one more fuse field to the memory popup, so "fusea" can be handled.
This commit is contained in:
Jörg Wunsch
2026-07-16 23:00:10 +02:00
committed by GitHub
2 changed files with 194 additions and 184 deletions

View File

@@ -72,7 +72,7 @@ def classify_devices():
'avr_de': [],
'other': []
}
avr_de_re = re.compile(r'AVR\d+[DEL][A-Z]\d+')
avr_de_re = re.compile(r'AVR\d+[A-Z][A-Z]\d+')
part = ad.lfirst(ad.cvar.part_list)
while part:
p = ad.ldata_avrpart(part)

View File

@@ -61,10 +61,10 @@
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::Shape::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Shadow::Sunken</enum>
</property>
<property name="lineWidth">
<number>2</number>
@@ -111,10 +111,10 @@
color: rgb(180, 180, 180);</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::Shape::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Shadow::Sunken</enum>
</property>
<property name="lineWidth">
<number>2</number>
@@ -145,10 +145,10 @@ color: rgb(180, 180, 180);</string>
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::Shape::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
<enum>QFrame::Shadow::Sunken</enum>
</property>
<property name="lineWidth">
<number>2</number>
@@ -166,7 +166,7 @@ color: rgb(180, 180, 180);</string>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -195,7 +195,7 @@ color: rgb(180, 180, 180);</string>
<item row="1" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -260,7 +260,7 @@ color: rgb(180, 180, 180);</string>
<item row="3" column="4">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -273,7 +273,7 @@ color: rgb(180, 180, 180);</string>
<item row="1" column="3">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -286,7 +286,7 @@ color: rgb(180, 180, 180);</string>
<item row="0" column="4">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -384,7 +384,7 @@ color: rgb(180, 180, 180);</string>
<item row="1" column="3">
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -407,7 +407,7 @@ color: rgb(180, 180, 180);</string>
<item row="2" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -420,7 +420,7 @@ color: rgb(180, 180, 180);</string>
<item row="4" column="3">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -436,10 +436,10 @@ color: rgb(180, 180, 180);</string>
<item row="0" column="1" rowspan="3">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@@ -460,10 +460,10 @@ color: rgb(180, 180, 180);</string>
<string notr="true">background-color: rgb(255,240,240);</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::Shape::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="lineWidth">
<number>2</number>
@@ -472,7 +472,7 @@ color: rgb(180, 180, 180);</string>
<string>Buffer</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@@ -517,10 +517,10 @@ color: rgb(180, 180, 180);</string>
<string notr="true">background-color: rgb(255,240,240);</string>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::Shape::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="lineWidth">
<number>2</number>
@@ -529,7 +529,7 @@ color: rgb(180, 180, 180);</string>
<string>Buffer</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
@@ -591,7 +591,7 @@ color: rgb(180, 180, 180);</string>
<item row="0" column="0">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -604,7 +604,7 @@ color: rgb(180, 180, 180);</string>
<item row="0" column="2">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -696,7 +696,7 @@ color: rgb(180, 180, 180);</string>
<item row="6" column="3">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -722,7 +722,7 @@ color: rgb(180, 180, 180);</string>
<item row="4" column="2">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -735,7 +735,7 @@ color: rgb(180, 180, 180);</string>
<item row="1" column="3">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -840,7 +840,7 @@ color: rgb(180, 180, 180);</string>
<item row="3" column="3">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -866,7 +866,7 @@ color: rgb(180, 180, 180);</string>
<item row="7" column="3">
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -879,7 +879,7 @@ color: rgb(180, 180, 180);</string>
<item row="5" column="2">
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -905,84 +905,6 @@ color: rgb(180, 180, 180);</string>
<string>Fuses</string>
</property>
<layout class="QGridLayout" name="gridLayout_17">
<item row="6" column="0">
<widget class="QLabel" name="fuse6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse6</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="fval2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="fuse2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse2</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="fval3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="fval0">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="fuse3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse3</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="fval6">
<property name="sizePolicy">
@@ -999,58 +921,6 @@ color: rgb(180, 180, 180);</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="fuse0">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse0</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="fval4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="fuse4">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse4</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="fval5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="fval7">
<property name="sizePolicy">
@@ -1067,6 +937,52 @@ color: rgb(180, 180, 180);</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="fval8">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="fuse2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse2</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="fuse1">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse1</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="fuse7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse7</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="fuse5">
<property name="enabled">
@@ -1077,6 +993,90 @@ color: rgb(180, 180, 180);</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="fval3">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="fval2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="fuse6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse6</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="fuse3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse3</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="fval5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="fval0">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="fval1">
<property name="sizePolicy">
@@ -1093,18 +1093,8 @@ color: rgb(180, 180, 180);</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="fuse7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse7</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="fval8">
<item row="4" column="1">
<widget class="QLineEdit" name="fval4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -1119,6 +1109,26 @@ color: rgb(180, 180, 180);</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="fuse4">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse4</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="fuse0">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Fuse0</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="fuse8">
<property name="enabled">
@@ -1129,16 +1139,16 @@ color: rgb(180, 180, 180);</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="fuse1">
<property name="enabled">
<bool>false</bool>
</property>
<item row="9" column="0">
<widget class="QLabel" name="fuse9">
<property name="text">
<string>Fuse1</string>
<string>Fuse9</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="fval9"/>
</item>
</layout>
</widget>
</item>
@@ -1161,7 +1171,7 @@ color: rgb(180, 180, 180);</string>
<item row="0" column="2">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1197,7 +1207,7 @@ color: rgb(180, 180, 180);</string>
<item row="1" column="0">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1210,7 +1220,7 @@ color: rgb(180, 180, 180);</string>
<item row="3" column="2">
<spacer name="verticalSpacer_11">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1230,10 +1240,10 @@ color: rgb(180, 180, 180);</string>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>