(nw) be less eager to shadow variables in layouts, make highlights visible on white squares in modena

This commit is contained in:
Vas Crabb 2018-07-31 23:54:12 +10:00
parent 781d943b36
commit 4c0c840f96
9 changed files with 103 additions and 147 deletions

View File

@ -675,18 +675,18 @@ Two horizontally separated, clickable, four-by-four keypads (inside a ``group``
or ``view`` element):: or ``view`` element)::
<repeat count="2"> <repeat count="2">
<param name="col" start="0" increment="4" /> <param name="group" start="0" increment="4" />
<param name="x" start="10" increment="530" /> <param name="padx" start="10" increment="530" />
<param name="mask" start="0x01" lshift="4" /> <param name="mask" start="0x01" lshift="4" />
<repeat count="4"> <repeat count="4">
<param name="row" start="0" increment="1" /> <param name="row" start="0" increment="1" />
<param name="y" start="100" increment="110" /> <param name="y" start="100" increment="110" />
<repeat count="4"> <repeat count="4">
<param name="col" start="~col~" increment="1" /> <param name="col" start="~group~" increment="1" />
<param name="x" start="~x~" increment="110" /> <param name="btnx" start="~padx~" increment="110" />
<param name="mask" start="~mask~" lshift="1" /> <param name="mask" start="~mask~" lshift="1" />
<bezel element="btn~row~~col~" inputtag="row~row~" inputmask="~mask~"> <bezel element="btn~row~~col~" inputtag="row~row~" inputmask="~mask~">
<bounds x="~x~" y="~y~" width="80" height="80" /> <bounds x="~btnx~" y="~y~" width="80" height="80" />
</bezel> </bezel>
</repeat> </repeat>
</repeat> </repeat>
@ -697,19 +697,19 @@ top right, ``btn30`` in the bottom left, and ``btn37`` in the bottom right,
counting in between. The four rows are connected to I/O ports ``row0``, counting in between. The four rows are connected to I/O ports ``row0``,
``row1``, ``row2``, and ``row3``, from top to bottom. The columns are connected ``row1``, ``row2``, and ``row3``, from top to bottom. The columns are connected
to consecutive I/O port bits, starting with the least significant bit on the to consecutive I/O port bits, starting with the least significant bit on the
left. Note that the ``col``, ``x`` and ``mask`` parameters in the innermost left. Note that the ``mask`` parameter in the innermost ``repeat`` element
``repeat`` element take their initial values from the correspondingly named takes its initial value from the correspondingly named parameter in the
parameters in the enclosing scope, but do not modify them. enclosing scope, but does not modify it.
Generating a chequerboard pattern with alternating alpha values 0.4 and 0.2 Generating a chequerboard pattern with alternating alpha values 0.4 and 0.2
(inside a ``group`` or ``view`` element):: (inside a ``group`` or ``view`` element)::
<repeat count="4"> <repeat count="4">
<param name="ipty" start="3" increment="20" /> <param name="pairy" start="3" increment="20" />
<param name="iptno" start="7" increment="-2" /> <param name="pairno" start="7" increment="-2" />
<repeat count="2"> <repeat count="2">
<param name="ipty" start="~ipty~" increment="10" /> <param name="rowy" start="~pairy~" increment="10" />
<param name="iptno" start="~iptno~" increment="-1" /> <param name="rowno" start="~pairno~" increment="-1" />
<param name="lalpha" start="0.4" increment="-0.2" /> <param name="lalpha" start="0.4" increment="-0.2" />
<param name="ralpha" start="0.2" increment="0.2" /> <param name="ralpha" start="0.2" increment="0.2" />
<repeat count="4"> <repeat count="4">
@ -717,20 +717,23 @@ Generating a chequerboard pattern with alternating alpha values 0.4 and 0.2
<param name="rx" start="13" increment="20" /> <param name="rx" start="13" increment="20" />
<param name="lmask" start="0x01" lshift="2" /> <param name="lmask" start="0x01" lshift="2" />
<param name="rmask" start="0x02" lshift="2" /> <param name="rmask" start="0x02" lshift="2" />
<bezel element="hl" inputtag="board:IN.~iptno~" inputmask="~lmask~"> <bezel element="hl" inputtag="board:IN.~rowno~" inputmask="~lmask~">
<bounds x="~lx~" y="~ipty~" width="10" height="10" /> <bounds x="~lx~" y="~rowy~" width="10" height="10" />
<color alpha="~lalpha~" /> <color alpha="~lalpha~" />
</bezel> </bezel>
<bezel element="hl" inputtag="board:IN.~iptno~" inputmask="~rmask~"> <bezel element="hl" inputtag="board:IN.~rowno~" inputmask="~rmask~">
<bounds x="~rx~" y="~ipty~" width="10" height="10" /> <bounds x="~rx~" y="~rowy~" width="10" height="10" />
<color alpha="~ralpha~" /> <color alpha="~ralpha~" />
</bezel> </bezel>
</repeat> </repeat>
</repeat> </repeat>
</repeat> </repeat>
Rows are connected to I/O ports ``board:IN.7`` at the top to ``board.IN.0`` at The outermost ``repeat`` element generates a group of two rows on each
the bottom. iteration; the next ``repeat`` element generates an individual row on each
iteration; the innermost ``repeat`` element produces two horizontally adjacent
tiles on each iteration. Rows are connected to I/O ports ``board:IN.7`` at the
top to ``board.IN.0`` at the bottom.
.. _layout-autogen: .. _layout-autogen:

View File

@ -33,11 +33,11 @@
<repeat count="4"> <repeat count="4">
<param name="xl" start="63" increment="173" /> <param name="xl" start="63" increment="173" />
<param name="xs" start="97.6" increment="173" /> <param name="xsbase" start="97.6" increment="173" />
<bezel element="static_white"><bounds x="~xl~" y="129" width="2" height="10" /></bezel> <bezel element="static_white"><bounds x="~xl~" y="129" width="2" height="10" /></bezel>
<repeat count="4"> <repeat count="4">
<param name="xs" start="~xs~" increment="34.6" /> <param name="xs" start="~xsbase~" increment="34.6" />
<bezel element="static_white"><bounds x="~xs~" y="135" width="2" height="4" /></bezel> <bezel element="static_white"><bounds x="~xs~" y="135" width="2" height="4" /></bezel>
</repeat> </repeat>
</repeat> </repeat>
@ -48,12 +48,12 @@
<!-- DL1416A DS1/DS2/DS3/DS4/DS5 --> <!-- DL1416A DS1/DS2/DS3/DS4/DS5 -->
<repeat count="5"> <repeat count="5">
<param name="x" start="65" increment="139" /> <param name="modulex" start="65" increment="139" />
<param name="digitno" start="0" increment="4" /> <param name="moduleno" start="0" increment="4" />
<repeat count="4"> <repeat count="4">
<param name="digitno" start="~digitno~" increment="1" /> <param name="digitno" start="~moduleno~" increment="1" />
<param name="x" start="~x~" increment="34" /> <param name="digitx" start="~modulex~" increment="34" />
<bezel name="digit~digitno~" element="digit"><bounds x="~x~" y="80" width="25" height="40" /></bezel> <bezel name="digit~digitno~" element="digit"><bounds x="~digitx~" y="80" width="25" height="40" /></bezel>
</repeat> </repeat>
</repeat> </repeat>
</view> </view>

View File

@ -225,20 +225,20 @@ Intel INTELLEC® 4/MOD 4 layout
<cpanel element="label_reset_cpu"><bounds left="727" top="361" right="783" bottom="368" /></cpanel> <cpanel element="label_reset_cpu"><bounds left="727" top="361" right="783" bottom="368" /></cpanel>
<repeat count="3"> <repeat count="3">
<param name="labelnum" start="11" increment="-4" /> <param name="groupnum" start="11" increment="-4" />
<param name="ledpos" start="81" increment="156" /> <param name="ledpos" start="81" increment="156" />
<param name="nybble" start="3" increment="-1" /> <param name="nybble" start="3" increment="-1" />
<param name="switchpos" start="74" increment="156" /> <param name="switchpos" start="74" increment="156" />
<param name="mask" start="0x0800" rshift="4" /> <param name="groupmask" start="0x0800" rshift="4" />
<cpanel element="label_a~nybble~"> <cpanel element="label_a~nybble~">
<bounds x="~ledpos~" y="63" width="104" height="7" /> <bounds x="~ledpos~" y="63" width="104" height="7" />
</cpanel> </cpanel>
<repeat count="4"> <repeat count="4">
<param name="labelnum" start="~labelnum~" increment="-1" /> <param name="labelnum" start="~groupnum~" increment="-1" />
<param name="ledpos" start="~ledpos~" increment="31" /> <param name="ledpos" start="~ledpos~" increment="31" />
<param name="switchpos" start="~switchpos~" increment="31" /> <param name="switchpos" start="~switchpos~" increment="31" />
<param name="bit" start="3" increment="-1" /> <param name="bit" start="3" increment="-1" />
<param name="mask" start="~mask~" rshift="1" /> <param name="bitmask" start="~groupmask~" rshift="1" />
<cpanel element="label_~labelnum~"> <cpanel element="label_~labelnum~">
<bounds x="~ledpos~" y="71" width="11" height="7" /> <bounds x="~ledpos~" y="71" width="11" height="7" />
</cpanel> </cpanel>
@ -248,7 +248,7 @@ Intel INTELLEC® 4/MOD 4 layout
<cpanel name="led_address_a~nybble~_~bit~" element="led"> <cpanel name="led_address_a~nybble~_~bit~" element="led">
<bounds x="~ledpos~" y="79" width="11" height="7" /> <bounds x="~ledpos~" y="79" width="11" height="7" />
</cpanel> </cpanel>
<cpanel element="switch" inputtag="ADDRDAT" inputmask="~mask~"> <cpanel element="switch" inputtag="ADDRDAT" inputmask="~bitmask~">
<bounds x="~switchpos~" y="240" width="25" height="46" /> <bounds x="~switchpos~" y="240" width="25" height="46" />
</cpanel> </cpanel>
</repeat> </repeat>
@ -288,19 +288,19 @@ Intel INTELLEC® 4/MOD 4 layout
</cpanel> </cpanel>
<repeat count="2"> <repeat count="2">
<param name="xpos" start="81" increment="156" /> <param name="groupx" start="81" increment="156" />
<param name="mnybble" start="1" increment="1" /> <param name="mnybble" start="1" increment="1" />
<param name="xnybble" start="2" increment="1" /> <param name="xnybble" start="2" increment="1" />
<param name="mbit" start="7" increment="-4" /> <param name="groupbit" start="7" increment="-4" />
<cpanel element="label_m~mnybble~"> <cpanel element="label_m~mnybble~">
<bounds x="~xpos~" y="112" width="104" height="7" /> <bounds x="~groupx~" y="112" width="104" height="7" />
</cpanel> </cpanel>
<cpanel element="label_x~xnybble~"> <cpanel element="label_x~xnybble~">
<bounds x="~xpos~" y="161" width="104" height="7" /> <bounds x="~groupx~" y="161" width="104" height="7" />
</cpanel> </cpanel>
<repeat count="4"> <repeat count="4">
<param name="xpos" start="~xpos~" increment="31" /> <param name="xpos" start="~groupx~" increment="31" />
<param name="mbit" start="~mbit~" increment="-1" /> <param name="mbit" start="~groupbit~" increment="-1" />
<param name="bit" start="3" increment="-1" /> <param name="bit" start="3" increment="-1" />
<cpanel element="label_~mbit~"> <cpanel element="label_~mbit~">
<bounds x="~xpos~" y="120" width="11" height="7" /> <bounds x="~xpos~" y="120" width="11" height="7" />
@ -318,13 +318,13 @@ Intel INTELLEC® 4/MOD 4 layout
</repeat> </repeat>
<repeat count="2"> <repeat count="2">
<param name="xpos" start="393" increment="156" /> <param name="groupx" start="393" increment="156" />
<param name="nybble" start="2" increment="1" /> <param name="nybble" start="2" increment="1" />
<cpanel element="label_x~nybble~"> <cpanel element="label_x~nybble~">
<bounds x="~xpos~" y="161" width="104" height="7" /> <bounds x="~groupx~" y="161" width="104" height="7" />
</cpanel> </cpanel>
<repeat count="4"> <repeat count="4">
<param name="xpos" start="~xpos~" increment="31" /> <param name="xpos" start="~groupx~" increment="31" />
<param name="bit" start="3" increment="-1" /> <param name="bit" start="3" increment="-1" />
<cpanel element="label_~bit~"> <cpanel element="label_~bit~">
<bounds x="~xpos~" y="169" width="11" height="7" /> <bounds x="~xpos~" y="169" width="11" height="7" />

View File

@ -220,20 +220,20 @@ Intel INTELLEC® 4/MOD 40 layout
<cpanel element="label_reset_cpu"><bounds left="727" top="361" right="783" bottom="368" /></cpanel> <cpanel element="label_reset_cpu"><bounds left="727" top="361" right="783" bottom="368" /></cpanel>
<repeat count="3"> <repeat count="3">
<param name="labelnum" start="11" increment="-4" /> <param name="groupnum" start="11" increment="-4" />
<param name="ledpos" start="81" increment="156" /> <param name="ledpos" start="81" increment="156" />
<param name="nybble" start="3" increment="-1" /> <param name="nybble" start="3" increment="-1" />
<param name="switchpos" start="74" increment="156" /> <param name="switchpos" start="74" increment="156" />
<param name="mask" start="0x0800" rshift="4" /> <param name="groupmask" start="0x0800" rshift="4" />
<cpanel element="label_a~nybble~"> <cpanel element="label_a~nybble~">
<bounds x="~ledpos~" y="63" width="104" height="7" /> <bounds x="~ledpos~" y="63" width="104" height="7" />
</cpanel> </cpanel>
<repeat count="4"> <repeat count="4">
<param name="labelnum" start="~labelnum~" increment="-1" /> <param name="labelnum" start="~groupnum~" increment="-1" />
<param name="ledpos" start="~ledpos~" increment="31" /> <param name="ledpos" start="~ledpos~" increment="31" />
<param name="switchpos" start="~switchpos~" increment="31" /> <param name="switchpos" start="~switchpos~" increment="31" />
<param name="bit" start="3" increment="-1" /> <param name="bit" start="3" increment="-1" />
<param name="mask" start="~mask~" rshift="1" /> <param name="bitmask" start="~groupmask~" rshift="1" />
<cpanel element="label_~labelnum~"> <cpanel element="label_~labelnum~">
<bounds x="~ledpos~" y="71" width="11" height="7" /> <bounds x="~ledpos~" y="71" width="11" height="7" />
</cpanel> </cpanel>
@ -243,7 +243,7 @@ Intel INTELLEC® 4/MOD 40 layout
<cpanel name="led_address_a~nybble~_~bit~" element="led"> <cpanel name="led_address_a~nybble~_~bit~" element="led">
<bounds x="~ledpos~" y="79" width="11" height="7" /> <bounds x="~ledpos~" y="79" width="11" height="7" />
</cpanel> </cpanel>
<cpanel element="switch" inputtag="ADDRDAT" inputmask="~mask~"> <cpanel element="switch" inputtag="ADDRDAT" inputmask="~bitmask~">
<bounds x="~switchpos~" y="240" width="25" height="46" /> <bounds x="~switchpos~" y="240" width="25" height="46" />
</cpanel> </cpanel>
</repeat> </repeat>
@ -283,19 +283,19 @@ Intel INTELLEC® 4/MOD 40 layout
</cpanel> </cpanel>
<repeat count="2"> <repeat count="2">
<param name="xpos" start="81" increment="156" /> <param name="groupx" start="81" increment="156" />
<param name="mnybble" start="1" increment="1" /> <param name="mnybble" start="1" increment="1" />
<param name="xnybble" start="2" increment="1" /> <param name="xnybble" start="2" increment="1" />
<param name="mbit" start="7" increment="-4" /> <param name="groupbit" start="7" increment="-4" />
<cpanel element="label_m~mnybble~"> <cpanel element="label_m~mnybble~">
<bounds x="~xpos~" y="112" width="104" height="7" /> <bounds x="~groupx~" y="112" width="104" height="7" />
</cpanel> </cpanel>
<cpanel element="label_x~xnybble~"> <cpanel element="label_x~xnybble~">
<bounds x="~xpos~" y="161" width="104" height="7" /> <bounds x="~groupx~" y="161" width="104" height="7" />
</cpanel> </cpanel>
<repeat count="4"> <repeat count="4">
<param name="xpos" start="~xpos~" increment="31" /> <param name="xpos" start="~groupx~" increment="31" />
<param name="mbit" start="~mbit~" increment="-1" /> <param name="mbit" start="~groupbit~" increment="-1" />
<param name="bit" start="3" increment="-1" /> <param name="bit" start="3" increment="-1" />
<cpanel element="label_~mbit~"> <cpanel element="label_~mbit~">
<bounds x="~xpos~" y="120" width="11" height="7" /> <bounds x="~xpos~" y="120" width="11" height="7" />
@ -313,13 +313,13 @@ Intel INTELLEC® 4/MOD 40 layout
</repeat> </repeat>
<repeat count="2"> <repeat count="2">
<param name="xpos" start="393" increment="156" /> <param name="groupx" start="393" increment="156" />
<param name="nybble" start="2" increment="1" /> <param name="nybble" start="2" increment="1" />
<cpanel element="label_x~nybble~"> <cpanel element="label_x~nybble~">
<bounds x="~xpos~" y="161" width="104" height="7" /> <bounds x="~groupx~" y="161" width="104" height="7" />
</cpanel> </cpanel>
<repeat count="4"> <repeat count="4">
<param name="xpos" start="~xpos~" increment="31" /> <param name="xpos" start="~groupx~" increment="31" />
<param name="bit" start="3" increment="-1" /> <param name="bit" start="3" increment="-1" />
<cpanel element="label_~bit~"> <cpanel element="label_~bit~">
<bounds x="~xpos~" y="169" width="11" height="7" /> <bounds x="~xpos~" y="169" width="11" height="7" />

View File

@ -186,10 +186,10 @@
<!-- chessboard LEDs --> <!-- chessboard LEDs -->
<repeat count="8"> <repeat count="8">
<param name="ledy" start="81.3" increment="-10" /> <param name="ledy" start="81.3" increment="-10" />
<param name="ledno" start="0" increment="8" /> <param name="rowno" start="0" increment="8" />
<repeat count="8"> <repeat count="8">
<param name="ledx" start="11.2" increment="10" /> <param name="ledx" start="11.2" increment="10" />
<param name="ledno" start="~ledno~" increment="1" /> <param name="ledno" start="~rowno~" increment="1" />
<bezel name="led~ledno~" element="led"> <bezel name="led~ledno~" element="led">
<bounds x="~ledx~" y="~ledy~" width="1.5" height="1.5" /> <bounds x="~ledx~" y="~ledy~" width="1.5" height="1.5" />
</bezel> </bezel>
@ -198,11 +198,11 @@
<!-- chessboard sensors --> <!-- chessboard sensors -->
<repeat count="4"> <repeat count="4">
<param name="ipty" start="3" increment="20" /> <param name="pairy" start="3" increment="20" />
<param name="iptno" start="7" increment="-2" /> <param name="pairno" start="7" increment="-2" />
<repeat count="2"> <repeat count="2">
<param name="ipty" start="~ipty~" increment="10" /> <param name="rowy" start="~pairy~" increment="10" />
<param name="iptno" start="~iptno~" increment="-1" /> <param name="rowno" start="~pairno~" increment="-1" />
<param name="lalpha" start="0.4" increment="-0.2" /> <param name="lalpha" start="0.4" increment="-0.2" />
<param name="ralpha" start="0.2" increment="0.2" /> <param name="ralpha" start="0.2" increment="0.2" />
<repeat count="4"> <repeat count="4">
@ -210,12 +210,12 @@
<param name="rx" start="13" increment="20" /> <param name="rx" start="13" increment="20" />
<param name="lmask" start="0x01" lshift="2" /> <param name="lmask" start="0x01" lshift="2" />
<param name="rmask" start="0x02" lshift="2" /> <param name="rmask" start="0x02" lshift="2" />
<bezel element="hl" inputtag="board:IN.~iptno~" inputmask="~lmask~"> <bezel element="hl" inputtag="board:IN.~rowno~" inputmask="~lmask~">
<bounds x="~lx~" y="~ipty~" width="10" height="10" /> <bounds x="~lx~" y="~rowy~" width="10" height="10" />
<color alpha="~lalpha~" /> <color alpha="~lalpha~" />
</bezel> </bezel>
<bezel element="hl" inputtag="board:IN.~iptno~" inputmask="~rmask~"> <bezel element="hl" inputtag="board:IN.~rowno~" inputmask="~rmask~">
<bounds x="~rx~" y="~ipty~" width="10" height="10" /> <bounds x="~rx~" y="~rowy~" width="10" height="10" />
<color alpha="~ralpha~" /> <color alpha="~ralpha~" />
</bezel> </bezel>
</repeat> </repeat>

View File

@ -21,7 +21,7 @@
</text> </text>
<disk state="1"> <disk state="1">
<bounds x="0.12" y="0.12" width="0.76" height="0.76" /> <bounds x="0.12" y="0.12" width="0.76" height="0.76" />
<color red="1.0" green="1.0" blue="1.0" /> <color red="0.5" green="0.5" blue="0.5" />
</disk> </disk>
</element> </element>
<element name="hlb" defstate="0"> <element name="hlb" defstate="0">
@ -202,77 +202,30 @@
<!-- chessboard sensors --> <!-- chessboard sensors -->
<bezel element="hl" inputtag="board:IN.7" inputmask="0x01"><bounds x="3" y="3" width="10" height="10" /><color alpha="0.4" /></bezel> <repeat count="4">
<bezel element="hl" inputtag="board:IN.7" inputmask="0x02"><bounds x="13" y="3" width="10" height="10" /><color alpha="0.2" /></bezel> <param name="pairy" start="3" increment="20" />
<bezel element="hl" inputtag="board:IN.7" inputmask="0x04"><bounds x="23" y="3" width="10" height="10" /><color alpha="0.4" /></bezel> <param name="pairno" start="7" increment="-2" />
<bezel element="hl" inputtag="board:IN.7" inputmask="0x08"><bounds x="33" y="3" width="10" height="10" /><color alpha="0.2" /></bezel> <repeat count="2">
<bezel element="hl" inputtag="board:IN.7" inputmask="0x10"><bounds x="43" y="3" width="10" height="10" /><color alpha="0.4" /></bezel> <param name="rowy" start="~pairy~" increment="10" />
<bezel element="hl" inputtag="board:IN.7" inputmask="0x20"><bounds x="53" y="3" width="10" height="10" /><color alpha="0.2" /></bezel> <param name="rowno" start="~pairno~" increment="-1" />
<bezel element="hl" inputtag="board:IN.7" inputmask="0x40"><bounds x="63" y="3" width="10" height="10" /><color alpha="0.4" /></bezel> <param name="lalpha" start="0.2" increment="0.3" />
<bezel element="hl" inputtag="board:IN.7" inputmask="0x80"><bounds x="73" y="3" width="10" height="10" /><color alpha="0.2" /></bezel> <param name="ralpha" start="0.5" increment="-0.3" />
<repeat count="4">
<bezel element="hl" inputtag="board:IN.6" inputmask="0x01"><bounds x="3" y="13" width="10" height="10" /><color alpha="0.2" /></bezel> <param name="lx" start="3" increment="20" />
<bezel element="hl" inputtag="board:IN.6" inputmask="0x02"><bounds x="13" y="13" width="10" height="10" /><color alpha="0.4" /></bezel> <param name="rx" start="13" increment="20" />
<bezel element="hl" inputtag="board:IN.6" inputmask="0x04"><bounds x="23" y="13" width="10" height="10" /><color alpha="0.2" /></bezel> <param name="lmask" start="0x01" lshift="2" />
<bezel element="hl" inputtag="board:IN.6" inputmask="0x08"><bounds x="33" y="13" width="10" height="10" /><color alpha="0.4" /></bezel> <param name="rmask" start="0x02" lshift="2" />
<bezel element="hl" inputtag="board:IN.6" inputmask="0x10"><bounds x="43" y="13" width="10" height="10" /><color alpha="0.2" /></bezel> <bezel element="hl" inputtag="board:IN.~rowno~" inputmask="~lmask~">
<bezel element="hl" inputtag="board:IN.6" inputmask="0x20"><bounds x="53" y="13" width="10" height="10" /><color alpha="0.4" /></bezel> <bounds x="~lx~" y="~rowy~" width="10" height="10" />
<bezel element="hl" inputtag="board:IN.6" inputmask="0x40"><bounds x="63" y="13" width="10" height="10" /><color alpha="0.2" /></bezel> <color alpha="~lalpha~" />
<bezel element="hl" inputtag="board:IN.6" inputmask="0x80"><bounds x="73" y="13" width="10" height="10" /><color alpha="0.4" /></bezel> </bezel>
<bezel element="hl" inputtag="board:IN.~rowno~" inputmask="~rmask~">
<bezel element="hl" inputtag="board:IN.5" inputmask="0x01"><bounds x="3" y="23" width="10" height="10" /><color alpha="0.4" /></bezel> <bounds x="~rx~" y="~rowy~" width="10" height="10" />
<bezel element="hl" inputtag="board:IN.5" inputmask="0x02"><bounds x="13" y="23" width="10" height="10" /><color alpha="0.2" /></bezel> <color alpha="~ralpha~" />
<bezel element="hl" inputtag="board:IN.5" inputmask="0x04"><bounds x="23" y="23" width="10" height="10" /><color alpha="0.4" /></bezel> </bezel>
<bezel element="hl" inputtag="board:IN.5" inputmask="0x08"><bounds x="33" y="23" width="10" height="10" /><color alpha="0.2" /></bezel> </repeat>
<bezel element="hl" inputtag="board:IN.5" inputmask="0x10"><bounds x="43" y="23" width="10" height="10" /><color alpha="0.4" /></bezel> </repeat>
<bezel element="hl" inputtag="board:IN.5" inputmask="0x20"><bounds x="53" y="23" width="10" height="10" /><color alpha="0.2" /></bezel> </repeat>
<bezel element="hl" inputtag="board:IN.5" inputmask="0x40"><bounds x="63" y="23" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.5" inputmask="0x80"><bounds x="73" y="23" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x01"><bounds x="3" y="33" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x02"><bounds x="13" y="33" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x04"><bounds x="23" y="33" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x08"><bounds x="33" y="33" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x10"><bounds x="43" y="33" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x20"><bounds x="53" y="33" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x40"><bounds x="63" y="33" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.4" inputmask="0x80"><bounds x="73" y="33" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x01"><bounds x="3" y="43" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x02"><bounds x="13" y="43" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x04"><bounds x="23" y="43" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x08"><bounds x="33" y="43" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x10"><bounds x="43" y="43" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x20"><bounds x="53" y="43" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x40"><bounds x="63" y="43" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.3" inputmask="0x80"><bounds x="73" y="43" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x01"><bounds x="3" y="53" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x02"><bounds x="13" y="53" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x04"><bounds x="23" y="53" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x08"><bounds x="33" y="53" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x10"><bounds x="43" y="53" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x20"><bounds x="53" y="53" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x40"><bounds x="63" y="53" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.2" inputmask="0x80"><bounds x="73" y="53" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x01"><bounds x="3" y="63" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x02"><bounds x="13" y="63" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x04"><bounds x="23" y="63" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x08"><bounds x="33" y="63" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x10"><bounds x="43" y="63" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x20"><bounds x="53" y="63" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x40"><bounds x="63" y="63" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.1" inputmask="0x80"><bounds x="73" y="63" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x01"><bounds x="3" y="73" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x02"><bounds x="13" y="73" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x04"><bounds x="23" y="73" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x08"><bounds x="33" y="73" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x10"><bounds x="43" y="73" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x20"><bounds x="53" y="73" width="10" height="10" /><color alpha="0.4" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x40"><bounds x="63" y="73" width="10" height="10" /><color alpha="0.2" /></bezel>
<bezel element="hl" inputtag="board:IN.0" inputmask="0x80"><bounds x="73" y="73" width="10" height="10" /><color alpha="0.4" /></bezel>
<!-- LCD panel --> <!-- LCD panel -->
<group ref="panel"><bounds x="87" y="58" width="23" height="23.5" /></group> <group ref="panel"><bounds x="87" y="58" width="23" height="23.5" /></group>

View File

@ -45,11 +45,11 @@
<!-- DL1414 left/right --> <!-- DL1414 left/right -->
<repeat count="2"> <repeat count="2">
<param name="digitno" start="3" increment="4" /> <param name="moduleno" start="3" increment="4" />
<param name="digitx" start="65" increment="139" /> <param name="modulex" start="65" increment="139" />
<repeat count="4"> <repeat count="4">
<param name="digitno" start="~digitno~" increment="-1" /> <param name="digitno" start="~moduleno~" increment="-1" />
<param name="digitx" start="~digitx~" increment="34" /> <param name="digitx" start="~modulex~" increment="34" />
<bezel name="digit~digitno~" element="a_digit"> <bezel name="digit~digitno~" element="a_digit">
<bounds x="~digitx~" y="70" width="25" height="50" /> <bounds x="~digitx~" y="70" width="25" height="50" />
</bezel> </bezel>

View File

@ -826,18 +826,18 @@ Westinghouse Test Console Serial #5 layout
</repeat> </repeat>
<repeat count="2"> <repeat count="2">
<param name="col" start="0" increment="4" /> <param name="group" start="0" increment="4" />
<param name="x" start="10" increment="530" /> <param name="padx" start="10" increment="530" />
<param name="mask" start="0x01" lshift="4" /> <param name="mask" start="0x01" lshift="4" />
<repeat count="4"> <repeat count="4">
<param name="row" start="0" increment="1" /> <param name="row" start="0" increment="1" />
<param name="y" start="100" increment="110" /> <param name="y" start="100" increment="110" />
<repeat count="4"> <repeat count="4">
<param name="col" start="~col~" increment="1" /> <param name="col" start="~group~" increment="1" />
<param name="x" start="~x~" increment="110" /> <param name="btnx" start="~padx~" increment="110" />
<param name="mask" start="~mask~" lshift="1" /> <param name="mask" start="~mask~" lshift="1" />
<bezel element="btn~row~~col~" inputtag="row~row~" inputmask="~mask~"> <bezel element="btn~row~~col~" inputtag="row~row~" inputmask="~mask~">
<bounds x="~x~" y="~y~" width="80" height="80" /> <bounds x="~btnx~" y="~y~" width="80" height="80" />
</bezel> </bezel>
</repeat> </repeat>
</repeat> </repeat>

View File

@ -30,10 +30,10 @@
<repeat count="13"> <repeat count="13">
<param name="ypos" start="20" increment="2" /> <param name="ypos" start="20" increment="2" />
<param name="lampno" start="0" increment="10" /> <param name="rowno" start="0" increment="10" />
<repeat count="8"> <repeat count="8">
<param name="xpos" start="0" increment="2" /> <param name="xpos" start="0" increment="2" />
<param name="lampno" start="~lampno~" increment="1" /> <param name="lampno" start="~rowno~" increment="1" />
<bezel name="lamp~lampno~" element="led"> <bezel name="lamp~lampno~" element="led">
<bounds x="~xpos~" y="~ypos~" width="1" height="1" /> <bounds x="~xpos~" y="~ypos~" width="1" height="1" />
</bezel> </bezel>