mirror of
https://github.com/bancika/diy-layout-creator
synced 2026-11-11 01:32:08 +10:00
Fix blocks, add tests, fix bounding box calc of some components
This commit is contained in:
Bane Stojkovic
Binary file not shown.
|
Before Width: | Height: | Size: 877 KiB After Width: | Height: | Size: 880 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 908 KiB After Width: | Height: | Size: 908 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 MiB After Width: | Height: | Size: 1.8 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 MiB After Width: | Height: | Size: 1.9 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 935 KiB After Width: | Height: | Size: 938 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 844 KiB After Width: | Height: | Size: 845 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 935 KiB After Width: | Height: | Size: 938 KiB |
@@ -0,0 +1,820 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<org.diylc.core.Project>
|
||||
<fileVersion>
|
||||
<major>3</major>
|
||||
<minor>55</minor>
|
||||
<build>0</build>
|
||||
</fileVersion>
|
||||
<title>New Project</title>
|
||||
<author>Branislav Stojkovic</author>
|
||||
<width>
|
||||
<value>29.0</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">cm</unit>
|
||||
</width>
|
||||
<height>
|
||||
<value>21.0</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">cm</unit>
|
||||
</height>
|
||||
<gridSpacing>
|
||||
<value>0.1</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</gridSpacing>
|
||||
<components>
|
||||
<org.diylc.components.guitar.LPSwitch>
|
||||
<name>SW1</name>
|
||||
<alpha>127</alpha>
|
||||
<value></value>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="6.8" y="3.0"/>
|
||||
<java.awt.Point x="6.6" y="4.295"/>
|
||||
<java.awt.Point x="6.8" y="4.295"/>
|
||||
<java.awt.Point x="7.0" y="4.295"/>
|
||||
</controlPoints>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</org.diylc.components.guitar.LPSwitch>
|
||||
<org.diylc.components.guitar.SingleCoilPickup>
|
||||
<name>Single</name>
|
||||
<alpha>127</alpha>
|
||||
<value>Rhythm</value>
|
||||
<orientation>_90</orientation>
|
||||
<controlPoint x="0.0" y="0.0"/>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="8.5" y="4.6"/>
|
||||
<java.awt.Point x="8.5" y="4.5"/>
|
||||
<java.awt.Point x="8.5" y="4.4"/>
|
||||
<java.awt.Point x="8.5" y="4.3"/>
|
||||
</controlPoints>
|
||||
<polarity>North</polarity>
|
||||
<labelColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</labelColor>
|
||||
<color>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>255</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<poleColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</poleColor>
|
||||
<baseColor>
|
||||
<red>128</red>
|
||||
<green>128</green>
|
||||
<blue>128</blue>
|
||||
<alpha>255</alpha>
|
||||
</baseColor>
|
||||
<type>Stratocaster</type>
|
||||
<polePieceType>Rods</polePieceType>
|
||||
<lugColor>
|
||||
<red>224</red>
|
||||
<green>192</green>
|
||||
<blue>76</blue>
|
||||
<alpha>255</alpha>
|
||||
</lugColor>
|
||||
</org.diylc.components.guitar.SingleCoilPickup>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W1</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.8" y="3.0"/>
|
||||
<java.awt.Point x="9.0" y="2.9"/>
|
||||
<java.awt.Point x="7.7" y="4.6"/>
|
||||
<java.awt.Point x="8.5" y="4.5"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W1</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.8" y="3.0"/>
|
||||
<java.awt.Point x="4.5" y="2.9"/>
|
||||
<java.awt.Point x="5.5" y="4.2"/>
|
||||
<java.awt.Point x="4.6" y="4.2"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.0" y="4.1"/>
|
||||
<java.awt.Point x="6.2" y="4.5"/>
|
||||
<java.awt.Point x="6.5" y="4.5"/>
|
||||
<java.awt.Point x="6.6" y="4.3"/>
|
||||
</controlPoints2>
|
||||
<color reference="../../org.diylc.components.connectivity.HookupWire/color"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor reference="../../org.diylc.components.connectivity.HookupWire/stripeColor"/>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="8.5" y="4.4"/>
|
||||
<java.awt.Point x="7.4" y="4.5"/>
|
||||
<java.awt.Point x="7.4" y="4.4"/>
|
||||
<java.awt.Point x="7.4" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.electromechanical.OpenJack1__4>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<value></value>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="6.8" y="4.9"/>
|
||||
<java.awt.Point x="7.2" y="5.1"/>
|
||||
<java.awt.Point x="7.1" y="5.8"/>
|
||||
</controlPoints>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<type>MONO</type>
|
||||
<showLabels>true</showLabels>
|
||||
</org.diylc.components.electromechanical.OpenJack1__4>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.8" y="4.3"/>
|
||||
<java.awt.Point x="6.9" y="4.5"/>
|
||||
<java.awt.Point x="6.6" y="4.8"/>
|
||||
<java.awt.Point x="6.8" y="4.9"/>
|
||||
</controlPoints2>
|
||||
<color reference="../../org.diylc.components.connectivity.HookupWire/color"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor reference="../../org.diylc.components.connectivity.HookupWire/stripeColor"/>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.8" y="3.0"/>
|
||||
<java.awt.Point x="7.5" y="2.9"/>
|
||||
<java.awt.Point x="7.0" y="5.0"/>
|
||||
<java.awt.Point x="7.2" y="5.1"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.passive.PotentiometerPanel>
|
||||
<name>VR1</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="5.8" y="4.1"/>
|
||||
<java.awt.Point x="6.0" y="4.1"/>
|
||||
<java.awt.Point x="6.2" y="4.1"/>
|
||||
</controlPoints>
|
||||
<resistance>
|
||||
<value>500.0</value>
|
||||
<unit class="org.diylc.core.measures.ResistanceUnit">K</unit>
|
||||
</resistance>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<taper>LIN</taper>
|
||||
<bodyDiameter>
|
||||
<value>16.0</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">mm</unit>
|
||||
</bodyDiameter>
|
||||
<spacing>
|
||||
<value>0.2</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</spacing>
|
||||
<lugDiameter>
|
||||
<value>0.15</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</lugDiameter>
|
||||
<bodyColor>
|
||||
<red>192</red>
|
||||
<green>192</green>
|
||||
<blue>192</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>128</red>
|
||||
<green>128</green>
|
||||
<blue>128</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<nutColor>
|
||||
<red>203</red>
|
||||
<green>213</green>
|
||||
<blue>219</blue>
|
||||
<alpha>255</alpha>
|
||||
</nutColor>
|
||||
<waferColor>
|
||||
<red>205</red>
|
||||
<green>133</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</waferColor>
|
||||
<type>ThroughHole</type>
|
||||
<showShaft>false</showShaft>
|
||||
<view>ShaftDown</view>
|
||||
</org.diylc.components.passive.PotentiometerPanel>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.2" y="4.1"/>
|
||||
<java.awt.Point x="6.6" y="4.1"/>
|
||||
<java.awt.Point x="6.3" y="3.0"/>
|
||||
<java.awt.Point x="6.8" y="3.0"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.passive.PotentiometerPanel>
|
||||
<name>VR2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="7.4" y="4.1"/>
|
||||
<java.awt.Point x="7.6" y="4.1"/>
|
||||
<java.awt.Point x="7.8" y="4.1"/>
|
||||
</controlPoints>
|
||||
<resistance>
|
||||
<value>500.0</value>
|
||||
<unit class="org.diylc.core.measures.ResistanceUnit">K</unit>
|
||||
</resistance>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<taper>LIN</taper>
|
||||
<bodyDiameter>
|
||||
<value>16.0</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">mm</unit>
|
||||
</bodyDiameter>
|
||||
<spacing>
|
||||
<value>0.2</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</spacing>
|
||||
<lugDiameter>
|
||||
<value>0.15</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</lugDiameter>
|
||||
<bodyColor>
|
||||
<red>192</red>
|
||||
<green>192</green>
|
||||
<blue>192</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>128</red>
|
||||
<green>128</green>
|
||||
<blue>128</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<nutColor>
|
||||
<red>203</red>
|
||||
<green>213</green>
|
||||
<blue>219</blue>
|
||||
<alpha>255</alpha>
|
||||
</nutColor>
|
||||
<waferColor>
|
||||
<red>205</red>
|
||||
<green>133</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</waferColor>
|
||||
<type>ThroughHole</type>
|
||||
<showShaft>false</showShaft>
|
||||
<view>ShaftDown</view>
|
||||
</org.diylc.components.passive.PotentiometerPanel>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W1</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="7.2" y="5.1"/>
|
||||
<java.awt.Point x="7.9" y="5.1"/>
|
||||
<java.awt.Point x="7.8" y="5.1"/>
|
||||
<java.awt.Point x="7.8" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="7.6" y="4.1"/>
|
||||
<java.awt.Point x="7.6" y="4.3"/>
|
||||
<java.awt.Point x="7.7" y="4.3"/>
|
||||
<java.awt.Point x="7.0" y="4.3"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.passive.PotentiometerPanel>
|
||||
<name>VR3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="5.8" y="5.4"/>
|
||||
<java.awt.Point x="6.0" y="5.4"/>
|
||||
<java.awt.Point x="6.2" y="5.4"/>
|
||||
</controlPoints>
|
||||
<resistance>
|
||||
<value>500.0</value>
|
||||
<unit class="org.diylc.core.measures.ResistanceUnit">K</unit>
|
||||
</resistance>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<taper>LIN</taper>
|
||||
<bodyDiameter>
|
||||
<value>16.0</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">mm</unit>
|
||||
</bodyDiameter>
|
||||
<spacing>
|
||||
<value>0.2</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</spacing>
|
||||
<lugDiameter>
|
||||
<value>0.15</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</lugDiameter>
|
||||
<bodyColor>
|
||||
<red>192</red>
|
||||
<green>192</green>
|
||||
<blue>192</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>128</red>
|
||||
<green>128</green>
|
||||
<blue>128</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<nutColor>
|
||||
<red>203</red>
|
||||
<green>213</green>
|
||||
<blue>219</blue>
|
||||
<alpha>255</alpha>
|
||||
</nutColor>
|
||||
<waferColor>
|
||||
<red>205</red>
|
||||
<green>133</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</waferColor>
|
||||
<type>ThroughHole</type>
|
||||
<showShaft>false</showShaft>
|
||||
<view>ShaftDown</view>
|
||||
</org.diylc.components.passive.PotentiometerPanel>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="6.2" y="5.4"/>
|
||||
<java.awt.Point x="6.5" y="5.4"/>
|
||||
<java.awt.Point x="6.7" y="5.2"/>
|
||||
<java.awt.Point x="6.8" y="4.9"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.passive.RadialFilmCapacitor>
|
||||
<name>C1</name>
|
||||
<alpha>127</alpha>
|
||||
<length>
|
||||
<value>0.25</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</length>
|
||||
<width>
|
||||
<value>0.125</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</width>
|
||||
<points>
|
||||
<java.awt.Point x="6.0" y="5.4"/>
|
||||
<java.awt.Point x="5.8" y="5.1"/>
|
||||
</points>
|
||||
<bodyColor>
|
||||
<red>255</red>
|
||||
<green>128</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>178</red>
|
||||
<green>89</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</labelColor>
|
||||
<leadColor>
|
||||
<red>204</red>
|
||||
<green>204</green>
|
||||
<blue>204</blue>
|
||||
<alpha>255</alpha>
|
||||
</leadColor>
|
||||
<display>VALUE</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<pinSpacing>
|
||||
<value>0.1</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</pinSpacing>
|
||||
<value>
|
||||
<value>20.0</value>
|
||||
<unit class="org.diylc.core.measures.CapacitanceUnit">nF</unit>
|
||||
</value>
|
||||
<voltage>_63V</voltage>
|
||||
</org.diylc.components.passive.RadialFilmCapacitor>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W4</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="7.2" y="5.1"/>
|
||||
<java.awt.Point x="7.8" y="6.3"/>
|
||||
<java.awt.Point x="4.9" y="6.2"/>
|
||||
<java.awt.Point x="5.8" y="5.1"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.electromechanical.MiniToggleSwitch>
|
||||
<name defined-in="org.diylc.components.AbstractComponent"></name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="5.2" y="4.7"/>
|
||||
<java.awt.Point x="5.2" y="4.9"/>
|
||||
<java.awt.Point x="5.2" y="5.1"/>
|
||||
<java.awt.Point x="5.4" y="4.7"/>
|
||||
<java.awt.Point x="5.4" y="4.9"/>
|
||||
<java.awt.Point x="5.4" y="5.1"/>
|
||||
</controlPoints>
|
||||
<name>SW2</name>
|
||||
<switchType>DPDT</switchType>
|
||||
<orientation>VERTICAL</orientation>
|
||||
<spacing>
|
||||
<value>0.2</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</spacing>
|
||||
<bodyColor>
|
||||
<red>50</red>
|
||||
<green>153</green>
|
||||
<blue>204</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>35</red>
|
||||
<green>107</green>
|
||||
<blue>142</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
</org.diylc.components.electromechanical.MiniToggleSwitch>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W5</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="4.6" y="4.3"/>
|
||||
<java.awt.Point x="5.1" y="4.3"/>
|
||||
<java.awt.Point x="5.0" y="4.7"/>
|
||||
<java.awt.Point x="5.2" y="4.7"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W5</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="4.6" y="4.4"/>
|
||||
<java.awt.Point x="5.1" y="4.4"/>
|
||||
<java.awt.Point x="5.0" y="4.8"/>
|
||||
<java.awt.Point x="5.2" y="4.7"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W5</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="5.2" y="4.9"/>
|
||||
<java.awt.Point x="5.4" y="4.9"/>
|
||||
<java.awt.Point x="5.4" y="5.2"/>
|
||||
<java.awt.Point x="5.8" y="5.1"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.connectivity.HookupWire>
|
||||
<name>W2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<java.awt.Point x="4.6" y="4.5"/>
|
||||
<java.awt.Point x="5.1" y="5.0"/>
|
||||
<java.awt.Point x="5.6" y="4.9"/>
|
||||
<java.awt.Point x="5.8" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</stripeColor>
|
||||
</org.diylc.components.connectivity.HookupWire>
|
||||
<org.diylc.components.guitar.HumbuckerPickup>
|
||||
<name>Bucker</name>
|
||||
<alpha>127</alpha>
|
||||
<value></value>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<controlPoint x="0.0" y="0.0"/>
|
||||
<controlPoints>
|
||||
<java.awt.Point x="4.6" y="4.2"/>
|
||||
<java.awt.Point x="4.6" y="4.3"/>
|
||||
<java.awt.Point x="4.6" y="4.4"/>
|
||||
<java.awt.Point x="4.6" y="4.5"/>
|
||||
</controlPoints>
|
||||
<labelColor reference="../../org.diylc.components.guitar.SingleCoilPickup/labelColor"/>
|
||||
<color>
|
||||
<red>192</red>
|
||||
<green>192</green>
|
||||
<blue>192</blue>
|
||||
<alpha>255</alpha>
|
||||
</color>
|
||||
<poleColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</poleColor>
|
||||
<type>PAF</type>
|
||||
<cover>false</cover>
|
||||
<legs>true</legs>
|
||||
<bobinColor1>
|
||||
<red>234</red>
|
||||
<green>227</green>
|
||||
<blue>198</blue>
|
||||
<alpha>255</alpha>
|
||||
</bobinColor1>
|
||||
<bobinColor2>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</bobinColor2>
|
||||
</org.diylc.components.guitar.HumbuckerPickup>
|
||||
</components>
|
||||
<groups/>
|
||||
<lockedLayers/>
|
||||
<hiddenLayers/>
|
||||
<font>
|
||||
<attributes>
|
||||
<entry>
|
||||
<awt-text-attribute>family</awt-text-attribute>
|
||||
<string>Square721 BT</string>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>posture</awt-text-attribute>
|
||||
<null/>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>width</awt-text-attribute>
|
||||
<null/>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>transform</awt-text-attribute>
|
||||
<null/>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>size</awt-text-attribute>
|
||||
<float>14.0</float>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>weight</awt-text-attribute>
|
||||
<null/>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>tracking</awt-text-attribute>
|
||||
<null/>
|
||||
</entry>
|
||||
<entry>
|
||||
<awt-text-attribute>superscript</awt-text-attribute>
|
||||
<null/>
|
||||
</entry>
|
||||
</attributes>
|
||||
</font>
|
||||
</org.diylc.core.Project>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,582 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<project>
|
||||
<fileVersion>
|
||||
<major>4</major>
|
||||
<minor>4</minor>
|
||||
<build>0</build>
|
||||
</fileVersion>
|
||||
<title>New Project</title>
|
||||
<author>bancika</author>
|
||||
<width value="10.0" unit="cm"/>
|
||||
<height value="14.0" unit="cm"/>
|
||||
<gridSpacing value="0.1" unit="in"/>
|
||||
<dotSpacing>1</dotSpacing>
|
||||
<components>
|
||||
<diylc.passive.PotentiometerPanel>
|
||||
<name>Volume</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints>
|
||||
<point x="1.8" y="4.5"/>
|
||||
<point x="2.0" y="4.5"/>
|
||||
<point x="2.2" y="4.5"/>
|
||||
</controlPoints>
|
||||
<resistance value="250.0" unit="K"/>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<taper>LOG</taper>
|
||||
<bodyDiameter value="16.0" unit="mm"/>
|
||||
<spacing value="0.2" unit="in"/>
|
||||
<lugDiameter value="0.15" unit="in"/>
|
||||
<bodyColor hex="b6b6b6"/>
|
||||
<borderColor hex="808080"/>
|
||||
<nutColor hex="cbd5db"/>
|
||||
<waferColor hex="cd8500"/>
|
||||
<type>ThroughHole</type>
|
||||
<showShaft>false</showShaft>
|
||||
<view>ShaftDown</view>
|
||||
</diylc.passive.PotentiometerPanel>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W7</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="1.9" y="2.5"/>
|
||||
<point x="1.5" y="3.6"/>
|
||||
<point x="1.0" y="3.9"/>
|
||||
<point x="1.8" y="4.5"/>
|
||||
</controlPoints2>
|
||||
<color hex="cc00cc"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.guitar.SingleCoilPickup>
|
||||
<name>Neck</name>
|
||||
<alpha>127</alpha>
|
||||
<value>Chopper</value>
|
||||
<orientation>_90</orientation>
|
||||
<controlPoint x="3.0" y="2.4"/>
|
||||
<controlPoints>
|
||||
<point x="3.0" y="2.4"/>
|
||||
<point x="3.0" y="2.3"/>
|
||||
<point x="3.0" y="2.2"/>
|
||||
<point x="3.0" y="2.1"/>
|
||||
</controlPoints>
|
||||
<polarity>Humbucking</polarity>
|
||||
<labelColor hex="ffffff"/>
|
||||
<color hex="666666"/>
|
||||
<poleColor hex="333333"/>
|
||||
<baseColor hex="666666"/>
|
||||
<type>Stratocaster</type>
|
||||
<polePieceType>RailHumbucker</polePieceType>
|
||||
<lugColor hex="e0c04c"/>
|
||||
</diylc.guitar.SingleCoilPickup>
|
||||
<diylc.guitar.SingleCoilPickup>
|
||||
<name>Bridge</name>
|
||||
<alpha>127</alpha>
|
||||
<value></value>
|
||||
<orientation>_270</orientation>
|
||||
<controlPoint x="0.8" y="2.1"/>
|
||||
<controlPoints>
|
||||
<point x="0.8" y="2.1"/>
|
||||
<point x="0.8" y="2.2"/>
|
||||
<point x="0.8" y="2.3"/>
|
||||
<point x="0.8" y="2.4"/>
|
||||
</controlPoints>
|
||||
<polarity>Humbucking</polarity>
|
||||
<labelColor hex="ffffff"/>
|
||||
<color hex="666666"/>
|
||||
<poleColor hex="333333"/>
|
||||
<baseColor hex="666666"/>
|
||||
<type>Stratocaster</type>
|
||||
<polePieceType>RailHumbucker</polePieceType>
|
||||
<lugColor hex="e0c04c"/>
|
||||
</diylc.guitar.SingleCoilPickup>
|
||||
<diylc.guitar.LPSwitch>
|
||||
<name>SW1</name>
|
||||
<alpha>127</alpha>
|
||||
<value></value>
|
||||
<controlPoints>
|
||||
<point x="1.9" y="1.2"/>
|
||||
<point x="1.7" y="2.495"/>
|
||||
<point x="1.9" y="2.495"/>
|
||||
<point x="2.1" y="2.495"/>
|
||||
</controlPoints>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.guitar.LPSwitch>
|
||||
<diylc.electromechanical.MiniToggleSwitch>
|
||||
<name>Split</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints>
|
||||
<point x="1.9" y="3.5"/>
|
||||
<point x="1.9" y="3.7"/>
|
||||
<point x="1.9" y="3.9"/>
|
||||
<point x="2.1" y="3.5"/>
|
||||
<point x="2.1" y="3.7"/>
|
||||
<point x="2.1" y="3.9"/>
|
||||
</controlPoints>
|
||||
<switchType>DPDT</switchType>
|
||||
<orientation>VERTICAL</orientation>
|
||||
<spacing value="0.2" unit="in"/>
|
||||
<bodyColor hex="3299cc"/>
|
||||
<borderColor hex="236b8e"/>
|
||||
</diylc.electromechanical.MiniToggleSwitch>
|
||||
<diylc.electromechanical.OpenJack1__4>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<value></value>
|
||||
<controlPoints>
|
||||
<point x="2.7" y="4.9"/>
|
||||
<point x="2.9" y="4.5"/>
|
||||
<point x="3.6" y="4.6"/>
|
||||
</controlPoints>
|
||||
<orientation>_270</orientation>
|
||||
<angle>270</angle>
|
||||
<type>MONO</type>
|
||||
<showLabels>true</showLabels>
|
||||
</diylc.electromechanical.OpenJack1__4>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="0.8" y="2.3"/>
|
||||
<point x="1.2" y="2.6"/>
|
||||
<point x="1.7" y="3.4"/>
|
||||
<point x="1.9" y="3.7"/>
|
||||
</controlPoints2>
|
||||
<color hex="ffffff"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W2</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="0.8" y="2.2"/>
|
||||
<point x="1.5" y="2.6"/>
|
||||
<point x="1.7" y="3.5"/>
|
||||
<point x="1.9" y="3.7"/>
|
||||
</controlPoints2>
|
||||
<color hex="666666"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="0.8" y="2.4"/>
|
||||
<point x="1.0" y="4.1"/>
|
||||
<point x="2.1" y="4.6"/>
|
||||
<point x="2.2" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color hex="00ff00"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="3.0" y="2.3"/>
|
||||
<point x="2.4" y="3.0"/>
|
||||
<point x="2.8" y="4.0"/>
|
||||
<point x="2.2" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color hex="666666"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W4</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="0.8" y="2.1"/>
|
||||
<point x="1.1" y="2.3"/>
|
||||
<point x="1.4" y="2.7"/>
|
||||
<point x="1.7" y="2.5"/>
|
||||
</controlPoints2>
|
||||
<color hex="ff0000"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.2" y="4.1"/>
|
||||
<point x="2.7" y="4.2"/>
|
||||
<point x="2.3" y="4.6"/>
|
||||
<point x="2.9" y="4.5"/>
|
||||
</controlPoints2>
|
||||
<color hex="00ff00"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.0" y="4.5"/>
|
||||
<point x="2.3" y="4.7"/>
|
||||
<point x="2.3" y="5.1"/>
|
||||
<point x="2.7" y="4.9"/>
|
||||
</controlPoints2>
|
||||
<color hex="ff0000"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W5</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.1" y="3.9"/>
|
||||
<point x="2.2" y="3.9"/>
|
||||
<point x="2.3" y="4.0"/>
|
||||
<point x="2.2" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color hex="00ff00"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W6</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="1.9" y="3.9"/>
|
||||
<point x="1.9" y="3.8"/>
|
||||
<point x="2.1" y="3.8"/>
|
||||
<point x="2.1" y="3.9"/>
|
||||
</controlPoints2>
|
||||
<color hex="00ff00"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W3</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="3.0" y="2.2"/>
|
||||
<point x="2.6" y="2.6"/>
|
||||
<point x="2.1" y="2.6"/>
|
||||
<point x="2.1" y="2.5"/>
|
||||
</controlPoints2>
|
||||
<color hex="ffffff"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W4</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.1" y="3.7"/>
|
||||
<point x="2.2" y="3.5"/>
|
||||
<point x="2.5" y="3.2"/>
|
||||
<point x="3.0" y="2.4"/>
|
||||
</controlPoints2>
|
||||
<color hex="ff0000"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W6</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.1" y="3.7"/>
|
||||
<point x="2.3" y="3.5"/>
|
||||
<point x="2.7" y="2.1"/>
|
||||
<point x="3.0" y="2.1"/>
|
||||
</controlPoints2>
|
||||
<color hex="00ff00"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.passive.AxialFilmCapacitor>
|
||||
<name>Cbleed</name>
|
||||
<alpha>127</alpha>
|
||||
<length value="0.4" unit="in"/>
|
||||
<width value="0.125" unit="in"/>
|
||||
<points>
|
||||
<point x="1.8" y="4.5"/>
|
||||
<point x="1.8" y="5.1"/>
|
||||
<point x="1.8" y="4.8"/>
|
||||
</points>
|
||||
<bodyColor hex="ffe303"/>
|
||||
<borderColor hex="b29e02"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="cccccc"/>
|
||||
<display>VALUE</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<value value="1.2" unit="nF"/>
|
||||
<voltage>_63V</voltage>
|
||||
<showOuterFoil>false</showOuterFoil>
|
||||
<outerFoilColor hex="ffffff"/>
|
||||
</diylc.passive.AxialFilmCapacitor>
|
||||
<diylc.passive.Resistor>
|
||||
<name>Rbleed</name>
|
||||
<alpha>127</alpha>
|
||||
<length value="0.4" unit="in"/>
|
||||
<width value="0.1" unit="in"/>
|
||||
<points>
|
||||
<point x="2.0" y="4.5"/>
|
||||
<point x="2.0" y="5.1"/>
|
||||
<point x="2.0" y="4.8"/>
|
||||
</points>
|
||||
<bodyColor hex="82cffd"/>
|
||||
<borderColor hex="5b90b1"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="cccccc"/>
|
||||
<display>VALUE</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<value value="130.0" unit="K"/>
|
||||
<power>HALF</power>
|
||||
<colorCode>_5_BAND</colorCode>
|
||||
<shape>Standard</shape>
|
||||
</diylc.passive.Resistor>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W8</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="1.8" y="5.1"/>
|
||||
<point x="1.8" y="5.2"/>
|
||||
<point x="2.0" y="5.2"/>
|
||||
<point x="2.0" y="5.1"/>
|
||||
</controlPoints2>
|
||||
<color hex="cccccc"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_26</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W5</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.2" y="4.1"/>
|
||||
<point x="2.4" y="4.2"/>
|
||||
<point x="2.6" y="4.0"/>
|
||||
<point x="2.9" y="4.1"/>
|
||||
</controlPoints2>
|
||||
<color hex="666666"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.connectivity.HookupWire>
|
||||
<name>W5</name>
|
||||
<alpha>127</alpha>
|
||||
<controlPoints2>
|
||||
<point x="2.2" y="4.1"/>
|
||||
<point x="2.3" y="4.2"/>
|
||||
<point x="2.3" y="4.4"/>
|
||||
<point x="2.2" y="4.5"/>
|
||||
</controlPoints2>
|
||||
<color hex="00ff00"/>
|
||||
<pointCount>FOUR</pointCount>
|
||||
<style>SOLID</style>
|
||||
<smooth>true</smooth>
|
||||
<lastUpdatePointIndex>-1</lastUpdatePointIndex>
|
||||
<gauge>_22</gauge>
|
||||
<striped>false</striped>
|
||||
<stripeColor hex="ffff00"/>
|
||||
</diylc.connectivity.HookupWire>
|
||||
<diylc.misc.Label>
|
||||
<name>L1</name>
|
||||
<point x="3.3" y="4.1"/>
|
||||
<text>To bridge baseplate</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L2</name>
|
||||
<point x="1.5" y="4.8"/>
|
||||
<text>Treble bleed</text>
|
||||
<font reference="../../diylc.misc.Label/font"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L3</name>
|
||||
<point x="2.0" y="0.2"/>
|
||||
<text>Travelcaster Wiring Diagram</text>
|
||||
<font name="Dialog.plain" size="36" style="0"/>
|
||||
<color hex="0000cc"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L3</name>
|
||||
<point x="2.0" y="0.3"/>
|
||||
<text>www.diy-fever.com</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L4</name>
|
||||
<point x="1.9" y="1.1"/>
|
||||
<text>Pickup selector switch</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L4</name>
|
||||
<point x="2.0" y="3.2"/>
|
||||
<text>Split mode</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L4</name>
|
||||
<point x="2.0" y="3.3"/>
|
||||
<text>Push-pull</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L5</name>
|
||||
<point x="0.4" y="3.1"/>
|
||||
<text>DiMarzio</text>
|
||||
<font name="Franklin Gothic Demi" size="18" style="1"/>
|
||||
<color hex="ffffff"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>_270</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L5</name>
|
||||
<point x="3.4" y="1.4"/>
|
||||
<text>DiMarzio</text>
|
||||
<font name="Franklin Gothic Demi" size="18" style="1"/>
|
||||
<color hex="ffffff"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>_90</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L6</name>
|
||||
<point x="0.1" y="5.4"/>
|
||||
<text>* One of the pickups is rotated 180 degrees for cleaner drawing</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>LEFT</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
<diylc.misc.Label>
|
||||
<name>L1</name>
|
||||
<point x="3.6" y="4.5"/>
|
||||
<text>Output jack</text>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
<color hex="000000"/>
|
||||
<center>false</center>
|
||||
<horizontalAlignment>CENTER</horizontalAlignment>
|
||||
<verticalAlignment>CENTER</verticalAlignment>
|
||||
<orientation>DEFAULT</orientation>
|
||||
</diylc.misc.Label>
|
||||
</components>
|
||||
<groups/>
|
||||
<lockedLayers/>
|
||||
<hiddenLayers/>
|
||||
<font name="Tahoma" size="14" style="0"/>
|
||||
</project>
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Could not find anything connected to a jack tip terminal.
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Could not find anything connected to a jack tip terminal.
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Could not find anything connected to a jack tip terminal.
|
||||
@@ -0,0 +1,5 @@
|
||||
<b>Switch configuration: [.ON1:SW1.Middle]</b><br><br>Parallel/Series connectivity tree:<br><br>(VR1.1-2 <b><font color='red'>+</font></b> Bucker.South->) <b><font color='blue'>||</font></b> <br>VR1.2-3 <b><font color='blue'>||</font></b> <br>(VR2.1-2 <b><font color='red'>+</font></b> Single.North->) <b><font color='blue'>||</font></b> <br>VR2.2-3 <b><font color='blue'>||</font></b> <br>(VR3.2-3 <b><font color='red'>+</font></b> C1)<br><br>Notes:<br> 'Bucker' and 'Single' pickups engaged, wired in parallel<br> 'Bucker' pickup wired in coil-split mode<br> 'VR1' potentiometer acts as a volume control for 'Bucker'<br> 'VR2' potentiometer acts as a volume control for 'Single'<br> 'VR3' potentiometer acts as a tone control for 'Bucker' and 'Single'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [.ON1:SW1.Rhythm, .ON2:SW1.Rhythm]</b><br><br>Parallel/Series connectivity tree:<br><br>(VR2.1-2 <b><font color='red'>+</font></b> Single.North->) <b><font color='blue'>||</font></b> <br>VR2.2-3 <b><font color='blue'>||</font></b> <br>(VR3.2-3 <b><font color='red'>+</font></b> C1)<br><br>Notes:<br> 'Single' is the only engaged pickup<br> 'VR2' potentiometer acts as a volume control for 'Single'<br> 'VR3' potentiometer acts as a tone control for 'Single'<br> This configuration is NOT hum-cancelling<br>
|
||||
<b>Switch configuration: [.ON1:SW1.Treble]</b><br><br>Parallel/Series connectivity tree:<br><br>(VR1.1-2 <b><font color='red'>+</font></b> Bucker.South->) <b><font color='blue'>||</font></b> <br>VR1.2-3 <b><font color='blue'>||</font></b> <br>(VR3.2-3 <b><font color='red'>+</font></b> C1)<br><br>Notes:<br> 'Bucker' is the only engaged pickup<br> 'Bucker' pickup wired in coil-split mode<br> 'VR1' potentiometer acts as a volume control for 'Bucker'<br> 'VR3' potentiometer acts as a tone control for 'Bucker'<br> This configuration is NOT hum-cancelling<br>
|
||||
<b>Switch configuration: [.ON2:SW1.Middle]</b><br><br>Parallel/Series connectivity tree:<br><br>(VR1.1-2 <b><font color='red'>+</font></b> Bucker.South-> <b><font color='red'>+</font></b> Bucker.North->) <b><font color='blue'>||</font></b> <br>VR1.2-3 <b><font color='blue'>||</font></b> <br>(VR2.1-2 <b><font color='red'>+</font></b> Single.North->) <b><font color='blue'>||</font></b> <br>VR2.2-3 <b><font color='blue'>||</font></b> <br>(VR3.2-3 <b><font color='red'>+</font></b> C1)<br><br>Notes:<br> 'Bucker' and 'Single' pickups engaged, wired in parallel<br> 'Bucker' pickup wired in humbucking mode with series coils<br> 'VR1' potentiometer acts as a volume control for 'Bucker'<br> 'VR2' potentiometer acts as a volume control for 'Single'<br> 'VR3' potentiometer acts as a tone control for 'Bucker' and 'Single'<br> All pickup coils are wired in-phase<br> This configuration is NOT hum-cancelling<br>
|
||||
<b>Switch configuration: [.ON2:SW1.Treble]</b><br><br>Parallel/Series connectivity tree:<br><br>(VR1.1-2 <b><font color='red'>+</font></b> Bucker.South-> <b><font color='red'>+</font></b> Bucker.North->) <b><font color='blue'>||</font></b> <br>VR1.2-3 <b><font color='blue'>||</font></b> <br>(VR3.2-3 <b><font color='red'>+</font></b> C1)<br><br>Notes:<br> 'Bucker' is the only engaged pickup<br> 'Bucker' pickup wired in humbucking mode with series coils<br> 'VR1' potentiometer acts as a volume control for 'Bucker'<br> 'VR3' potentiometer acts as a tone control for 'Bucker'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Could not find anything connected to a jack tip terminal.
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Multiple jacks found, could not proceed.
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Multiple jacks found, could not proceed.
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Multiple jacks found, could not proceed.
|
||||
@@ -0,0 +1,5 @@
|
||||
<b>Switch configuration: [SW1.1]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rb <b><font color='red'>+</font></b> Cb) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> Bridge.North<-) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Bridge' is the only engaged pickup<br> 'Volume' potentiometer acts as a volume control for 'Bridge'<br> This configuration is NOT hum-cancelling<br>
|
||||
<b>Switch configuration: [SW1.2]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rb <b><font color='red'>+</font></b> Cb) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Bridge.North<- <b><font color='blue'>||</font></b> Middle.South<- <b><font color='blue'>||</font></b> (Tone Middle.2-3 <b><font color='red'>+</font></b> Ct))) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Bridge' and 'Middle' pickups engaged, wired in parallel<br> 'Tone Middle' potentiometer acts as a tone control for 'Bridge' and 'Middle'<br> 'Volume' potentiometer acts as a volume control for 'Bridge' and 'Middle'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [SW1.3]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rb <b><font color='red'>+</font></b> Cb) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Middle.South<- <b><font color='blue'>||</font></b> (Tone Middle.2-3 <b><font color='red'>+</font></b> Ct))) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Middle' is the only engaged pickup<br> 'Tone Middle' potentiometer acts as a tone control for 'Middle'<br> 'Volume' potentiometer acts as a volume control for 'Middle'<br> This configuration is NOT hum-cancelling<br>
|
||||
<b>Switch configuration: [SW1.4]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rb <b><font color='red'>+</font></b> Cb) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Middle.South<- <b><font color='blue'>||</font></b> Neck.North<- <b><font color='blue'>||</font></b> (Tone Middle.2-3 <b><font color='red'>+</font></b> Ct) <b><font color='blue'>||</font></b> (Tone Neck.2-3 <b><font color='red'>+</font></b> Ct))) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Middle' and 'Neck' pickups engaged, wired in parallel<br> 'Tone Middle' potentiometer acts as a tone control for 'Middle' and 'Neck'<br> 'Tone Neck' potentiometer acts as a tone control for 'Middle' and 'Neck'<br> 'Volume' potentiometer acts as a volume control for 'Middle' and 'Neck'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [SW1.5]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rb <b><font color='red'>+</font></b> Cb) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Neck.North<- <b><font color='blue'>||</font></b> (Tone Neck.2-3 <b><font color='red'>+</font></b> Ct))) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Neck' is the only engaged pickup<br> 'Tone Neck' potentiometer acts as a tone control for 'Neck'<br> 'Volume' potentiometer acts as a volume control for 'Neck'<br> This configuration is NOT hum-cancelling<br>
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Could not find anything connected to a jack tip terminal.
|
||||
@@ -0,0 +1 @@
|
||||
org.diylc.netlist.TreeException: Could not find anything connected to a jack tip terminal.
|
||||
@@ -0,0 +1,6 @@
|
||||
<b>Switch configuration: [Split.ON1:SW1.Middle]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rbleed <b><font color='red'>+</font></b> Cbleed) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> ((Bridge.North<- <b><font color='red'>+</font></b> Bridge.South<-) <b><font color='blue'>||</font></b> (Neck.South<- <b><font color='red'>+</font></b> Neck.North<-))) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Bridge' and 'Neck' pickups engaged, wired in parallel<br> 'Bridge' pickup wired in humbucking mode with series coils<br> 'Neck' pickup wired in humbucking mode with series coils<br> 'Volume' potentiometer acts as a volume control for 'Bridge' and 'Neck'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [Split.ON1:SW1.Rhythm]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rbleed <b><font color='red'>+</font></b> Cbleed) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Neck.North<- <b><font color='red'>+</font></b> Neck.South<-)) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Neck' is the only engaged pickup<br> 'Neck' pickup wired in humbucking mode with series coils<br> 'Volume' potentiometer acts as a volume control for 'Neck'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [Split.ON1:SW1.Treble]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rbleed <b><font color='red'>+</font></b> Cbleed) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Bridge.South<- <b><font color='red'>+</font></b> Bridge.North<-)) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Bridge' is the only engaged pickup<br> 'Bridge' pickup wired in humbucking mode with series coils<br> 'Volume' potentiometer acts as a volume control for 'Bridge'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [Split.ON2:SW1.Middle]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rbleed <b><font color='red'>+</font></b> Cbleed) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> (Bridge.North<- <b><font color='blue'>||</font></b> Neck.South<-)) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Bridge' and 'Neck' pickups engaged, wired in parallel<br> 'Bridge' pickup wired in coil-split mode<br> 'Neck' pickup wired in coil-split mode<br> 'Volume' potentiometer acts as a volume control for 'Bridge' and 'Neck'<br> All pickup coils are wired in-phase<br> This configuration is hum-cancelling<br>
|
||||
<b>Switch configuration: [Split.ON2:SW1.Rhythm]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rbleed <b><font color='red'>+</font></b> Cbleed) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> Neck.South<-) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Neck' is the only engaged pickup<br> 'Neck' pickup wired in coil-split mode<br> 'Volume' potentiometer acts as a volume control for 'Neck'<br> This configuration is NOT hum-cancelling<br>
|
||||
<b>Switch configuration: [Split.ON2:SW1.Treble]</b><br><br>Parallel/Series connectivity tree:<br><br>(((Rbleed <b><font color='red'>+</font></b> Cbleed) <b><font color='blue'>||</font></b> Volume.1-2) <b><font color='red'>+</font></b> Bridge.North<-) <b><font color='blue'>||</font></b> <br>Volume.2-3<br><br>Notes:<br> 'Bridge' is the only engaged pickup<br> 'Bridge' pickup wired in coil-split mode<br> 'Volume' potentiometer acts as a volume control for 'Bridge'<br> This configuration is NOT hum-cancelling<br>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 204 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 273 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 169 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 176 KiB |
@@ -0,0 +1,974 @@
|
||||
<b>Switch configuration: [SW1.ON1, SW1.ON2]</b><br><br> N001 N002 <br>
|
||||
7812 N003 N004 N005 ; Pinout not configured, validate this line<br>
|
||||
Bass N006 N007 N007 250K<br>
|
||||
Board1 <br>
|
||||
Board1 <br>
|
||||
C1 N008 N011 470nF<br>
|
||||
C1 N009 N011 2.2uF<br>
|
||||
C1 N010 N012 220nF<br>
|
||||
C2 N011 N020 1000pF<br>
|
||||
C2 N013 N011 500pF<br>
|
||||
C2 N014 N011 47pF<br>
|
||||
C2 N015 N013 250pF<br>
|
||||
C2 N016 N014 10pF<br>
|
||||
C2 N017 N019 1000pF<br>
|
||||
C2 N018 N021 1000pF<br>
|
||||
C3 N022 N006 100nF<br>
|
||||
C4 N008 N029 10uF<br>
|
||||
C4 N015 N017 47nF<br>
|
||||
C4 N022 N007 47nF<br>
|
||||
C4 N023 N032 22nF<br>
|
||||
C4 N024 N031 22nF<br>
|
||||
C4 N025 N011 10uF<br>
|
||||
C4 N026 N016 47nF<br>
|
||||
C4 N027 N030 47nF<br>
|
||||
C4 N028 N016 22nF<br>
|
||||
C4 N072 N033 22nF<br>
|
||||
C5 N001 N011 22uF<br>
|
||||
C5 N002 N011 33uF<br>
|
||||
C5 N019 N011 22uF<br>
|
||||
C5 N034 N011 22uF<br>
|
||||
C6 N003 N004 220uF<br>
|
||||
C6 N005 N004 220uF<br>
|
||||
C6 N035 N011 10uF<br>
|
||||
C7 N009 N036 120pF<br>
|
||||
C8 N006 N037 100pF<br>
|
||||
Clean Master N038 N038 N006 250K<br>
|
||||
D1 N039 N005 <br>
|
||||
D2 N039 N005 <br>
|
||||
D3 N039 N005 <br>
|
||||
D4 N040 N002 <br>
|
||||
D5 N011 N040 <br>
|
||||
D5 N011 N041 <br>
|
||||
D5 N041 N002 <br>
|
||||
D6 N042 N039 <br>
|
||||
Drive N011 N036 N043 1M<br>
|
||||
J12 N150 N151 null<br>
|
||||
J13 N152 N153 null<br>
|
||||
J2 N148 N149 null<br>
|
||||
J3 N073 N074 null<br>
|
||||
J4 N075 N076 null<br>
|
||||
J5 N077 N078 null<br>
|
||||
J6 N049 N050 null<br>
|
||||
J6 N079 N080 null<br>
|
||||
J7 N186 N187 null<br>
|
||||
J8 N081 N082 null<br>
|
||||
J9 N070 N071 null<br>
|
||||
L1 Gnd<br>
|
||||
L10 Bass<br>
|
||||
L11 Mid<br>
|
||||
L12 Treble<br>
|
||||
L13 Drive<br>
|
||||
L14 +<br>
|
||||
L14 -<br>
|
||||
L15 1<br>
|
||||
L15 1<br>
|
||||
L15 1<br>
|
||||
L15 9<br>
|
||||
L15 9<br>
|
||||
L15 9<br>
|
||||
L16 1cm<br>
|
||||
L17 Mini-switch<br>
|
||||
L17 Mini-switch<br>
|
||||
L18 Diodes UF4007 or similar<br>
|
||||
L18 Jumper heaters and switching pads if the same secondary is used for both<br>
|
||||
L19 From previous tube<br>
|
||||
L19 From previous tube<br>
|
||||
L19 From previous tube<br>
|
||||
L19 To next tube<br>
|
||||
L19 To next tube<br>
|
||||
L19 To next tube<br>
|
||||
L2 J1<br>
|
||||
L2 J2<br>
|
||||
L2 J3<br>
|
||||
L2 J4<br>
|
||||
L2 J5<br>
|
||||
L20 12AX7 12.6V operation<br>
|
||||
L20 12AX7 6.3V operation<br>
|
||||
L20 6N2P 6.3V operation<br>
|
||||
L21 GND<br>
|
||||
L22 Mesa Mark IIc+ preamp w/ mods<br>
|
||||
L23 www.diy-fever.com<br>
|
||||
L3 Master<br>
|
||||
L4 Clean<br>
|
||||
L5 Lead<br>
|
||||
L6 Out<br>
|
||||
L7 HV<br>
|
||||
L7 Heater CT<br>
|
||||
L7 Heaters<br>
|
||||
L7 Switching<br>
|
||||
L8 Clean/Lead<br>
|
||||
L9 In<br>
|
||||
LR8 N002 N001 N045 ; Pinout not configured, validate this line<br>
|
||||
Lead Master N044 N044 N006 250K<br>
|
||||
Middle N007 N011 N011 10K<br>
|
||||
Pad1 null<br>
|
||||
Pad1 null<br>
|
||||
Pad10 null<br>
|
||||
Pad10 null<br>
|
||||
Pad100 null<br>
|
||||
Pad100 null<br>
|
||||
Pad101 null<br>
|
||||
Pad102 null<br>
|
||||
Pad103 null<br>
|
||||
Pad104 null<br>
|
||||
Pad105 null<br>
|
||||
Pad106 null<br>
|
||||
Pad107 null<br>
|
||||
Pad108 null<br>
|
||||
Pad109 null<br>
|
||||
Pad11 null<br>
|
||||
Pad110 null<br>
|
||||
Pad111 null<br>
|
||||
Pad111 null<br>
|
||||
Pad111 null<br>
|
||||
Pad111 null<br>
|
||||
Pad111 null<br>
|
||||
Pad111 null<br>
|
||||
Pad112 null<br>
|
||||
Pad113 null<br>
|
||||
Pad114 null<br>
|
||||
Pad115 null<br>
|
||||
Pad116 null<br>
|
||||
Pad117 null<br>
|
||||
Pad118 null<br>
|
||||
Pad119 null<br>
|
||||
Pad12 null<br>
|
||||
Pad120 null<br>
|
||||
Pad121 null<br>
|
||||
Pad122 null<br>
|
||||
Pad123 null<br>
|
||||
Pad123 null<br>
|
||||
Pad123 null<br>
|
||||
Pad123 null<br>
|
||||
Pad123 null<br>
|
||||
Pad123 null<br>
|
||||
Pad123 null<br>
|
||||
Pad124 null<br>
|
||||
Pad125 null<br>
|
||||
Pad126 null<br>
|
||||
Pad126 null<br>
|
||||
Pad126 null<br>
|
||||
Pad127 null<br>
|
||||
Pad127 null<br>
|
||||
Pad127 null<br>
|
||||
Pad128 null<br>
|
||||
Pad128 null<br>
|
||||
Pad128 null<br>
|
||||
Pad128 null<br>
|
||||
Pad129 null<br>
|
||||
Pad129 null<br>
|
||||
Pad13 null<br>
|
||||
Pad130 null<br>
|
||||
Pad130 null<br>
|
||||
Pad130 null<br>
|
||||
Pad131 null<br>
|
||||
Pad132 null<br>
|
||||
Pad133 null<br>
|
||||
Pad134 null<br>
|
||||
Pad135 null<br>
|
||||
Pad136 null<br>
|
||||
Pad137 null<br>
|
||||
Pad138 null<br>
|
||||
Pad138 null<br>
|
||||
Pad138 null<br>
|
||||
Pad138 null<br>
|
||||
Pad138 null<br>
|
||||
Pad138 null<br>
|
||||
Pad139 null<br>
|
||||
Pad14 null<br>
|
||||
Pad14 null<br>
|
||||
Pad140 null<br>
|
||||
Pad141 null<br>
|
||||
Pad142 null<br>
|
||||
Pad143 null<br>
|
||||
Pad144 null<br>
|
||||
Pad145 null<br>
|
||||
Pad146 null<br>
|
||||
Pad147 null<br>
|
||||
Pad148 null<br>
|
||||
Pad148 null<br>
|
||||
Pad148 null<br>
|
||||
Pad148 null<br>
|
||||
Pad148 null<br>
|
||||
Pad148 null<br>
|
||||
Pad149 null<br>
|
||||
Pad15 null<br>
|
||||
Pad150 null<br>
|
||||
Pad151 null<br>
|
||||
Pad152 null<br>
|
||||
Pad153 null<br>
|
||||
Pad154 null<br>
|
||||
Pad155 null<br>
|
||||
Pad156 null<br>
|
||||
Pad157 null<br>
|
||||
Pad158 null<br>
|
||||
Pad159 null<br>
|
||||
Pad16 null<br>
|
||||
Pad160 null<br>
|
||||
Pad161 null<br>
|
||||
Pad162 null<br>
|
||||
Pad163 null<br>
|
||||
Pad164 null<br>
|
||||
Pad165 null<br>
|
||||
Pad166 null<br>
|
||||
Pad167 null<br>
|
||||
Pad168 null<br>
|
||||
Pad169 null<br>
|
||||
Pad17 null<br>
|
||||
Pad170 null<br>
|
||||
Pad171 null<br>
|
||||
Pad172 null<br>
|
||||
Pad173 null<br>
|
||||
Pad174 null<br>
|
||||
Pad175 null<br>
|
||||
Pad176 null<br>
|
||||
Pad177 null<br>
|
||||
Pad178 null<br>
|
||||
Pad179 null<br>
|
||||
Pad18 null<br>
|
||||
Pad18 null<br>
|
||||
Pad18 null<br>
|
||||
Pad18 null<br>
|
||||
Pad180 null<br>
|
||||
Pad181 null<br>
|
||||
Pad182 null<br>
|
||||
Pad182 null<br>
|
||||
Pad182 null<br>
|
||||
Pad183 null<br>
|
||||
Pad184 null<br>
|
||||
Pad184 null<br>
|
||||
Pad184 null<br>
|
||||
Pad184 null<br>
|
||||
Pad185 null<br>
|
||||
Pad186 null<br>
|
||||
Pad187 null<br>
|
||||
Pad188 null<br>
|
||||
Pad189 null<br>
|
||||
Pad19 null<br>
|
||||
Pad190 null<br>
|
||||
Pad191 null<br>
|
||||
Pad191 null<br>
|
||||
Pad192 null<br>
|
||||
Pad193 null<br>
|
||||
Pad194 null<br>
|
||||
Pad195 null<br>
|
||||
Pad196 null<br>
|
||||
Pad197 null<br>
|
||||
Pad197 null<br>
|
||||
Pad198 null<br>
|
||||
Pad198 null<br>
|
||||
Pad199 null<br>
|
||||
Pad199 null<br>
|
||||
Pad199 null<br>
|
||||
Pad199 null<br>
|
||||
Pad2 null<br>
|
||||
Pad20 null<br>
|
||||
Pad200 null<br>
|
||||
Pad200 null<br>
|
||||
Pad200 null<br>
|
||||
Pad200 null<br>
|
||||
Pad201 null<br>
|
||||
Pad201 null<br>
|
||||
Pad201 null<br>
|
||||
Pad201 null<br>
|
||||
Pad202 null<br>
|
||||
Pad203 null<br>
|
||||
Pad203 null<br>
|
||||
Pad203 null<br>
|
||||
Pad203 null<br>
|
||||
Pad203 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad204 null<br>
|
||||
Pad205 null<br>
|
||||
Pad205 null<br>
|
||||
Pad205 null<br>
|
||||
Pad205 null<br>
|
||||
Pad206 null<br>
|
||||
Pad206 null<br>
|
||||
Pad206 null<br>
|
||||
Pad206 null<br>
|
||||
Pad207 null<br>
|
||||
Pad207 null<br>
|
||||
Pad207 null<br>
|
||||
Pad207 null<br>
|
||||
Pad208 null<br>
|
||||
Pad209 null<br>
|
||||
Pad21 null<br>
|
||||
Pad210 null<br>
|
||||
Pad211 null<br>
|
||||
Pad212 null<br>
|
||||
Pad213 null<br>
|
||||
Pad213 null<br>
|
||||
Pad213 null<br>
|
||||
Pad214 null<br>
|
||||
Pad215 null<br>
|
||||
Pad216 null<br>
|
||||
Pad217 null<br>
|
||||
Pad218 null<br>
|
||||
Pad219 null<br>
|
||||
Pad22 null<br>
|
||||
Pad22 null<br>
|
||||
Pad220 null<br>
|
||||
Pad221 null<br>
|
||||
Pad222 null<br>
|
||||
Pad222 null<br>
|
||||
Pad223 null<br>
|
||||
Pad224 null<br>
|
||||
Pad225 null<br>
|
||||
Pad226 null<br>
|
||||
Pad227 null<br>
|
||||
Pad228 null<br>
|
||||
Pad229 null<br>
|
||||
Pad23 null<br>
|
||||
Pad230 null<br>
|
||||
Pad230 null<br>
|
||||
Pad230 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad231 null<br>
|
||||
Pad232 null<br>
|
||||
Pad233 null<br>
|
||||
Pad234 null<br>
|
||||
Pad235 null<br>
|
||||
Pad235 null<br>
|
||||
Pad236 null<br>
|
||||
Pad237 null<br>
|
||||
Pad238 null<br>
|
||||
Pad239 null<br>
|
||||
Pad24 null<br>
|
||||
Pad24 null<br>
|
||||
Pad24 null<br>
|
||||
Pad240 null<br>
|
||||
Pad241 null<br>
|
||||
Pad242 null<br>
|
||||
Pad242 null<br>
|
||||
Pad243 null<br>
|
||||
Pad243 null<br>
|
||||
Pad244 null<br>
|
||||
Pad244 null<br>
|
||||
Pad244 null<br>
|
||||
Pad244 null<br>
|
||||
Pad245 null<br>
|
||||
Pad246 null<br>
|
||||
Pad246 null<br>
|
||||
Pad247 null<br>
|
||||
Pad248 null<br>
|
||||
Pad249 null<br>
|
||||
Pad25 null<br>
|
||||
Pad25 null<br>
|
||||
Pad250 null<br>
|
||||
Pad251 null<br>
|
||||
Pad252 null<br>
|
||||
Pad253 null<br>
|
||||
Pad254 null<br>
|
||||
Pad255 null<br>
|
||||
Pad256 null<br>
|
||||
Pad256 null<br>
|
||||
Pad256 null<br>
|
||||
Pad257 null<br>
|
||||
Pad258 null<br>
|
||||
Pad259 null<br>
|
||||
Pad26 null<br>
|
||||
Pad260 null<br>
|
||||
Pad261 null<br>
|
||||
Pad262 null<br>
|
||||
Pad262 null<br>
|
||||
Pad27 null<br>
|
||||
Pad28 null<br>
|
||||
Pad29 null<br>
|
||||
Pad3 null<br>
|
||||
Pad30 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad32 null<br>
|
||||
Pad33 null<br>
|
||||
Pad33 null<br>
|
||||
Pad33 null<br>
|
||||
Pad33 null<br>
|
||||
Pad33 null<br>
|
||||
Pad34 null<br>
|
||||
Pad35 null<br>
|
||||
Pad36 null<br>
|
||||
Pad37 null<br>
|
||||
Pad38 null<br>
|
||||
Pad38 null<br>
|
||||
Pad39 null<br>
|
||||
Pad39 null<br>
|
||||
Pad4 null<br>
|
||||
Pad40 null<br>
|
||||
Pad41 null<br>
|
||||
Pad42 null<br>
|
||||
Pad42 null<br>
|
||||
Pad42 null<br>
|
||||
Pad43 null<br>
|
||||
Pad43 null<br>
|
||||
Pad43 null<br>
|
||||
Pad44 null<br>
|
||||
Pad44 null<br>
|
||||
Pad44 null<br>
|
||||
Pad44 null<br>
|
||||
Pad45 null<br>
|
||||
Pad46 null<br>
|
||||
Pad47 null<br>
|
||||
Pad48 null<br>
|
||||
Pad49 null<br>
|
||||
Pad5 null<br>
|
||||
Pad50 null<br>
|
||||
Pad50 null<br>
|
||||
Pad50 null<br>
|
||||
Pad50 null<br>
|
||||
Pad50 null<br>
|
||||
Pad51 null<br>
|
||||
Pad52 null<br>
|
||||
Pad53 null<br>
|
||||
Pad54 null<br>
|
||||
Pad54 null<br>
|
||||
Pad55 null<br>
|
||||
Pad56 null<br>
|
||||
Pad57 null<br>
|
||||
Pad58 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad59 null<br>
|
||||
Pad6 null<br>
|
||||
Pad6 null<br>
|
||||
Pad6 null<br>
|
||||
Pad60 null<br>
|
||||
Pad61 null<br>
|
||||
Pad62 null<br>
|
||||
Pad63 null<br>
|
||||
Pad64 null<br>
|
||||
Pad65 null<br>
|
||||
Pad66 null<br>
|
||||
Pad67 null<br>
|
||||
Pad68 null<br>
|
||||
Pad68 null<br>
|
||||
Pad69 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad70 null<br>
|
||||
Pad71 null<br>
|
||||
Pad71 null<br>
|
||||
Pad71 null<br>
|
||||
Pad71 null<br>
|
||||
Pad71 null<br>
|
||||
Pad72 null<br>
|
||||
Pad72 null<br>
|
||||
Pad72 null<br>
|
||||
Pad72 null<br>
|
||||
Pad72 null<br>
|
||||
Pad73 null<br>
|
||||
Pad74 null<br>
|
||||
Pad75 null<br>
|
||||
Pad76 null<br>
|
||||
Pad77 null<br>
|
||||
Pad78 null<br>
|
||||
Pad79 null<br>
|
||||
Pad8 null<br>
|
||||
Pad80 null<br>
|
||||
Pad80 null<br>
|
||||
Pad80 null<br>
|
||||
Pad80 null<br>
|
||||
Pad81 null<br>
|
||||
Pad82 null<br>
|
||||
Pad82 null<br>
|
||||
Pad83 null<br>
|
||||
Pad84 null<br>
|
||||
Pad84 null<br>
|
||||
Pad85 null<br>
|
||||
Pad86 null<br>
|
||||
Pad87 null<br>
|
||||
Pad88 null<br>
|
||||
Pad89 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad90 null<br>
|
||||
Pad91 null<br>
|
||||
Pad92 null<br>
|
||||
Pad92 null<br>
|
||||
Pad92 null<br>
|
||||
Pad92 null<br>
|
||||
Pad92 null<br>
|
||||
Pad92 null<br>
|
||||
Pad92 null<br>
|
||||
Pad93 null<br>
|
||||
Pad93 null<br>
|
||||
Pad94 null<br>
|
||||
Pad94 null<br>
|
||||
Pad95 null<br>
|
||||
Pad95 null<br>
|
||||
Pad96 null<br>
|
||||
Pad96 null<br>
|
||||
Pad97 null<br>
|
||||
Pad98 null<br>
|
||||
Pad98 null<br>
|
||||
Pad99 null<br>
|
||||
R1 N001 N027 100K<br>
|
||||
R1 N009 N011 1.5K<br>
|
||||
R1 N010 N011 3.3K<br>
|
||||
R1 N011 N008 1.5K<br>
|
||||
R1 N011 N016 100K<br>
|
||||
R1 N011 N020 68K<br>
|
||||
R1 N011 N023 4.7K<br>
|
||||
R1 N011 N047 100K<br>
|
||||
R1 N012 N011 15K<br>
|
||||
R1 N013 N011 100K<br>
|
||||
R1 N015 N013 220K<br>
|
||||
R1 N017 N019 270K<br>
|
||||
R1 N018 N022 100K<br>
|
||||
R1 N018 N034 150K<br>
|
||||
R1 N019 N001 2.2K<br>
|
||||
R1 N020 N031 270K<br>
|
||||
R1 N023 N006 150K<br>
|
||||
R1 N024 N019 82K<br>
|
||||
R1 N025 N011 1.5K<br>
|
||||
R1 N026 N034 100K<br>
|
||||
R1 N029 N011 15K<br>
|
||||
R1 N030 N006 47K<br>
|
||||
R1 N034 N019 2.2K<br>
|
||||
R1 N043 N048 680K<br>
|
||||
R1 N046 N011 1.5K<br>
|
||||
R2 N014 N011 680K<br>
|
||||
R3 N032 N047 470K<br>
|
||||
R3 N047 N033 1.5K<br>
|
||||
R4 N005 N042 4.7K<br>
|
||||
R5 N011 N036 470K<br>
|
||||
R6 N016 N014 3.3M<br>
|
||||
R7 N035 N001 470K<br>
|
||||
R7 N035 N011 100K<br>
|
||||
R7 N045 N001 560Ω<br>
|
||||
R7 N045 N011 180K<br>
|
||||
R8 N035 N188 100Ω<br>
|
||||
R8 N035 N189 100Ω<br>
|
||||
RL1 N011 N011 N011 N011 N011 N051 N052 N005 N028 N053 N011 N054 N048 N055 N056 N039 <br>
|
||||
RL2 N011 N011 N011 N011 N011 N057 N058 N005 N014 N059 N060 N061 N013 N062 N063 N039 <br>
|
||||
RL3 N011 N011 N011 N011 N011 N064 N065 N005 N044 N066 N038 N067 N011 N068 N069 N039 <br>
|
||||
Rect N154 N155 N004 N003 <br>
|
||||
SW1 N156 N157 N158 N159 N160 N161 DPDT<br>
|
||||
Trace1 null<br>
|
||||
Trace10 null<br>
|
||||
Trace10 null<br>
|
||||
Trace100 null<br>
|
||||
Trace100 null<br>
|
||||
Trace100 null<br>
|
||||
Trace101 null<br>
|
||||
Trace102 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace103 null<br>
|
||||
Trace104 null<br>
|
||||
Trace105 null<br>
|
||||
Trace105 null<br>
|
||||
Trace105 null<br>
|
||||
Trace106 null<br>
|
||||
Trace106 null<br>
|
||||
Trace107 null<br>
|
||||
Trace108 null<br>
|
||||
Trace109 null<br>
|
||||
Trace11 null<br>
|
||||
Trace11 null<br>
|
||||
Trace110 null<br>
|
||||
Trace111 null<br>
|
||||
Trace112 null<br>
|
||||
Trace112 null<br>
|
||||
Trace112 null<br>
|
||||
Trace112 null<br>
|
||||
Trace113 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace114 null<br>
|
||||
Trace115 null<br>
|
||||
Trace116 null<br>
|
||||
Trace117 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace118 null<br>
|
||||
Trace119 null<br>
|
||||
Trace12 null<br>
|
||||
Trace120 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace121 null<br>
|
||||
Trace122 null<br>
|
||||
Trace123 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace124 null<br>
|
||||
Trace125 null<br>
|
||||
Trace126 null<br>
|
||||
Trace127 null<br>
|
||||
Trace127 null<br>
|
||||
Trace128 null<br>
|
||||
Trace129 null<br>
|
||||
Trace13 null<br>
|
||||
Trace130 null<br>
|
||||
Trace131 null<br>
|
||||
Trace132 null<br>
|
||||
Trace132 null<br>
|
||||
Trace132 null<br>
|
||||
Trace132 null<br>
|
||||
Trace132 null<br>
|
||||
Trace133 null<br>
|
||||
Trace133 null<br>
|
||||
Trace133 null<br>
|
||||
Trace134 null<br>
|
||||
Trace135 null<br>
|
||||
Trace136 null<br>
|
||||
Trace136 null<br>
|
||||
Trace136 null<br>
|
||||
Trace137 null<br>
|
||||
Trace138 null<br>
|
||||
Trace139 null<br>
|
||||
Trace14 null<br>
|
||||
Trace14 null<br>
|
||||
Trace14 null<br>
|
||||
Trace140 null<br>
|
||||
Trace141 null<br>
|
||||
Trace142 null<br>
|
||||
Trace143 null<br>
|
||||
Trace144 null<br>
|
||||
Trace145 null<br>
|
||||
Trace146 null<br>
|
||||
Trace147 null<br>
|
||||
Trace148 null<br>
|
||||
Trace149 null<br>
|
||||
Trace15 null<br>
|
||||
Trace15 null<br>
|
||||
Trace15 null<br>
|
||||
Trace15 null<br>
|
||||
Trace150 null<br>
|
||||
Trace151 null<br>
|
||||
Trace152 null<br>
|
||||
Trace153 null<br>
|
||||
Trace154 null<br>
|
||||
Trace155 null<br>
|
||||
Trace155 null<br>
|
||||
Trace156 null<br>
|
||||
Trace157 null<br>
|
||||
Trace157 null<br>
|
||||
Trace157 null<br>
|
||||
Trace158 null<br>
|
||||
Trace159 null<br>
|
||||
Trace16 null<br>
|
||||
Trace160 null<br>
|
||||
Trace161 null<br>
|
||||
Trace162 null<br>
|
||||
Trace163 null<br>
|
||||
Trace164 null<br>
|
||||
Trace165 null<br>
|
||||
Trace166 null<br>
|
||||
Trace166 null<br>
|
||||
Trace166 null<br>
|
||||
Trace166 null<br>
|
||||
Trace166 null<br>
|
||||
Trace166 null<br>
|
||||
Trace166 null<br>
|
||||
Trace167 null<br>
|
||||
Trace168 null<br>
|
||||
Trace169 null<br>
|
||||
Trace17 null<br>
|
||||
Trace170 null<br>
|
||||
Trace171 null<br>
|
||||
Trace172 null<br>
|
||||
Trace18 null<br>
|
||||
Trace19 null<br>
|
||||
Trace2 null<br>
|
||||
Trace20 null<br>
|
||||
Trace21 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace22 null<br>
|
||||
Trace23 null<br>
|
||||
Trace23 null<br>
|
||||
Trace23 null<br>
|
||||
Trace24 null<br>
|
||||
Trace25 null<br>
|
||||
Trace25 null<br>
|
||||
Trace26 null<br>
|
||||
Trace27 null<br>
|
||||
Trace28 null<br>
|
||||
Trace28 null<br>
|
||||
Trace28 null<br>
|
||||
Trace28 null<br>
|
||||
Trace28 null<br>
|
||||
Trace28 null<br>
|
||||
Trace28 null<br>
|
||||
Trace29 null<br>
|
||||
Trace3 null<br>
|
||||
Trace30 null<br>
|
||||
Trace31 null<br>
|
||||
Trace31 null<br>
|
||||
Trace32 null<br>
|
||||
Trace33 null<br>
|
||||
Trace34 null<br>
|
||||
Trace34 null<br>
|
||||
Trace34 null<br>
|
||||
Trace35 null<br>
|
||||
Trace36 null<br>
|
||||
Trace37 null<br>
|
||||
Trace37 null<br>
|
||||
Trace38 null<br>
|
||||
Trace39 null<br>
|
||||
Trace4 null<br>
|
||||
Trace40 null<br>
|
||||
Trace41 null<br>
|
||||
Trace42 null<br>
|
||||
Trace42 null<br>
|
||||
Trace42 null<br>
|
||||
Trace42 null<br>
|
||||
Trace42 null<br>
|
||||
Trace42 null<br>
|
||||
Trace42 null<br>
|
||||
Trace43 null<br>
|
||||
Trace44 null<br>
|
||||
Trace45 null<br>
|
||||
Trace45 null<br>
|
||||
Trace45 null<br>
|
||||
Trace46 null<br>
|
||||
Trace46 null<br>
|
||||
Trace47 null<br>
|
||||
Trace48 null<br>
|
||||
Trace48 null<br>
|
||||
Trace49 null<br>
|
||||
Trace49 null<br>
|
||||
Trace5 null<br>
|
||||
Trace5 null<br>
|
||||
Trace5 null<br>
|
||||
Trace50 null<br>
|
||||
Trace51 null<br>
|
||||
Trace52 null<br>
|
||||
Trace52 null<br>
|
||||
Trace53 null<br>
|
||||
Trace54 null<br>
|
||||
Trace55 null<br>
|
||||
Trace56 null<br>
|
||||
Trace57 null<br>
|
||||
Trace58 null<br>
|
||||
Trace59 null<br>
|
||||
Trace6 null<br>
|
||||
Trace6 null<br>
|
||||
Trace6 null<br>
|
||||
Trace6 null<br>
|
||||
Trace60 null<br>
|
||||
Trace61 null<br>
|
||||
Trace61 null<br>
|
||||
Trace62 null<br>
|
||||
Trace63 null<br>
|
||||
Trace64 null<br>
|
||||
Trace65 null<br>
|
||||
Trace66 null<br>
|
||||
Trace67 null<br>
|
||||
Trace68 null<br>
|
||||
Trace69 null<br>
|
||||
Trace7 null<br>
|
||||
Trace70 null<br>
|
||||
Trace71 null<br>
|
||||
Trace71 null<br>
|
||||
Trace72 null<br>
|
||||
Trace73 null<br>
|
||||
Trace74 null<br>
|
||||
Trace75 null<br>
|
||||
Trace75 null<br>
|
||||
Trace76 null<br>
|
||||
Trace77 null<br>
|
||||
Trace78 null<br>
|
||||
Trace79 null<br>
|
||||
Trace8 null<br>
|
||||
Trace80 null<br>
|
||||
Trace81 null<br>
|
||||
Trace81 null<br>
|
||||
Trace81 null<br>
|
||||
Trace81 null<br>
|
||||
Trace81 null<br>
|
||||
Trace81 null<br>
|
||||
Trace82 null<br>
|
||||
Trace83 null<br>
|
||||
Trace84 null<br>
|
||||
Trace85 null<br>
|
||||
Trace85 null<br>
|
||||
Trace86 null<br>
|
||||
Trace87 null<br>
|
||||
Trace87 null<br>
|
||||
Trace87 null<br>
|
||||
Trace87 null<br>
|
||||
Trace87 null<br>
|
||||
Trace87 null<br>
|
||||
Trace88 null<br>
|
||||
Trace89 null<br>
|
||||
Trace9 null<br>
|
||||
Trace90 null<br>
|
||||
Trace91 null<br>
|
||||
Trace92 null<br>
|
||||
Trace93 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace94 null<br>
|
||||
Trace95 null<br>
|
||||
Trace96 null<br>
|
||||
Trace97 null<br>
|
||||
Trace98 null<br>
|
||||
Trace99 null<br>
|
||||
Treble N006 N006 N021 250K<br>
|
||||
V1 N135 N008 N136 N018 N137 N138 N025 N037 N026 N139 <br>
|
||||
V1 N140 N009 N036 N024 N141 N142 N010 N020 N017 N143 <br>
|
||||
V1 N144 N046 N014 N027 N145 N146 N033 N032 N001 N147 <br>
|
||||
V1 N190 N191 N192 N193 N194 N195 N196 N197 N198 N199 <br>
|
||||
V1 N215 N216 N217 N218 N219 N220 N221 N222 N223 N224 <br>
|
||||
V1 N237 N238 N239 N240 N241 N242 N243 N244 N245 N246 <br>
|
||||
Volume N011 N037 N006 1M<br>
|
||||
W1 N083 N084 N085 N086 null<br>
|
||||
W1 N087 N088 N089 N090 null<br>
|
||||
W1 N091 N092 N093 N094 null<br>
|
||||
W1 N095 N096 N097 N098 null<br>
|
||||
W1 N103 N104 N105 N106 null<br>
|
||||
W1 N107 N108 N109 N110 null<br>
|
||||
W1 N111 N112 N113 N114 null<br>
|
||||
W1 N115 N116 N117 N118 null<br>
|
||||
W1 N119 N120 N121 N122 null<br>
|
||||
W1 N131 N132 N133 N134 null<br>
|
||||
W1 N170 N171 N172 N173 null<br>
|
||||
W1 N174 N175 N176 N177 null<br>
|
||||
W1 N182 N183 N184 N185 null<br>
|
||||
W2 N127 N128 N129 N130 null<br>
|
||||
W3 N099 N100 N101 N102 null<br>
|
||||
W3 N123 N124 N125 N126 null<br>
|
||||
W4 N162 N163 N164 N165 null<br>
|
||||
W4 N166 N167 N168 N169 null<br>
|
||||
W5 N178 N179 N180 N181 null<br>
|
||||
W6 N200 N201 N202 null<br>
|
||||
W6 N203 N204 N205 null<br>
|
||||
W6 N206 N207 N208 null<br>
|
||||
W6 N209 N210 N211 null<br>
|
||||
W6 N212 N213 N214 null<br>
|
||||
W6 N225 N226 N227 null<br>
|
||||
W6 N228 N229 N230 null<br>
|
||||
W6 N231 N232 N233 null<br>
|
||||
W6 N234 N235 N236 null<br>
|
||||
W6 N247 N248 N249 null<br>
|
||||
W6 N250 N251 N252 null<br>
|
||||
W6 N253 N254 N255 null<br>
|
||||
W6 N256 N257 N258 null<br>
|
||||
W7 N259 N260 N261 N262 null<br>
|
||||
@@ -0,0 +1,182 @@
|
||||
<b>Switch configuration: [Default]</b><br><br>Board1 <br>
|
||||
Board2 <br>
|
||||
Board3 <br>
|
||||
Board4 <br>
|
||||
Board5 <br>
|
||||
C1 N019 N001 2.2uF<br>
|
||||
C10 N002 N003 330uF<br>
|
||||
C2 N002 N004 100uF<br>
|
||||
C3 N005 N006 2.2uF<br>
|
||||
C4 N002 N007 100uF<br>
|
||||
C5 N008 N009 220nF<br>
|
||||
C6 N002 N010 330uF<br>
|
||||
C7 N002 N011 330uF<br>
|
||||
C8 N135 N012 220nF<br>
|
||||
C9 N002 N013 100uF<br>
|
||||
D1 N003 N014 <br>
|
||||
D2 N014 N002 <br>
|
||||
D3 N015 N002 <br>
|
||||
D4 N003 N015 <br>
|
||||
Eyelet1 <br>
|
||||
Eyelet10 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet12 <br>
|
||||
Eyelet13 <br>
|
||||
Eyelet14 <br>
|
||||
Eyelet15 <br>
|
||||
Eyelet16 <br>
|
||||
Eyelet17 <br>
|
||||
Eyelet18 <br>
|
||||
Eyelet19 <br>
|
||||
Eyelet2 <br>
|
||||
Eyelet20 <br>
|
||||
Eyelet21 <br>
|
||||
Eyelet22 <br>
|
||||
Eyelet23 <br>
|
||||
Eyelet24 <br>
|
||||
Eyelet25 <br>
|
||||
Eyelet26 <br>
|
||||
Eyelet27 <br>
|
||||
Eyelet28 <br>
|
||||
Eyelet29 <br>
|
||||
Eyelet3 <br>
|
||||
Eyelet30 <br>
|
||||
Eyelet31 <br>
|
||||
Eyelet32 <br>
|
||||
Eyelet33 <br>
|
||||
Eyelet34 <br>
|
||||
Eyelet35 <br>
|
||||
Eyelet36 <br>
|
||||
Eyelet37 <br>
|
||||
Eyelet38 <br>
|
||||
Eyelet39 <br>
|
||||
Eyelet4 <br>
|
||||
Eyelet40 <br>
|
||||
Eyelet42 <br>
|
||||
Eyelet43 <br>
|
||||
Eyelet44 <br>
|
||||
Eyelet45 <br>
|
||||
Eyelet46 <br>
|
||||
Eyelet47 <br>
|
||||
Eyelet48 <br>
|
||||
Eyelet49 <br>
|
||||
Eyelet5 <br>
|
||||
Eyelet52 <br>
|
||||
Eyelet53 <br>
|
||||
Eyelet54 <br>
|
||||
Eyelet55 <br>
|
||||
Eyelet56 <br>
|
||||
Eyelet6 <br>
|
||||
Eyelet7 <br>
|
||||
Eyelet8 <br>
|
||||
Eyelet9 <br>
|
||||
L1 In<br>
|
||||
L10 diy-fever.com<br>
|
||||
L11 42TU011<br>
|
||||
L12 42TU048<br>
|
||||
L13 Xicon<br>
|
||||
L14 Xicon<br>
|
||||
L15 Alt In<br>
|
||||
L16 AC<br>
|
||||
L17 AC<br>
|
||||
L18 ** Omit diodes on far right if using with a battery<br>
|
||||
L19 (under)<br>
|
||||
L2 Gnd<br>
|
||||
L20 Q1: AC125<br>
|
||||
L21 Q2: AC126<br>
|
||||
L22 Q3, Q4: AC128<br>
|
||||
L23 Q0: Any PNP Ge or Si transistor<br>
|
||||
L24 (under)<br>
|
||||
L3 Out<br>
|
||||
L4 -9V<br>
|
||||
L5 Gnd<br>
|
||||
L6 * Parts around Q0 make the input buffer. Omit everything on the greenish part of the board if the buffer is not needed<br>
|
||||
L7 (under)<br>
|
||||
L8 (under)<br>
|
||||
L9 Deacy Amp<br>
|
||||
Q0 N013 N133 N134 ; Pinout not configured, validate this line<br>
|
||||
Q1 N005 N020 N021 ; Pinout not configured, validate this line<br>
|
||||
Q2 N022 N023 N024 ; Pinout not configured, validate this line<br>
|
||||
Q3 N009 N025 N026 ; Pinout not configured, validate this line<br>
|
||||
Q4 N016 N027 N028 ; Pinout not configured, validate this line<br>
|
||||
R1 N017 N002 15K<br>
|
||||
R10 N018 N002 39Ω<br>
|
||||
R11 N016 N002 3.3Ω<br>
|
||||
R12 N010 N009 560K<br>
|
||||
R13 N008 N065 120Ω<br>
|
||||
R14 N010 N018 2.2K<br>
|
||||
R15 N012 N002 470K<br>
|
||||
R16 N001 N002 10K<br>
|
||||
R17 N013 N012 470K<br>
|
||||
R18 N011 N013 100Ω<br>
|
||||
R19 N010 N003 100Ω<br>
|
||||
R2 N011 N017 82K<br>
|
||||
R3 N011 N005 5.6K<br>
|
||||
R4 N004 N002 1.2K<br>
|
||||
R5 N006 N010 2.2K<br>
|
||||
R6 N010 N002 12K<br>
|
||||
R7 N007 N002 680Ω<br>
|
||||
R8 N011 N010 47K<br>
|
||||
R9 N011 N010 2.2K<br>
|
||||
Trace1 null<br>
|
||||
Trace2 null<br>
|
||||
Trace3 null<br>
|
||||
Trace4 null<br>
|
||||
Trace5 null<br>
|
||||
Trace6 null<br>
|
||||
Trace7 null<br>
|
||||
Trace8 null<br>
|
||||
Trace9 null<br>
|
||||
W1 N029 N030 N031 null<br>
|
||||
W10 N056 N057 N058 null<br>
|
||||
W11 N059 N060 N061 null<br>
|
||||
W12 N062 N063 N064 null<br>
|
||||
W13 N066 N067 N068 null<br>
|
||||
W14 N069 N070 N071 null<br>
|
||||
W15 N072 N073 N074 null<br>
|
||||
W16 N075 N076 N077 N078 null<br>
|
||||
W17 N079 N080 N081 N082 null<br>
|
||||
W18 N083 N084 N085 N086 null<br>
|
||||
W19 N087 N088 N089 N090 null<br>
|
||||
W2 N032 N033 N034 null<br>
|
||||
W20 N091 N092 N093 null<br>
|
||||
W21 N094 N095 N096 N097 null<br>
|
||||
W22 N098 N099 N100 null<br>
|
||||
W23 N101 N102 N103 null<br>
|
||||
W24 N104 N105 N106 null<br>
|
||||
W25 N107 N108 N109 N110 null<br>
|
||||
W26 N111 N112 N113 N114 null<br>
|
||||
W27 N115 N116 N117 null<br>
|
||||
W28 N118 N119 N120 null<br>
|
||||
W29 N121 N122 N123 null<br>
|
||||
W3 N035 N036 N037 null<br>
|
||||
W30 N124 N125 N126 null<br>
|
||||
W31 N127 N128 N129 null<br>
|
||||
W32 N130 N131 N132 null<br>
|
||||
W33 N136 N137 N138 null<br>
|
||||
W34 N139 N140 N141 null<br>
|
||||
W35 N142 N143 N144 null<br>
|
||||
W36 N145 N146 N147 null<br>
|
||||
W37 N148 N149 N150 null<br>
|
||||
W38 N155 N156 N157 N158 null<br>
|
||||
W39 N151 N152 N153 N154 null<br>
|
||||
W4 N038 N039 N040 null<br>
|
||||
W40 N159 N160 N161 N162 null<br>
|
||||
W41 N163 N164 N165 N166 null<br>
|
||||
W42 N167 N168 N169 N170 null<br>
|
||||
W43 N171 N172 N173 N174 null<br>
|
||||
W44 N175 N176 N177 null<br>
|
||||
W45 N178 N179 N180 N181 null<br>
|
||||
W46 N203 N204 N205 null<br>
|
||||
W47 N182 N183 N184 N185 null<br>
|
||||
W48 N186 N187 N188 N189 null<br>
|
||||
W49 N190 N191 N192 N193 null<br>
|
||||
W5 N041 N042 N043 null<br>
|
||||
W50 N194 N195 N196 null<br>
|
||||
W51 N197 N198 N199 null<br>
|
||||
W52 N200 N201 N202 null<br>
|
||||
W53 N206 N207 N208 null<br>
|
||||
W6 N044 N045 N046 null<br>
|
||||
W7 N047 N048 N049 null<br>
|
||||
W8 N050 N051 N052 null<br>
|
||||
W9 N053 N054 N055 null<br>
|
||||
@@ -0,0 +1,41 @@
|
||||
<b>Switch configuration: [Default]</b><br><br>C1 N001 N008 47nF<br>
|
||||
C1 N002 N003 10nF<br>
|
||||
C2 N004 N003 10uF<br>
|
||||
C2 N010 N011 4.7uF<br>
|
||||
Dot1 null<br>
|
||||
Dot2 null<br>
|
||||
Dot3 null<br>
|
||||
Dot4 null<br>
|
||||
Dot5 null<br>
|
||||
Dot6 null<br>
|
||||
Dot7 null<br>
|
||||
Dot8 null<br>
|
||||
GND1 N003 null<br>
|
||||
GND2 N003 null<br>
|
||||
GND2 N003 null<br>
|
||||
GND3 N003 null<br>
|
||||
L1 In<br>
|
||||
L1 Out<br>
|
||||
L2 9V<br>
|
||||
L3 D<br>
|
||||
L3 G<br>
|
||||
L3 S<br>
|
||||
L4 *<br>
|
||||
L5 *<br>
|
||||
L6 *<br>
|
||||
L7 * added in version 2<br>
|
||||
L8 JFET Booster<br>
|
||||
L9 diy-fever.com<br>
|
||||
LN1 null<br>
|
||||
LN2 null<br>
|
||||
LN3 null<br>
|
||||
LN4 null<br>
|
||||
LN5 null<br>
|
||||
LN5 null<br>
|
||||
Q1 N007 N001 N005 J201<br>
|
||||
R1 N005 N009 1.5K<br>
|
||||
R2 N004 N001 8.2K<br>
|
||||
R2 N006 N003 1M<br>
|
||||
R2 N012 N004 470Ω<br>
|
||||
R2 N013 N006 68K<br>
|
||||
R2 N014 N002 220K<br>
|
||||
@@ -0,0 +1,144 @@
|
||||
<b>Switch configuration: [.ON1:SW1.Middle]</b><br><br> N055 N056 N057 N058 N059 N060 DPDT<br>
|
||||
Bucker N001 N001 N001 N002 <br>
|
||||
C1 N003 N001 20nF<br>
|
||||
J1 N004 N001 <br>
|
||||
SW1 N006 N007 N008 N009 <br>
|
||||
Single N001 N005 Rhythm<br>
|
||||
VR1 N002 N004 N001 500K<br>
|
||||
VR2 N005 N004 N001 500K<br>
|
||||
VR3 N046 N003 N004 500K<br>
|
||||
W1 N010 N011 N012 N013 null<br>
|
||||
W1 N014 N015 N016 N017 null<br>
|
||||
W1 N038 N039 N040 N041 null<br>
|
||||
W2 N018 N019 N020 N021 null<br>
|
||||
W2 N022 N023 N024 N025 null<br>
|
||||
W2 N034 N035 N036 N037 null<br>
|
||||
W2 N073 N074 N075 N076 null<br>
|
||||
W3 N026 N027 N028 N029 null<br>
|
||||
W3 N030 N031 N032 N033 null<br>
|
||||
W3 N042 N043 N044 N045 null<br>
|
||||
W3 N047 N048 N049 N050 null<br>
|
||||
W4 N051 N052 N053 N054 null<br>
|
||||
W5 N061 N062 N063 N064 null<br>
|
||||
W5 N065 N066 N067 N068 null<br>
|
||||
W5 N069 N070 N071 N072 null<br>
|
||||
<b>Switch configuration: [.ON1:SW1.Rhythm, .ON2:SW1.Rhythm]</b><br><br> N056 N057 N058 N059 N060 N061 DPDT<br>
|
||||
Bucker N001 N001 N001 N002 <br>
|
||||
C1 N003 N001 20nF<br>
|
||||
J1 N004 N001 <br>
|
||||
SW1 N006 N007 N008 N009 <br>
|
||||
Single N001 N005 Rhythm<br>
|
||||
VR1 N002 N034 N001 500K<br>
|
||||
VR2 N005 N004 N001 500K<br>
|
||||
VR3 N047 N003 N004 500K<br>
|
||||
W1 N010 N011 N012 N013 null<br>
|
||||
W1 N014 N015 N016 N017 null<br>
|
||||
W1 N039 N040 N041 N042 null<br>
|
||||
W2 N018 N019 N020 N021 null<br>
|
||||
W2 N022 N023 N024 N025 null<br>
|
||||
W2 N035 N036 N037 N038 null<br>
|
||||
W2 N074 N075 N076 N077 null<br>
|
||||
W3 N026 N027 N028 N029 null<br>
|
||||
W3 N030 N031 N032 N033 null<br>
|
||||
W3 N043 N044 N045 N046 null<br>
|
||||
W3 N048 N049 N050 N051 null<br>
|
||||
W4 N052 N053 N054 N055 null<br>
|
||||
W5 N062 N063 N064 N065 null<br>
|
||||
W5 N066 N067 N068 N069 null<br>
|
||||
W5 N070 N071 N072 N073 null<br>
|
||||
<b>Switch configuration: [.ON1:SW1.Treble]</b><br><br> N056 N057 N058 N059 N060 N061 DPDT<br>
|
||||
Bucker N001 N001 N001 N002 <br>
|
||||
C1 N003 N001 20nF<br>
|
||||
J1 N004 N001 <br>
|
||||
SW1 N006 N007 N008 N009 <br>
|
||||
Single N001 N005 Rhythm<br>
|
||||
VR1 N002 N004 N001 500K<br>
|
||||
VR2 N005 N038 N001 500K<br>
|
||||
VR3 N047 N003 N004 500K<br>
|
||||
W1 N010 N011 N012 N013 null<br>
|
||||
W1 N014 N015 N016 N017 null<br>
|
||||
W1 N039 N040 N041 N042 null<br>
|
||||
W2 N018 N019 N020 N021 null<br>
|
||||
W2 N022 N023 N024 N025 null<br>
|
||||
W2 N034 N035 N036 N037 null<br>
|
||||
W2 N074 N075 N076 N077 null<br>
|
||||
W3 N026 N027 N028 N029 null<br>
|
||||
W3 N030 N031 N032 N033 null<br>
|
||||
W3 N043 N044 N045 N046 null<br>
|
||||
W3 N048 N049 N050 N051 null<br>
|
||||
W4 N052 N053 N054 N055 null<br>
|
||||
W5 N062 N063 N064 N065 null<br>
|
||||
W5 N066 N067 N068 N069 null<br>
|
||||
W5 N070 N071 N072 N073 null<br>
|
||||
<b>Switch configuration: [.ON2:SW1.Middle]</b><br><br> N056 N057 N058 N059 N060 N061 DPDT<br>
|
||||
Bucker N002 N001 N001 N003 <br>
|
||||
C1 N004 N002 20nF<br>
|
||||
J1 N005 N002 <br>
|
||||
SW1 N007 N008 N009 N010 <br>
|
||||
Single N002 N006 Rhythm<br>
|
||||
VR1 N003 N005 N002 500K<br>
|
||||
VR2 N006 N005 N002 500K<br>
|
||||
VR3 N047 N004 N005 500K<br>
|
||||
W1 N011 N012 N013 N014 null<br>
|
||||
W1 N015 N016 N017 N018 null<br>
|
||||
W1 N039 N040 N041 N042 null<br>
|
||||
W2 N019 N020 N021 N022 null<br>
|
||||
W2 N023 N024 N025 N026 null<br>
|
||||
W2 N035 N036 N037 N038 null<br>
|
||||
W2 N074 N075 N076 N077 null<br>
|
||||
W3 N027 N028 N029 N030 null<br>
|
||||
W3 N031 N032 N033 N034 null<br>
|
||||
W3 N043 N044 N045 N046 null<br>
|
||||
W3 N048 N049 N050 N051 null<br>
|
||||
W4 N052 N053 N054 N055 null<br>
|
||||
W5 N062 N063 N064 N065 null<br>
|
||||
W5 N066 N067 N068 N069 null<br>
|
||||
W5 N070 N071 N072 N073 null<br>
|
||||
<b>Switch configuration: [.ON2:SW1.Rhythm]</b><br><br> N057 N058 N059 N060 N061 N062 DPDT<br>
|
||||
Bucker N002 N001 N001 N003 <br>
|
||||
C1 N004 N002 20nF<br>
|
||||
J1 N005 N002 <br>
|
||||
SW1 N007 N008 N009 N010 <br>
|
||||
Single N002 N006 Rhythm<br>
|
||||
VR1 N003 N035 N002 500K<br>
|
||||
VR2 N006 N005 N002 500K<br>
|
||||
VR3 N048 N004 N005 500K<br>
|
||||
W1 N011 N012 N013 N014 null<br>
|
||||
W1 N015 N016 N017 N018 null<br>
|
||||
W1 N040 N041 N042 N043 null<br>
|
||||
W2 N019 N020 N021 N022 null<br>
|
||||
W2 N023 N024 N025 N026 null<br>
|
||||
W2 N036 N037 N038 N039 null<br>
|
||||
W2 N075 N076 N077 N078 null<br>
|
||||
W3 N027 N028 N029 N030 null<br>
|
||||
W3 N031 N032 N033 N034 null<br>
|
||||
W3 N044 N045 N046 N047 null<br>
|
||||
W3 N049 N050 N051 N052 null<br>
|
||||
W4 N053 N054 N055 N056 null<br>
|
||||
W5 N063 N064 N065 N066 null<br>
|
||||
W5 N067 N068 N069 N070 null<br>
|
||||
W5 N071 N072 N073 N074 null<br>
|
||||
<b>Switch configuration: [.ON2:SW1.Treble]</b><br><br> N057 N058 N059 N060 N061 N062 DPDT<br>
|
||||
Bucker N002 N001 N001 N003 <br>
|
||||
C1 N004 N002 20nF<br>
|
||||
J1 N005 N002 <br>
|
||||
SW1 N007 N008 N009 N010 <br>
|
||||
Single N002 N006 Rhythm<br>
|
||||
VR1 N003 N005 N002 500K<br>
|
||||
VR2 N006 N039 N002 500K<br>
|
||||
VR3 N048 N004 N005 500K<br>
|
||||
W1 N011 N012 N013 N014 null<br>
|
||||
W1 N015 N016 N017 N018 null<br>
|
||||
W1 N040 N041 N042 N043 null<br>
|
||||
W2 N019 N020 N021 N022 null<br>
|
||||
W2 N023 N024 N025 N026 null<br>
|
||||
W2 N035 N036 N037 N038 null<br>
|
||||
W2 N075 N076 N077 N078 null<br>
|
||||
W3 N027 N028 N029 N030 null<br>
|
||||
W3 N031 N032 N033 N034 null<br>
|
||||
W3 N044 N045 N046 N047 null<br>
|
||||
W3 N049 N050 N051 N052 null<br>
|
||||
W4 N053 N054 N055 N056 null<br>
|
||||
W5 N063 N064 N065 N066 null<br>
|
||||
W5 N067 N068 N069 N070 null<br>
|
||||
W5 N071 N072 N073 N074 null<br>
|
||||
@@ -0,0 +1,62 @@
|
||||
<b>Switch configuration: [Default]</b><br><br>5K N001 N001 N002 5K<br>
|
||||
Board1 <br>
|
||||
Boost N010 N003 N004 10K<br>
|
||||
C1 N001 N002 47uF<br>
|
||||
C1 N001 N004 47uF<br>
|
||||
C2 N005 N006 4.7nF<br>
|
||||
C2 N015 N003 10nF<br>
|
||||
L1 -9V<br>
|
||||
L2 Input<br>
|
||||
L2 Positive Gnd<br>
|
||||
L2 Signal Gnd<br>
|
||||
L3 Output<br>
|
||||
L4 Bias<br>
|
||||
L5 Dallas Rangemaster Treble Booster<br>
|
||||
L6 diy-fever.com<br>
|
||||
L7 Q1 - OC44 or similar PNP Germanium transistor<br>
|
||||
Pad1 null<br>
|
||||
Pad10 null<br>
|
||||
Pad11 null<br>
|
||||
Pad12 null<br>
|
||||
Pad13 null<br>
|
||||
Pad14 null<br>
|
||||
Pad15 null<br>
|
||||
Pad16 null<br>
|
||||
Pad17 null<br>
|
||||
Pad18 null<br>
|
||||
Pad19 null<br>
|
||||
Pad2 null<br>
|
||||
Pad20 null<br>
|
||||
Pad3 null<br>
|
||||
Pad4 null<br>
|
||||
Pad5 null<br>
|
||||
Pad6 null<br>
|
||||
Pad7 null<br>
|
||||
Pad8 null<br>
|
||||
Pad9 null<br>
|
||||
Q1 N007 N008 N009 ; Pinout not configured, validate this line<br>
|
||||
R1 N001 N006 1M<br>
|
||||
R1 N004 N005 470K<br>
|
||||
R1 N005 N001 68K<br>
|
||||
Trace1 null<br>
|
||||
Trace10 null<br>
|
||||
Trace11 null<br>
|
||||
Trace12 null<br>
|
||||
Trace13 null<br>
|
||||
Trace13 null<br>
|
||||
Trace13 null<br>
|
||||
Trace13 null<br>
|
||||
Trace14 null<br>
|
||||
Trace2 null<br>
|
||||
Trace3 null<br>
|
||||
Trace4 null<br>
|
||||
Trace5 null<br>
|
||||
Trace6 null<br>
|
||||
Trace7 null<br>
|
||||
Trace8 null<br>
|
||||
Trace9 null<br>
|
||||
W1 N011 N012 N013 N014 null<br>
|
||||
W1 N016 N017 N018 N019 null<br>
|
||||
W1 N020 N021 N022 N023 null<br>
|
||||
W1 N024 N025 N026 N027 null<br>
|
||||
W1 N028 N029 N030 N031 null<br>
|
||||
@@ -0,0 +1,216 @@
|
||||
<b>Switch configuration: [SW1.OFF]</b><br><br> N075 N076 N077 N078 null<br>
|
||||
N088 N089 N090 N091 null<br>
|
||||
Board1 <br>
|
||||
C1 N001 N002 47nF<br>
|
||||
C2 N003 N004 100uF<br>
|
||||
C3 N005 N004 100nF<br>
|
||||
C4 N006 N004 47nF<br>
|
||||
C5 N007 N008 220uF<br>
|
||||
Gain N009 N010 N096 1K<br>
|
||||
J1 N011 N004 <br>
|
||||
J13 N003 N024 N004 <br>
|
||||
J14 N012 N004 <br>
|
||||
L1 SPDT (Center-OFF) Switch<br>
|
||||
L2 1/2 - 1/4 - Full Power<br>
|
||||
L3 ROG Ruby Amplifier<br>
|
||||
L4 9x9 hole perfboard w/ attenuator switch<br>
|
||||
L5 layout by diy-fever.com<br>
|
||||
L6 *** VERIFIED ***<br>
|
||||
L7 project page www.runoffgroove.com/ruby.html<br>
|
||||
LM386 N009 N058 N004 N004 N010 N005 N003 N007 <br>
|
||||
Q1 N003 N001 N011 MPF102 ; Pinout not configured, validate this line<br>
|
||||
R1 N004 N011 1M<br>
|
||||
R2 N001 N004 3.9K<br>
|
||||
R3 N007 N006 10Ω<br>
|
||||
R4 N012 N079 22Ω<br>
|
||||
R5 N012 N008 22Ω<br>
|
||||
SW1 N021 N022 N023 SPDT (Center OFF)<br>
|
||||
Trace1 null<br>
|
||||
Trace10 null<br>
|
||||
Trace11 null<br>
|
||||
Trace12 null<br>
|
||||
Trace13 null<br>
|
||||
Trace14 null<br>
|
||||
Trace15 null<br>
|
||||
Trace16 null<br>
|
||||
Trace17 null<br>
|
||||
Trace18 null<br>
|
||||
Trace19 null<br>
|
||||
Trace2 null<br>
|
||||
Trace20 null<br>
|
||||
Trace21 null<br>
|
||||
Trace22 null<br>
|
||||
Trace23 null<br>
|
||||
Trace24 null<br>
|
||||
Trace25 null<br>
|
||||
Trace26 null<br>
|
||||
Trace27 null<br>
|
||||
Trace3 null<br>
|
||||
Trace4 null<br>
|
||||
Trace5 null<br>
|
||||
Trace6 null<br>
|
||||
Trace7 null<br>
|
||||
Trace8 null<br>
|
||||
Trace9 null<br>
|
||||
Volume N002 N057 N004 10K<br>
|
||||
W1 N025 N026 N027 N028 null<br>
|
||||
W10 N059 N060 N061 N062 null<br>
|
||||
W11 N063 N064 N065 N066 null<br>
|
||||
W12 N067 N068 N069 N070 null<br>
|
||||
W13 N092 N093 N094 N095 null<br>
|
||||
W14 N080 N081 N082 N083 null<br>
|
||||
W15 N084 N085 N086 N087 null<br>
|
||||
W16 N013 N014 N015 N016 null<br>
|
||||
W17 N017 N018 N019 N020 null<br>
|
||||
W2 N029 N030 N031 N032 null<br>
|
||||
W3 N033 N034 N035 N036 null<br>
|
||||
W4 N037 N038 N039 N040 null<br>
|
||||
W5 N041 N042 N043 N044 null<br>
|
||||
W6 N045 N046 N047 N048 null<br>
|
||||
W7 N049 N050 N051 N052 null<br>
|
||||
W8 N053 N054 N055 N056 null<br>
|
||||
W9 N071 N072 N073 N074 null<br>
|
||||
<b>Switch configuration: [SW1.ON1]</b><br><br> N074 N075 N076 N077 null<br>
|
||||
N087 N088 N089 N090 null<br>
|
||||
Board1 <br>
|
||||
C1 N001 N002 47nF<br>
|
||||
C2 N003 N004 100uF<br>
|
||||
C3 N005 N004 100nF<br>
|
||||
C4 N006 N004 47nF<br>
|
||||
C5 N007 N008 220uF<br>
|
||||
Gain N009 N010 N095 1K<br>
|
||||
J1 N011 N004 <br>
|
||||
J13 N003 N023 N004 <br>
|
||||
J14 N008 N004 <br>
|
||||
L1 SPDT (Center-OFF) Switch<br>
|
||||
L2 1/2 - 1/4 - Full Power<br>
|
||||
L3 ROG Ruby Amplifier<br>
|
||||
L4 9x9 hole perfboard w/ attenuator switch<br>
|
||||
L5 layout by diy-fever.com<br>
|
||||
L6 *** VERIFIED ***<br>
|
||||
L7 project page www.runoffgroove.com/ruby.html<br>
|
||||
LM386 N009 N057 N004 N004 N010 N005 N003 N007 <br>
|
||||
Q1 N003 N001 N011 MPF102 ; Pinout not configured, validate this line<br>
|
||||
R1 N004 N011 1M<br>
|
||||
R2 N001 N004 3.9K<br>
|
||||
R3 N007 N006 10Ω<br>
|
||||
R4 N008 N078 22Ω<br>
|
||||
R5 N008 N008 22Ω<br>
|
||||
SW1 N020 N021 N022 SPDT (Center OFF)<br>
|
||||
Trace1 null<br>
|
||||
Trace10 null<br>
|
||||
Trace11 null<br>
|
||||
Trace12 null<br>
|
||||
Trace13 null<br>
|
||||
Trace14 null<br>
|
||||
Trace15 null<br>
|
||||
Trace16 null<br>
|
||||
Trace17 null<br>
|
||||
Trace18 null<br>
|
||||
Trace19 null<br>
|
||||
Trace2 null<br>
|
||||
Trace20 null<br>
|
||||
Trace21 null<br>
|
||||
Trace22 null<br>
|
||||
Trace23 null<br>
|
||||
Trace24 null<br>
|
||||
Trace25 null<br>
|
||||
Trace26 null<br>
|
||||
Trace27 null<br>
|
||||
Trace3 null<br>
|
||||
Trace4 null<br>
|
||||
Trace5 null<br>
|
||||
Trace6 null<br>
|
||||
Trace7 null<br>
|
||||
Trace8 null<br>
|
||||
Trace9 null<br>
|
||||
Volume N002 N056 N004 10K<br>
|
||||
W1 N024 N025 N026 N027 null<br>
|
||||
W10 N058 N059 N060 N061 null<br>
|
||||
W11 N062 N063 N064 N065 null<br>
|
||||
W12 N066 N067 N068 N069 null<br>
|
||||
W13 N091 N092 N093 N094 null<br>
|
||||
W14 N079 N080 N081 N082 null<br>
|
||||
W15 N083 N084 N085 N086 null<br>
|
||||
W16 N012 N013 N014 N015 null<br>
|
||||
W17 N016 N017 N018 N019 null<br>
|
||||
W2 N028 N029 N030 N031 null<br>
|
||||
W3 N032 N033 N034 N035 null<br>
|
||||
W4 N036 N037 N038 N039 null<br>
|
||||
W5 N040 N041 N042 N043 null<br>
|
||||
W6 N044 N045 N046 N047 null<br>
|
||||
W7 N048 N049 N050 N051 null<br>
|
||||
W8 N052 N053 N054 N055 null<br>
|
||||
W9 N070 N071 N072 N073 null<br>
|
||||
<b>Switch configuration: [SW1.ON2]</b><br><br> N075 N076 N077 N078 null<br>
|
||||
N087 N088 N089 N090 null<br>
|
||||
Board1 <br>
|
||||
C1 N001 N002 47nF<br>
|
||||
C2 N003 N004 100uF<br>
|
||||
C3 N005 N004 100nF<br>
|
||||
C4 N006 N004 47nF<br>
|
||||
C5 N007 N008 220uF<br>
|
||||
Gain N009 N010 N095 1K<br>
|
||||
J1 N011 N004 <br>
|
||||
J13 N003 N024 N004 <br>
|
||||
J14 N012 N004 <br>
|
||||
L1 SPDT (Center-OFF) Switch<br>
|
||||
L2 1/2 - 1/4 - Full Power<br>
|
||||
L3 ROG Ruby Amplifier<br>
|
||||
L4 9x9 hole perfboard w/ attenuator switch<br>
|
||||
L5 layout by diy-fever.com<br>
|
||||
L6 *** VERIFIED ***<br>
|
||||
L7 project page www.runoffgroove.com/ruby.html<br>
|
||||
LM386 N009 N058 N004 N004 N010 N005 N003 N007 <br>
|
||||
Q1 N003 N001 N011 MPF102 ; Pinout not configured, validate this line<br>
|
||||
R1 N004 N011 1M<br>
|
||||
R2 N001 N004 3.9K<br>
|
||||
R3 N007 N006 10Ω<br>
|
||||
R4 N012 N008 22Ω<br>
|
||||
R5 N012 N008 22Ω<br>
|
||||
SW1 N021 N022 N023 SPDT (Center OFF)<br>
|
||||
Trace1 null<br>
|
||||
Trace10 null<br>
|
||||
Trace11 null<br>
|
||||
Trace12 null<br>
|
||||
Trace13 null<br>
|
||||
Trace14 null<br>
|
||||
Trace15 null<br>
|
||||
Trace16 null<br>
|
||||
Trace17 null<br>
|
||||
Trace18 null<br>
|
||||
Trace19 null<br>
|
||||
Trace2 null<br>
|
||||
Trace20 null<br>
|
||||
Trace21 null<br>
|
||||
Trace22 null<br>
|
||||
Trace23 null<br>
|
||||
Trace24 null<br>
|
||||
Trace25 null<br>
|
||||
Trace26 null<br>
|
||||
Trace27 null<br>
|
||||
Trace3 null<br>
|
||||
Trace4 null<br>
|
||||
Trace5 null<br>
|
||||
Trace6 null<br>
|
||||
Trace7 null<br>
|
||||
Trace8 null<br>
|
||||
Trace9 null<br>
|
||||
Volume N002 N057 N004 10K<br>
|
||||
W1 N025 N026 N027 N028 null<br>
|
||||
W10 N059 N060 N061 N062 null<br>
|
||||
W11 N063 N064 N065 N066 null<br>
|
||||
W12 N067 N068 N069 N070 null<br>
|
||||
W13 N091 N092 N093 N094 null<br>
|
||||
W14 N079 N080 N081 N082 null<br>
|
||||
W15 N083 N084 N085 N086 null<br>
|
||||
W16 N013 N014 N015 N016 null<br>
|
||||
W17 N017 N018 N019 N020 null<br>
|
||||
W2 N029 N030 N031 N032 null<br>
|
||||
W3 N033 N034 N035 N036 null<br>
|
||||
W4 N037 N038 N039 N040 null<br>
|
||||
W5 N041 N042 N043 N044 null<br>
|
||||
W6 N045 N046 N047 N048 null<br>
|
||||
W7 N049 N050 N051 N052 null<br>
|
||||
W8 N053 N054 N055 N056 null<br>
|
||||
W9 N071 N072 N073 N074 null<br>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,160 @@
|
||||
<b>Switch configuration: [SW1.1]</b><br><br>Bridge N002 N001 Bridge<br>
|
||||
Cb N002 N003 1.2nF<br>
|
||||
Ct N004 N001 47nF<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
J1 N005 N001 <br>
|
||||
Middle N015 N001 Middle<br>
|
||||
Neck N014 N001 Neck<br>
|
||||
Rb N005 N003 120K<br>
|
||||
SW1 N006 N007 N008 N009 N010 N011 N012 N013 <br>
|
||||
Tone Middle N018 N019 N004 250K<br>
|
||||
Tone Neck N016 N017 N004 250K<br>
|
||||
Volume N002 N005 N001 250K<br>
|
||||
W1 N020 N021 N022 N023 null<br>
|
||||
W2 N024 N025 N026 N027 null<br>
|
||||
W2 N028 N029 N030 N031 null<br>
|
||||
W2 N032 N033 N034 N035 null<br>
|
||||
W3 N036 N037 N038 N039 null<br>
|
||||
W3 N040 N041 N042 N043 null<br>
|
||||
W3 N044 N045 N046 N047 null<br>
|
||||
W3 N071 N072 N073 N074 null<br>
|
||||
W4 N048 N049 N050 N051 null<br>
|
||||
W4 N052 N053 N054 N055 N056 N057 N058 null<br>
|
||||
W4 N059 N060 N061 N062 null<br>
|
||||
W5 N063 N064 N065 N066 null<br>
|
||||
W5 N067 N068 N069 N070 null<br>
|
||||
W5 N075 N076 N077 N078 null<br>
|
||||
W5 N079 N080 N081 N082 null<br>
|
||||
W5 N083 N084 N085 N086 null<br>
|
||||
W5 N087 N088 N089 N090 null<br>
|
||||
W6 N091 N092 N093 N094 null<br>
|
||||
<b>Switch configuration: [SW1.2]</b><br><br>Bridge N002 N001 Bridge<br>
|
||||
Cb N002 N003 1.2nF<br>
|
||||
Ct N004 N001 47nF<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
J1 N005 N001 <br>
|
||||
Middle N002 N001 Middle<br>
|
||||
Neck N014 N001 Neck<br>
|
||||
Rb N005 N003 120K<br>
|
||||
SW1 N006 N007 N008 N009 N010 N011 N012 N013 <br>
|
||||
Tone Middle N017 N002 N004 250K<br>
|
||||
Tone Neck N015 N016 N004 250K<br>
|
||||
Volume N002 N005 N001 250K<br>
|
||||
W1 N018 N019 N020 N021 null<br>
|
||||
W2 N022 N023 N024 N025 null<br>
|
||||
W2 N026 N027 N028 N029 null<br>
|
||||
W2 N030 N031 N032 N033 null<br>
|
||||
W3 N034 N035 N036 N037 null<br>
|
||||
W3 N038 N039 N040 N041 null<br>
|
||||
W3 N042 N043 N044 N045 null<br>
|
||||
W3 N069 N070 N071 N072 null<br>
|
||||
W4 N046 N047 N048 N049 null<br>
|
||||
W4 N050 N051 N052 N053 N054 N055 N056 null<br>
|
||||
W4 N057 N058 N059 N060 null<br>
|
||||
W5 N061 N062 N063 N064 null<br>
|
||||
W5 N065 N066 N067 N068 null<br>
|
||||
W5 N073 N074 N075 N076 null<br>
|
||||
W5 N077 N078 N079 N080 null<br>
|
||||
W5 N081 N082 N083 N084 null<br>
|
||||
W5 N085 N086 N087 N088 null<br>
|
||||
W6 N089 N090 N091 N092 null<br>
|
||||
<b>Switch configuration: [SW1.3]</b><br><br>Bridge N015 N001 Bridge<br>
|
||||
Cb N002 N003 1.2nF<br>
|
||||
Ct N004 N001 47nF<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
J1 N005 N001 <br>
|
||||
Middle N002 N001 Middle<br>
|
||||
Neck N014 N001 Neck<br>
|
||||
Rb N005 N003 120K<br>
|
||||
SW1 N006 N007 N008 N009 N010 N011 N012 N013 <br>
|
||||
Tone Middle N018 N002 N004 250K<br>
|
||||
Tone Neck N016 N017 N004 250K<br>
|
||||
Volume N002 N005 N001 250K<br>
|
||||
W1 N019 N020 N021 N022 null<br>
|
||||
W2 N023 N024 N025 N026 null<br>
|
||||
W2 N027 N028 N029 N030 null<br>
|
||||
W2 N031 N032 N033 N034 null<br>
|
||||
W3 N035 N036 N037 N038 null<br>
|
||||
W3 N039 N040 N041 N042 null<br>
|
||||
W3 N043 N044 N045 N046 null<br>
|
||||
W3 N070 N071 N072 N073 null<br>
|
||||
W4 N047 N048 N049 N050 null<br>
|
||||
W4 N051 N052 N053 N054 N055 N056 N057 null<br>
|
||||
W4 N058 N059 N060 N061 null<br>
|
||||
W5 N062 N063 N064 N065 null<br>
|
||||
W5 N066 N067 N068 N069 null<br>
|
||||
W5 N074 N075 N076 N077 null<br>
|
||||
W5 N078 N079 N080 N081 null<br>
|
||||
W5 N082 N083 N084 N085 null<br>
|
||||
W5 N086 N087 N088 N089 null<br>
|
||||
W6 N090 N091 N092 N093 null<br>
|
||||
<b>Switch configuration: [SW1.4]</b><br><br>Bridge N014 N001 Bridge<br>
|
||||
Cb N002 N003 1.2nF<br>
|
||||
Ct N004 N001 47nF<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
J1 N005 N001 <br>
|
||||
Middle N002 N001 Middle<br>
|
||||
Neck N002 N001 Neck<br>
|
||||
Rb N005 N003 120K<br>
|
||||
SW1 N006 N007 N008 N009 N010 N011 N012 N013 <br>
|
||||
Tone Middle N016 N002 N004 250K<br>
|
||||
Tone Neck N015 N002 N004 250K<br>
|
||||
Volume N002 N005 N001 250K<br>
|
||||
W1 N017 N018 N019 N020 null<br>
|
||||
W2 N021 N022 N023 N024 null<br>
|
||||
W2 N025 N026 N027 N028 null<br>
|
||||
W2 N029 N030 N031 N032 null<br>
|
||||
W3 N033 N034 N035 N036 null<br>
|
||||
W3 N037 N038 N039 N040 null<br>
|
||||
W3 N041 N042 N043 N044 null<br>
|
||||
W3 N068 N069 N070 N071 null<br>
|
||||
W4 N045 N046 N047 N048 null<br>
|
||||
W4 N049 N050 N051 N052 N053 N054 N055 null<br>
|
||||
W4 N056 N057 N058 N059 null<br>
|
||||
W5 N060 N061 N062 N063 null<br>
|
||||
W5 N064 N065 N066 N067 null<br>
|
||||
W5 N072 N073 N074 N075 null<br>
|
||||
W5 N076 N077 N078 N079 null<br>
|
||||
W5 N080 N081 N082 N083 null<br>
|
||||
W5 N084 N085 N086 N087 null<br>
|
||||
W6 N088 N089 N090 N091 null<br>
|
||||
<b>Switch configuration: [SW1.5]</b><br><br>Bridge N015 N001 Bridge<br>
|
||||
Cb N002 N003 1.2nF<br>
|
||||
Ct N004 N001 47nF<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
ELL1 null<br>
|
||||
J1 N005 N001 <br>
|
||||
Middle N014 N001 Middle<br>
|
||||
Neck N002 N001 Neck<br>
|
||||
Rb N005 N003 120K<br>
|
||||
SW1 N006 N007 N008 N009 N010 N011 N012 N013 <br>
|
||||
Tone Middle N017 N018 N004 250K<br>
|
||||
Tone Neck N016 N002 N004 250K<br>
|
||||
Volume N002 N005 N001 250K<br>
|
||||
W1 N019 N020 N021 N022 null<br>
|
||||
W2 N023 N024 N025 N026 null<br>
|
||||
W2 N027 N028 N029 N030 null<br>
|
||||
W2 N031 N032 N033 N034 null<br>
|
||||
W3 N035 N036 N037 N038 null<br>
|
||||
W3 N039 N040 N041 N042 null<br>
|
||||
W3 N043 N044 N045 N046 null<br>
|
||||
W3 N070 N071 N072 N073 null<br>
|
||||
W4 N047 N048 N049 N050 null<br>
|
||||
W4 N051 N052 N053 N054 N055 N056 N057 null<br>
|
||||
W4 N058 N059 N060 N061 null<br>
|
||||
W5 N062 N063 N064 N065 null<br>
|
||||
W5 N066 N067 N068 N069 null<br>
|
||||
W5 N074 N075 N076 N077 null<br>
|
||||
W5 N078 N079 N080 N081 null<br>
|
||||
W5 N082 N083 N084 N085 null<br>
|
||||
W5 N086 N087 N088 N089 null<br>
|
||||
W6 N090 N091 N092 N093 null<br>
|
||||
@@ -0,0 +1,305 @@
|
||||
<b>Switch configuration: [Default]</b><br><br> N001 N003 680uF<br>
|
||||
N001 N003 680uF<br>
|
||||
N001 N003 680uF<br>
|
||||
N002 N001 680uF<br>
|
||||
N002 N001 680uF<br>
|
||||
N002 N001 680uF<br>
|
||||
N036 N037 680uF<br>
|
||||
N038 N039 680uF<br>
|
||||
N040 N041 680uF<br>
|
||||
N063 N064 680uF<br>
|
||||
N071 N072 680uF<br>
|
||||
N073 N074 680uF<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
null<br>
|
||||
Board1 <br>
|
||||
Board1 <br>
|
||||
Board1 <br>
|
||||
Board1 <br>
|
||||
C1 N030 N004 220nF<br>
|
||||
C1 N031 N005 220nF<br>
|
||||
C1 N053 N054 220nF<br>
|
||||
C1 N065 N066 220nF<br>
|
||||
C2 N003 N002 100nF<br>
|
||||
C2 N006 N007 22nF<br>
|
||||
C2 N057 N058 22nF<br>
|
||||
C2 N059 N060 100nF<br>
|
||||
C3 N008 N009 22nF<br>
|
||||
C3 N061 N062 22nF<br>
|
||||
D1 N010 N002 <br>
|
||||
D1 N034 N035 <br>
|
||||
D2 N011 N002 <br>
|
||||
D2 N069 N070 <br>
|
||||
D3 N003 N010 <br>
|
||||
D3 N067 N068 <br>
|
||||
D4 N003 N011 <br>
|
||||
D4 N032 N033 <br>
|
||||
GF1 null<br>
|
||||
GF1 null<br>
|
||||
IC1 N004 N001 N001 N007 N003 N008 N002 N001 N005 TDA1521A<br>
|
||||
IC1 N044 N045 N046 N047 N048 N049 N050 N051 N052 TDA1521A<br>
|
||||
J1 N012 N013 null<br>
|
||||
J2 N014 N015 null<br>
|
||||
J3 N016 N017 null<br>
|
||||
J4 N018 N019 null<br>
|
||||
J5 N020 N021 null<br>
|
||||
J6 N022 N023 null<br>
|
||||
J7 N024 N025 null<br>
|
||||
J8 N026 N027 null<br>
|
||||
J9 N028 N029 null<br>
|
||||
L1 6W Stereo Power Amplifier<br>
|
||||
L2 Bancika<br>
|
||||
L2 Bancika<br>
|
||||
L2 diy-fever.com<br>
|
||||
L2 diy-fever.com<br>
|
||||
L3 diy-fever.com<br>
|
||||
L4 Component placement<br>
|
||||
L4 Full layout<br>
|
||||
L4 Solder mask<br>
|
||||
L4 Trace mask<br>
|
||||
Pad1 null<br>
|
||||
Pad1 null<br>
|
||||
Pad1 null<br>
|
||||
Pad10 null<br>
|
||||
Pad10 null<br>
|
||||
Pad10 null<br>
|
||||
Pad10 null<br>
|
||||
Pad10 null<br>
|
||||
Pad10 null<br>
|
||||
Pad11 null<br>
|
||||
Pad11 null<br>
|
||||
Pad11 null<br>
|
||||
Pad12 null<br>
|
||||
Pad12 null<br>
|
||||
Pad12 null<br>
|
||||
Pad13 null<br>
|
||||
Pad13 null<br>
|
||||
Pad13 null<br>
|
||||
Pad13 null<br>
|
||||
Pad13 null<br>
|
||||
Pad13 null<br>
|
||||
Pad14 null<br>
|
||||
Pad14 null<br>
|
||||
Pad14 null<br>
|
||||
Pad15 null<br>
|
||||
Pad15 null<br>
|
||||
Pad15 null<br>
|
||||
Pad15 null<br>
|
||||
Pad15 null<br>
|
||||
Pad15 null<br>
|
||||
Pad16 null<br>
|
||||
Pad16 null<br>
|
||||
Pad16 null<br>
|
||||
Pad16 null<br>
|
||||
Pad16 null<br>
|
||||
Pad16 null<br>
|
||||
Pad17 null<br>
|
||||
Pad17 null<br>
|
||||
Pad17 null<br>
|
||||
Pad18 null<br>
|
||||
Pad18 null<br>
|
||||
Pad18 null<br>
|
||||
Pad19 null<br>
|
||||
Pad19 null<br>
|
||||
Pad19 null<br>
|
||||
Pad2 null<br>
|
||||
Pad2 null<br>
|
||||
Pad2 null<br>
|
||||
Pad20 null<br>
|
||||
Pad20 null<br>
|
||||
Pad20 null<br>
|
||||
Pad21 null<br>
|
||||
Pad21 null<br>
|
||||
Pad21 null<br>
|
||||
Pad22 null<br>
|
||||
Pad22 null<br>
|
||||
Pad22 null<br>
|
||||
Pad23 null<br>
|
||||
Pad23 null<br>
|
||||
Pad23 null<br>
|
||||
Pad24 null<br>
|
||||
Pad24 null<br>
|
||||
Pad24 null<br>
|
||||
Pad25 null<br>
|
||||
Pad25 null<br>
|
||||
Pad25 null<br>
|
||||
Pad26 null<br>
|
||||
Pad26 null<br>
|
||||
Pad26 null<br>
|
||||
Pad27 null<br>
|
||||
Pad27 null<br>
|
||||
Pad27 null<br>
|
||||
Pad28 null<br>
|
||||
Pad28 null<br>
|
||||
Pad28 null<br>
|
||||
Pad29 null<br>
|
||||
Pad29 null<br>
|
||||
Pad29 null<br>
|
||||
Pad3 null<br>
|
||||
Pad3 null<br>
|
||||
Pad3 null<br>
|
||||
Pad30 null<br>
|
||||
Pad30 null<br>
|
||||
Pad30 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad31 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad32 null<br>
|
||||
Pad33 null<br>
|
||||
Pad33 null<br>
|
||||
Pad33 null<br>
|
||||
Pad34 null<br>
|
||||
Pad34 null<br>
|
||||
Pad34 null<br>
|
||||
Pad35 null<br>
|
||||
Pad35 null<br>
|
||||
Pad35 null<br>
|
||||
Pad36 null<br>
|
||||
Pad36 null<br>
|
||||
Pad36 null<br>
|
||||
Pad37 null<br>
|
||||
Pad37 null<br>
|
||||
Pad37 null<br>
|
||||
Pad38 null<br>
|
||||
Pad38 null<br>
|
||||
Pad38 null<br>
|
||||
Pad39 null<br>
|
||||
Pad39 null<br>
|
||||
Pad39 null<br>
|
||||
Pad4 null<br>
|
||||
Pad4 null<br>
|
||||
Pad4 null<br>
|
||||
Pad40 null<br>
|
||||
Pad40 null<br>
|
||||
Pad40 null<br>
|
||||
Pad41 null<br>
|
||||
Pad41 null<br>
|
||||
Pad41 null<br>
|
||||
Pad5 null<br>
|
||||
Pad5 null<br>
|
||||
Pad5 null<br>
|
||||
Pad6 null<br>
|
||||
Pad6 null<br>
|
||||
Pad6 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad7 null<br>
|
||||
Pad8 null<br>
|
||||
Pad8 null<br>
|
||||
Pad8 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
Pad9 null<br>
|
||||
R1 N006 N001 8.2Ω<br>
|
||||
R1 N009 N001 8.2Ω<br>
|
||||
R1 N042 N043 8.2Ω<br>
|
||||
R1 N055 N056 8.2Ω<br>
|
||||
Trace1 null<br>
|
||||
Trace1 null<br>
|
||||
Trace10 null<br>
|
||||
Trace10 null<br>
|
||||
Trace12 null<br>
|
||||
Trace12 null<br>
|
||||
Trace12 null<br>
|
||||
Trace12 null<br>
|
||||
Trace14 null<br>
|
||||
Trace14 null<br>
|
||||
Trace14 null<br>
|
||||
Trace14 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace16 null<br>
|
||||
Trace17 null<br>
|
||||
Trace17 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace18 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace19 null<br>
|
||||
Trace2 null<br>
|
||||
Trace2 null<br>
|
||||
Trace3 null<br>
|
||||
Trace3 null<br>
|
||||
Trace4 null<br>
|
||||
Trace4 null<br>
|
||||
Trace5 null<br>
|
||||
Trace5 null<br>
|
||||
Trace5 null<br>
|
||||
Trace5 null<br>
|
||||
Trace6 null<br>
|
||||
Trace6 null<br>
|
||||
Trace6 null<br>
|
||||
Trace6 null<br>
|
||||
Trace9 null<br>
|
||||
Trace9 null<br>
|
||||
Trace9 null<br>
|
||||
Trace9 null<br>
|
||||
@@ -0,0 +1,141 @@
|
||||
<b>Switch configuration: [.ON1, .ON2]</b><br><br> N178 N179 N180 N181 N182 N183 N184 N185 N186 3PDT<br>
|
||||
Bass N001 N002 N048 50K<br>
|
||||
Board1 <br>
|
||||
Board2 <br>
|
||||
Board3 <br>
|
||||
Board4 <br>
|
||||
C1 N002 N004 39nF<br>
|
||||
C1 N003 N005 47nF<br>
|
||||
C1 N050 N051 10nF<br>
|
||||
C2 N006 N007 100pF<br>
|
||||
C3 N004 N009 47uF<br>
|
||||
C3 N008 N009 47uF<br>
|
||||
C4 N010 N011 1uF<br>
|
||||
C5 N001 N004 1uF<br>
|
||||
D1 N009 N008 <br>
|
||||
DIP N007 N020 N020 N022 N022 N024 N024 N006 N014 N014 N015 N015 N017 N017 N019 N019 <br>
|
||||
DIP N012 N012 N021 N021 N023 N023 N025 N025 N007 N013 N013 N016 N016 N018 N018 N006 <br>
|
||||
Drive N006 N026 N007 1M<br>
|
||||
Eyelet1 <br>
|
||||
Eyelet1 <br>
|
||||
Eyelet10 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet11 <br>
|
||||
Eyelet12 <br>
|
||||
Eyelet12 <br>
|
||||
Eyelet12 <br>
|
||||
Eyelet12 <br>
|
||||
Eyelet14 <br>
|
||||
Eyelet14 <br>
|
||||
Eyelet14 <br>
|
||||
Eyelet15 <br>
|
||||
Eyelet16 <br>
|
||||
Eyelet16 <br>
|
||||
Eyelet17 <br>
|
||||
Eyelet18 <br>
|
||||
Eyelet2 <br>
|
||||
Eyelet3 <br>
|
||||
Eyelet4 <br>
|
||||
Eyelet5 <br>
|
||||
Eyelet6 <br>
|
||||
Eyelet7 <br>
|
||||
Eyelet7 <br>
|
||||
Eyelet8 <br>
|
||||
Eyelet9 <br>
|
||||
FET N007 N012 <br>
|
||||
FET N014 N007 <br>
|
||||
Ge N018 N025 <br>
|
||||
Ge N019 N024 <br>
|
||||
Ge N127 N027 <br>
|
||||
In N191 N192 N193 N194 <br>
|
||||
J1 N172 N173 null<br>
|
||||
J23 N140 N141 null<br>
|
||||
J24 N142 N143 null<br>
|
||||
J25 N144 N145 null<br>
|
||||
J26 N146 N147 null<br>
|
||||
J27 N148 N149 null<br>
|
||||
J28 N150 N151 null<br>
|
||||
J29 N152 N153 null<br>
|
||||
J30 N154 N155 null<br>
|
||||
L1 9V<br>
|
||||
L1 In<br>
|
||||
L1 Out<br>
|
||||
L6 8-pos DIP switches mounted on the other side of the board<br>
|
||||
LED N012 N013 <br>
|
||||
LED N020 N014 <br>
|
||||
Level N011 N049 N009 10K<br>
|
||||
MFET N027 N028 N028 ; Pinout not configured, validate this line<br>
|
||||
Opamp N007 N006 N003 N009 N008 N010 N029 N030 <br>
|
||||
Out N187 N188 N189 N190 <br>
|
||||
Pad2 null<br>
|
||||
Pad2 null<br>
|
||||
Pad2 null<br>
|
||||
R1 N004 N003 510K<br>
|
||||
R1 N004 N008 8.2K<br>
|
||||
R1 N009 N004 10K<br>
|
||||
R1 N009 N005 2.2M<br>
|
||||
R2 N002 N006 3.3K<br>
|
||||
R2 N026 N007 3.3K<br>
|
||||
R2 N029 N004 3.3K<br>
|
||||
R2 N030 N031 1.5K<br>
|
||||
R3 N029 N010 3.3K<br>
|
||||
Rct N013 N021 <br>
|
||||
Rct N015 N020 <br>
|
||||
Sht N021 N016 <br>
|
||||
Sht N022 N015 <br>
|
||||
Si N016 N023 <br>
|
||||
Si N017 N022 <br>
|
||||
Si N023 N018 <br>
|
||||
Si N024 N017 <br>
|
||||
Treble N007 N007 N031 50K<br>
|
||||
W1 N044 N045 N046 N047 null<br>
|
||||
W1 N052 N053 N054 N055 null<br>
|
||||
W1 N056 N057 N058 N059 null<br>
|
||||
W1 N064 N065 N066 null<br>
|
||||
W1 N083 N084 N085 N086 null<br>
|
||||
W1 N087 N088 N089 N090 null<br>
|
||||
W1 N091 N092 N093 N094 null<br>
|
||||
W1 N095 N096 N097 N098 null<br>
|
||||
W1 N103 N104 N105 N106 null<br>
|
||||
W1 N128 N129 N130 N131 null<br>
|
||||
W1 N132 N133 N134 N135 null<br>
|
||||
W1 N136 N137 N138 N139 null<br>
|
||||
W1 N160 N161 N162 N163 null<br>
|
||||
W1 N164 N165 N166 N167 null<br>
|
||||
W1 N168 N169 N170 N171 null<br>
|
||||
W1 N195 N196 N197 N198 null<br>
|
||||
W2 N032 N033 N034 N035 null<br>
|
||||
W2 N060 N061 N062 N063 null<br>
|
||||
W2 N067 N068 N069 N070 null<br>
|
||||
W2 N071 N072 N073 N074 null<br>
|
||||
W2 N075 N076 N077 N078 null<br>
|
||||
W2 N079 N080 N081 N082 null<br>
|
||||
W2 N115 N116 N117 N118 null<br>
|
||||
W2 N123 N124 N125 N126 null<br>
|
||||
W3 N119 N120 N121 N122 null<br>
|
||||
W3 N199 N200 N201 N202 null<br>
|
||||
W4 N040 N041 N042 N043 null<br>
|
||||
W4 N099 N100 N101 N102 null<br>
|
||||
W4 N156 N157 N158 N159 null<br>
|
||||
W5 N107 N108 N109 N110 null<br>
|
||||
W5 N111 N112 N113 N114 null<br>
|
||||
W6 N036 N037 N038 N039 null<br>
|
||||
W7 N174 N175 N176 N177 null<br>
|
||||
@@ -0,0 +1,210 @@
|
||||
<b>Switch configuration: [Split.ON1:SW1.Middle]</b><br><br>Bridge N002 N001 N001 N003 <br>
|
||||
Cbleed N002 N004 1.2nF<br>
|
||||
J1 N005 N003 <br>
|
||||
L1 Output jack<br>
|
||||
L1 To bridge baseplate<br>
|
||||
L2 Treble bleed<br>
|
||||
L3 Travelcaster Wiring Diagram<br>
|
||||
L3 www.diy-fever.com<br>
|
||||
L4 Pickup selector switch<br>
|
||||
L4 Push-pull<br>
|
||||
L4 Split mode<br>
|
||||
L5 DiMarzio<br>
|
||||
L5 DiMarzio<br>
|
||||
L6 * One of the pickups is rotated 180 degrees for cleaner drawing<br>
|
||||
Neck N006 N003 N002 N006 Chopper<br>
|
||||
Rbleed N005 N004 130K<br>
|
||||
SW1 N011 N012 N013 N014 <br>
|
||||
Split N015 N016 N017 N018 N019 N020 DPDT<br>
|
||||
Volume N002 N005 N003 250K<br>
|
||||
W2 N021 N022 N023 N024 null<br>
|
||||
W2 N025 N026 N027 N028 null<br>
|
||||
W3 N029 N030 N031 N032 null<br>
|
||||
W3 N033 N034 N035 N036 null<br>
|
||||
W3 N041 N042 N043 N044 null<br>
|
||||
W3 N045 N046 N047 N048 null<br>
|
||||
W3 N057 N058 N059 N060 null<br>
|
||||
W4 N037 N038 N039 N040 null<br>
|
||||
W4 N061 N062 N063 N064 null<br>
|
||||
W5 N049 N050 N051 N052 null<br>
|
||||
W5 N073 N074 N075 N076 null<br>
|
||||
W5 N077 N078 N079 N080 null<br>
|
||||
W6 N053 N054 N055 N056 null<br>
|
||||
W6 N065 N066 N067 N068 null<br>
|
||||
W7 N007 N008 N009 N010 null<br>
|
||||
W8 N069 N070 N071 N072 null<br>
|
||||
<b>Switch configuration: [Split.ON1:SW1.Rhythm]</b><br><br>Bridge N011 N001 N001 N002 <br>
|
||||
Cbleed N003 N004 1.2nF<br>
|
||||
J1 N005 N002 <br>
|
||||
L1 Output jack<br>
|
||||
L1 To bridge baseplate<br>
|
||||
L2 Treble bleed<br>
|
||||
L3 Travelcaster Wiring Diagram<br>
|
||||
L3 www.diy-fever.com<br>
|
||||
L4 Pickup selector switch<br>
|
||||
L4 Push-pull<br>
|
||||
L4 Split mode<br>
|
||||
L5 DiMarzio<br>
|
||||
L5 DiMarzio<br>
|
||||
L6 * One of the pickups is rotated 180 degrees for cleaner drawing<br>
|
||||
Neck N006 N002 N003 N006 Chopper<br>
|
||||
Rbleed N005 N004 130K<br>
|
||||
SW1 N012 N013 N014 N015 <br>
|
||||
Split N016 N017 N018 N019 N020 N021 DPDT<br>
|
||||
Volume N003 N005 N002 250K<br>
|
||||
W2 N022 N023 N024 N025 null<br>
|
||||
W2 N026 N027 N028 N029 null<br>
|
||||
W3 N030 N031 N032 N033 null<br>
|
||||
W3 N034 N035 N036 N037 null<br>
|
||||
W3 N042 N043 N044 N045 null<br>
|
||||
W3 N046 N047 N048 N049 null<br>
|
||||
W3 N058 N059 N060 N061 null<br>
|
||||
W4 N038 N039 N040 N041 null<br>
|
||||
W4 N062 N063 N064 N065 null<br>
|
||||
W5 N050 N051 N052 N053 null<br>
|
||||
W5 N074 N075 N076 N077 null<br>
|
||||
W5 N078 N079 N080 N081 null<br>
|
||||
W6 N054 N055 N056 N057 null<br>
|
||||
W6 N066 N067 N068 N069 null<br>
|
||||
W7 N007 N008 N009 N010 null<br>
|
||||
W8 N070 N071 N072 N073 null<br>
|
||||
<b>Switch configuration: [Split.ON1:SW1.Treble]</b><br><br>Bridge N002 N001 N001 N003 <br>
|
||||
Cbleed N002 N004 1.2nF<br>
|
||||
J1 N005 N003 <br>
|
||||
L1 Output jack<br>
|
||||
L1 To bridge baseplate<br>
|
||||
L2 Treble bleed<br>
|
||||
L3 Travelcaster Wiring Diagram<br>
|
||||
L3 www.diy-fever.com<br>
|
||||
L4 Pickup selector switch<br>
|
||||
L4 Push-pull<br>
|
||||
L4 Split mode<br>
|
||||
L5 DiMarzio<br>
|
||||
L5 DiMarzio<br>
|
||||
L6 * One of the pickups is rotated 180 degrees for cleaner drawing<br>
|
||||
Neck N006 N003 N011 N006 Chopper<br>
|
||||
Rbleed N005 N004 130K<br>
|
||||
SW1 N012 N013 N014 N015 <br>
|
||||
Split N016 N017 N018 N019 N020 N021 DPDT<br>
|
||||
Volume N002 N005 N003 250K<br>
|
||||
W2 N022 N023 N024 N025 null<br>
|
||||
W2 N026 N027 N028 N029 null<br>
|
||||
W3 N030 N031 N032 N033 null<br>
|
||||
W3 N034 N035 N036 N037 null<br>
|
||||
W3 N042 N043 N044 N045 null<br>
|
||||
W3 N046 N047 N048 N049 null<br>
|
||||
W3 N058 N059 N060 N061 null<br>
|
||||
W4 N038 N039 N040 N041 null<br>
|
||||
W4 N062 N063 N064 N065 null<br>
|
||||
W5 N050 N051 N052 N053 null<br>
|
||||
W5 N074 N075 N076 N077 null<br>
|
||||
W5 N078 N079 N080 N081 null<br>
|
||||
W6 N054 N055 N056 N057 null<br>
|
||||
W6 N066 N067 N068 N069 null<br>
|
||||
W7 N007 N008 N009 N010 null<br>
|
||||
W8 N070 N071 N072 N073 null<br>
|
||||
<b>Switch configuration: [Split.ON2:SW1.Middle]</b><br><br>Bridge N002 N001 N001 N001 <br>
|
||||
Cbleed N002 N003 1.2nF<br>
|
||||
J1 N004 N001 <br>
|
||||
L1 Output jack<br>
|
||||
L1 To bridge baseplate<br>
|
||||
L2 Treble bleed<br>
|
||||
L3 Travelcaster Wiring Diagram<br>
|
||||
L3 www.diy-fever.com<br>
|
||||
L4 Pickup selector switch<br>
|
||||
L4 Push-pull<br>
|
||||
L4 Split mode<br>
|
||||
L5 DiMarzio<br>
|
||||
L5 DiMarzio<br>
|
||||
L6 * One of the pickups is rotated 180 degrees for cleaner drawing<br>
|
||||
Neck N001 N001 N002 N001 Chopper<br>
|
||||
Rbleed N004 N003 130K<br>
|
||||
SW1 N009 N010 N011 N012 <br>
|
||||
Split N013 N014 N015 N016 N017 N018 DPDT<br>
|
||||
Volume N002 N004 N001 250K<br>
|
||||
W2 N019 N020 N021 N022 null<br>
|
||||
W2 N023 N024 N025 N026 null<br>
|
||||
W3 N027 N028 N029 N030 null<br>
|
||||
W3 N031 N032 N033 N034 null<br>
|
||||
W3 N039 N040 N041 N042 null<br>
|
||||
W3 N043 N044 N045 N046 null<br>
|
||||
W3 N055 N056 N057 N058 null<br>
|
||||
W4 N035 N036 N037 N038 null<br>
|
||||
W4 N059 N060 N061 N062 null<br>
|
||||
W5 N047 N048 N049 N050 null<br>
|
||||
W5 N071 N072 N073 N074 null<br>
|
||||
W5 N075 N076 N077 N078 null<br>
|
||||
W6 N051 N052 N053 N054 null<br>
|
||||
W6 N063 N064 N065 N066 null<br>
|
||||
W7 N005 N006 N007 N008 null<br>
|
||||
W8 N067 N068 N069 N070 null<br>
|
||||
<b>Switch configuration: [Split.ON2:SW1.Rhythm]</b><br><br>Bridge N009 N001 N001 N001 <br>
|
||||
Cbleed N002 N003 1.2nF<br>
|
||||
J1 N004 N001 <br>
|
||||
L1 Output jack<br>
|
||||
L1 To bridge baseplate<br>
|
||||
L2 Treble bleed<br>
|
||||
L3 Travelcaster Wiring Diagram<br>
|
||||
L3 www.diy-fever.com<br>
|
||||
L4 Pickup selector switch<br>
|
||||
L4 Push-pull<br>
|
||||
L4 Split mode<br>
|
||||
L5 DiMarzio<br>
|
||||
L5 DiMarzio<br>
|
||||
L6 * One of the pickups is rotated 180 degrees for cleaner drawing<br>
|
||||
Neck N001 N001 N002 N001 Chopper<br>
|
||||
Rbleed N004 N003 130K<br>
|
||||
SW1 N010 N011 N012 N013 <br>
|
||||
Split N014 N015 N016 N017 N018 N019 DPDT<br>
|
||||
Volume N002 N004 N001 250K<br>
|
||||
W2 N020 N021 N022 N023 null<br>
|
||||
W2 N024 N025 N026 N027 null<br>
|
||||
W3 N028 N029 N030 N031 null<br>
|
||||
W3 N032 N033 N034 N035 null<br>
|
||||
W3 N040 N041 N042 N043 null<br>
|
||||
W3 N044 N045 N046 N047 null<br>
|
||||
W3 N056 N057 N058 N059 null<br>
|
||||
W4 N036 N037 N038 N039 null<br>
|
||||
W4 N060 N061 N062 N063 null<br>
|
||||
W5 N048 N049 N050 N051 null<br>
|
||||
W5 N072 N073 N074 N075 null<br>
|
||||
W5 N076 N077 N078 N079 null<br>
|
||||
W6 N052 N053 N054 N055 null<br>
|
||||
W6 N064 N065 N066 N067 null<br>
|
||||
W7 N005 N006 N007 N008 null<br>
|
||||
W8 N068 N069 N070 N071 null<br>
|
||||
<b>Switch configuration: [Split.ON2:SW1.Treble]</b><br><br>Bridge N002 N001 N001 N001 <br>
|
||||
Cbleed N002 N003 1.2nF<br>
|
||||
J1 N004 N001 <br>
|
||||
L1 Output jack<br>
|
||||
L1 To bridge baseplate<br>
|
||||
L2 Treble bleed<br>
|
||||
L3 Travelcaster Wiring Diagram<br>
|
||||
L3 www.diy-fever.com<br>
|
||||
L4 Pickup selector switch<br>
|
||||
L4 Push-pull<br>
|
||||
L4 Split mode<br>
|
||||
L5 DiMarzio<br>
|
||||
L5 DiMarzio<br>
|
||||
L6 * One of the pickups is rotated 180 degrees for cleaner drawing<br>
|
||||
Neck N001 N001 N009 N001 Chopper<br>
|
||||
Rbleed N004 N003 130K<br>
|
||||
SW1 N010 N011 N012 N013 <br>
|
||||
Split N014 N015 N016 N017 N018 N019 DPDT<br>
|
||||
Volume N002 N004 N001 250K<br>
|
||||
W2 N020 N021 N022 N023 null<br>
|
||||
W2 N024 N025 N026 N027 null<br>
|
||||
W3 N028 N029 N030 N031 null<br>
|
||||
W3 N032 N033 N034 N035 null<br>
|
||||
W3 N040 N041 N042 N043 null<br>
|
||||
W3 N044 N045 N046 N047 null<br>
|
||||
W3 N056 N057 N058 N059 null<br>
|
||||
W4 N036 N037 N038 N039 null<br>
|
||||
W4 N060 N061 N062 N063 null<br>
|
||||
W5 N048 N049 N050 N051 null<br>
|
||||
W5 N072 N073 N074 N075 null<br>
|
||||
W5 N076 N077 N078 N079 null<br>
|
||||
W6 N052 N053 N054 N055 null<br>
|
||||
W6 N064 N065 N066 N067 null<br>
|
||||
W7 N005 N006 N007 N008 null<br>
|
||||
W8 N068 N069 N070 N071 null<br>
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 MiB After Width: | Height: | Size: 3.2 MiB |
@@ -35,6 +35,11 @@ public interface INetlistAnalyzer {
|
||||
*/
|
||||
String getName();
|
||||
|
||||
/**
|
||||
* @return summarizer short name
|
||||
*/
|
||||
String getShortName();
|
||||
|
||||
/**
|
||||
* @return name of the icon to use
|
||||
*/
|
||||
|
||||
@@ -26,13 +26,16 @@ import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import org.diylc.core.IDIYComponent;
|
||||
|
||||
public class Netlist implements Comparable<Netlist> {
|
||||
|
||||
private List<IDIYComponent<?>> components;
|
||||
private Set<Group> groups = new HashSet<Group>();
|
||||
private List<SwitchSetup> switchSetup = new ArrayList<SwitchSetup>();
|
||||
|
||||
public Netlist() {
|
||||
public Netlist(List<IDIYComponent<?>> components) {
|
||||
this.components = components;
|
||||
}
|
||||
|
||||
public Set<Group> getGroups() {
|
||||
@@ -44,6 +47,10 @@ public class Netlist implements Comparable<Netlist> {
|
||||
return this;
|
||||
}
|
||||
|
||||
public List<IDIYComponent<?>> getComponents() {
|
||||
return components;
|
||||
}
|
||||
|
||||
public List<Group> getSortedGroups() {
|
||||
List<Group> list = new ArrayList<Group>(groups);
|
||||
Collections.sort(list);
|
||||
|
||||
@@ -417,14 +417,6 @@ public abstract class NetlistAnalyzer {
|
||||
return res;
|
||||
}
|
||||
|
||||
public static Set<IDIYComponent<?>> extractComponents(Netlist netlist) {
|
||||
Set<IDIYComponent<?>> res = new HashSet<IDIYComponent<?>>();
|
||||
for (Group g : netlist.getGroups())
|
||||
for (Node n : g.getNodes())
|
||||
res.add(n.getComponent());
|
||||
return res;
|
||||
}
|
||||
|
||||
protected int find(Node node, List<Group> groups) {
|
||||
for (int i = 0; i < groups.size(); i++)
|
||||
if (groups.get(i).getNodes().contains(node))
|
||||
|
||||
@@ -22,10 +22,9 @@
|
||||
package org.diylc.presenter;
|
||||
|
||||
import java.awt.geom.Point2D;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import java.util.TreeSet;
|
||||
import org.diylc.core.IDIYComponent;
|
||||
import org.diylc.core.measures.Size;
|
||||
|
||||
@@ -68,7 +67,7 @@ public class CalcUtils {
|
||||
}
|
||||
|
||||
public static void expandConnections(Set<Connection> connections) {
|
||||
Set<Connection> toAdd = new HashSet<Connection>();
|
||||
Set<Connection> toAdd = new TreeSet<Connection>();
|
||||
for (Connection c1 : connections)
|
||||
for (Connection c2 : connections) {
|
||||
if (c1 == c2)
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.awt.geom.Point2D;
|
||||
*
|
||||
* @author bancika
|
||||
*/
|
||||
public class Connection {
|
||||
public class Connection implements Comparable<Connection> {
|
||||
|
||||
private Point2D p1;
|
||||
private Point2D p2;
|
||||
@@ -72,4 +72,22 @@ public class Connection {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(Connection o) {
|
||||
int compare = Double.compare(p1.getX(), o.p1.getX());
|
||||
if (compare != 0)
|
||||
return compare;
|
||||
compare = Double.compare(p1.getY(), o.p1.getY());
|
||||
if (compare != 0)
|
||||
return compare;
|
||||
compare = Double.compare(p2.getX(), o.p2.getX());
|
||||
if (compare != 0)
|
||||
return compare;
|
||||
compare = Double.compare(p2.getY(), o.p2.getY());
|
||||
if (compare != 0)
|
||||
return compare;
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
*
|
||||
* DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
|
||||
l * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
|
||||
*
|
||||
* This file is part of DIYLC.
|
||||
*
|
||||
@@ -46,6 +46,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.TreeMap;
|
||||
import java.util.TreeSet;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
@@ -213,8 +214,12 @@ public class Presenter implements IPlugInPort {
|
||||
private Point2D previousScaledPoint;
|
||||
|
||||
private DIYTest test = null;
|
||||
|
||||
|
||||
public Presenter(IView view, IConfigurationManager<?> configManager) {
|
||||
this(view, configManager, false);
|
||||
}
|
||||
|
||||
public Presenter(IView view, IConfigurationManager<?> configManager, boolean importVariantsAndBlocks) {
|
||||
super();
|
||||
this.view = view;
|
||||
this.configManager = configManager;
|
||||
@@ -230,9 +235,11 @@ public class Presenter implements IPlugInPort {
|
||||
|
||||
// lockedLayers = EnumSet.noneOf(ComponentLayer.class);
|
||||
// visibleLayers = EnumSet.allOf(ComponentLayer.class);
|
||||
upgradeVariants();
|
||||
importDefaultVariants();
|
||||
importDefaultBlocks();
|
||||
if (importVariantsAndBlocks) {
|
||||
upgradeVariants();
|
||||
importDefaultVariants();
|
||||
importDefaultBlocks();
|
||||
}
|
||||
}
|
||||
|
||||
public void installPlugin(Supplier<IPlugIn> plugInSupplier) {
|
||||
@@ -2596,7 +2603,7 @@ public class Presenter implements IPlugInPort {
|
||||
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream("variants.xml"));
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
xStream.addPermission(AnyTypePermission.ANY);
|
||||
xStream.toXML(defaultVariantMap, out);
|
||||
ProjectFileManager.xStreamSerializer.toXML(defaultVariantMap, out);
|
||||
out.close();
|
||||
// no more user variants
|
||||
configManager.writeValue(TEMPLATES_KEY, null);
|
||||
@@ -2617,9 +2624,7 @@ public class Presenter implements IPlugInPort {
|
||||
URL resource = Presenter.class.getResource("variants.xml");
|
||||
if (resource != null) {
|
||||
BufferedInputStream in = new BufferedInputStream(resource.openStream());
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
xStream.addPermission(AnyTypePermission.ANY);
|
||||
Map<String, List<Template>> defaults = (Map<String, List<Template>>) xStream.fromXML(in);
|
||||
Map<String, List<Template>> defaults = (Map<String, List<Template>>) ProjectFileManager.xStreamSerializer.fromXML(in);
|
||||
in.close();
|
||||
|
||||
Map<String, List<Template>> variantMap =
|
||||
@@ -2657,9 +2662,7 @@ public class Presenter implements IPlugInPort {
|
||||
URL resource = Presenter.class.getResource("blocks.xml");
|
||||
if (resource != null) {
|
||||
BufferedInputStream in = new BufferedInputStream(resource.openStream());
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
xStream.addPermission(AnyTypePermission.ANY);
|
||||
Map<String, List<IDIYComponent<?>>> defaults = (Map<String, List<IDIYComponent<?>>>) xStream.fromXML(in);
|
||||
Map<String, List<IDIYComponent<?>>> defaults = (Map<String, List<IDIYComponent<?>>>) ProjectFileManager.xStreamSerializer.fromXML(in);
|
||||
in.close();
|
||||
|
||||
Map<String, List<IDIYComponent<?>>> blocksMap =
|
||||
@@ -3020,20 +3023,9 @@ public class Presenter implements IPlugInPort {
|
||||
public int importVariants(String fileName) throws IOException {
|
||||
LOG.debug(String.format("importVariants(%s)", fileName));
|
||||
BufferedInputStream in = new BufferedInputStream(new FileInputStream(fileName));
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
xStream.addPermission(AnyTypePermission.ANY);
|
||||
|
||||
VariantPackage pkg;
|
||||
|
||||
try {
|
||||
// old way
|
||||
pkg = (VariantPackage) xStream.fromXML(in);
|
||||
} catch (Exception e) {
|
||||
// new way
|
||||
in = new BufferedInputStream(new FileInputStream(fileName));
|
||||
ProjectFileManager.configure(xStream);
|
||||
pkg = (VariantPackage) xStream.fromXML(in);
|
||||
}
|
||||
XStream xStream = projectFileManager.getXStream();
|
||||
|
||||
VariantPackage pkg = (VariantPackage) xStream.fromXML(in);
|
||||
|
||||
in.close();
|
||||
|
||||
@@ -3070,21 +3062,10 @@ public class Presenter implements IPlugInPort {
|
||||
public int importBlocks(String fileName) throws IOException {
|
||||
LOG.debug(String.format("importBlocks(%s)", fileName));
|
||||
BufferedInputStream in = new BufferedInputStream(new FileInputStream(fileName));
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
xStream.addPermission(AnyTypePermission.ANY);
|
||||
XStream xStream = projectFileManager.getXStream();
|
||||
|
||||
BuildingBlockPackage pkg;
|
||||
BuildingBlockPackage pkg = (BuildingBlockPackage) xStream.fromXML(in);
|
||||
|
||||
try {
|
||||
// old way
|
||||
pkg = (BuildingBlockPackage) xStream.fromXML(in);
|
||||
} catch (Exception e) {
|
||||
// new way
|
||||
in = new BufferedInputStream(new FileInputStream(fileName));
|
||||
ProjectFileManager.configure(xStream);
|
||||
pkg = (BuildingBlockPackage) xStream.fromXML(in);
|
||||
}
|
||||
|
||||
in.close();
|
||||
|
||||
if (pkg == null || pkg.getBlocks().isEmpty())
|
||||
@@ -3223,7 +3204,7 @@ public class Presenter implements IPlugInPort {
|
||||
posList.add(new Position(switches.get(j), positions[j]));
|
||||
}
|
||||
List<Connection> connections = getConnections(switchPositions);
|
||||
Netlist graph = constructNetlist(nodes, connections, continuity);
|
||||
Netlist graph = constructNetlist(nodes, connections, continuity, currentProject.getComponents());
|
||||
|
||||
// merge graphs that are effectively the same
|
||||
if (result.containsKey(graph)) {
|
||||
@@ -3255,8 +3236,8 @@ public class Presenter implements IPlugInPort {
|
||||
return netlists;
|
||||
}
|
||||
|
||||
private Netlist constructNetlist(List<Node> nodes, List<Connection> connections, List<Area> continuityAreas) {
|
||||
Netlist netlist = new Netlist();
|
||||
private Netlist constructNetlist(List<Node> nodes, List<Connection> connections, List<Area> continuityAreas, List<IDIYComponent<?>> components) {
|
||||
Netlist netlist = new Netlist(components);
|
||||
|
||||
// debugging code
|
||||
// StringBuilder sb = new StringBuilder();
|
||||
@@ -3363,7 +3344,8 @@ public class Presenter implements IPlugInPort {
|
||||
|
||||
@SuppressWarnings({"unchecked", "unlikely-arg-type"})
|
||||
private List<Connection> getConnections(Map<ISwitch, Integer> switchPositions) {
|
||||
Set<Connection> connections = new HashSet<Connection>();
|
||||
Set<Connection> connections = new TreeSet<Connection>();
|
||||
|
||||
for (IDIYComponent<?> c : currentProject.getComponents()) {
|
||||
ComponentType type =
|
||||
ComponentProcessor.getInstance().extractComponentTypeFrom((Class<? extends IDIYComponent<?>>) c.getClass());
|
||||
|
||||
@@ -1,385 +1,136 @@
|
||||
<map>
|
||||
<entry>
|
||||
<string>TO-92 w/ 2 Leads</string>
|
||||
<list>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>720</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>740</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>1320</x>
|
||||
<y>250</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>255</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../borderColor"/>
|
||||
<leadColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</leadColor>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J2</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>780</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>760</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>-177</x>
|
||||
<y>1259</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>255</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../borderColor"/>
|
||||
<leadColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</leadColor>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.semiconductors.TransistorTO92>
|
||||
<name>Q1</name>
|
||||
<alpha>100</alpha>
|
||||
<value></value>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<controlPoints>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>740</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>750</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>760</y>
|
||||
</java.awt.Point>
|
||||
</controlPoints>
|
||||
<bodyColor>
|
||||
<red>128</red>
|
||||
<green>128</green>
|
||||
<blue>128</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>89</red>
|
||||
<green>89</green>
|
||||
<blue>89</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../../org.diylc.components.connectivity.Jumper/borderColor"/>
|
||||
<display>NAME</display>
|
||||
<folded>false</folded>
|
||||
<pinSpacing>
|
||||
<value>0.05</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</pinSpacing>
|
||||
</org.diylc.components.semiconductors.TransistorTO92>
|
||||
</list>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>TO-92 w/ 3 Leads</string>
|
||||
<list>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>720</x>
|
||||
<y>620</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>760</x>
|
||||
<y>640</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>650</x>
|
||||
<y>-41</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>255</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../borderColor"/>
|
||||
<leadColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</leadColor>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J2</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>720</x>
|
||||
<y>680</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>760</x>
|
||||
<y>660</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>-206</x>
|
||||
<y>95</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>255</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../borderColor"/>
|
||||
<leadColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</leadColor>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J3</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>719</x>
|
||||
<y>650</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>760</x>
|
||||
<y>650</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>147</x>
|
||||
<y>-279</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor>
|
||||
<red>255</red>
|
||||
<green>255</green>
|
||||
<blue>255</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../borderColor"/>
|
||||
<leadColor>
|
||||
<red>117</red>
|
||||
<green>157</green>
|
||||
<blue>175</blue>
|
||||
<alpha>255</alpha>
|
||||
</leadColor>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.semiconductors.TransistorTO92>
|
||||
<name>Q1</name>
|
||||
<alpha>100</alpha>
|
||||
<value></value>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<controlPoints>
|
||||
<java.awt.Point>
|
||||
<x>760</x>
|
||||
<y>640</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>760</x>
|
||||
<y>650</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>760</x>
|
||||
<y>660</y>
|
||||
</java.awt.Point>
|
||||
</controlPoints>
|
||||
<bodyColor>
|
||||
<red>128</red>
|
||||
<green>128</green>
|
||||
<blue>128</blue>
|
||||
<alpha>255</alpha>
|
||||
</bodyColor>
|
||||
<borderColor>
|
||||
<red>89</red>
|
||||
<green>89</green>
|
||||
<blue>89</blue>
|
||||
<alpha>255</alpha>
|
||||
</borderColor>
|
||||
<labelColor reference="../../org.diylc.components.connectivity.Jumper/borderColor"/>
|
||||
<display>NAME</display>
|
||||
<folded>false</folded>
|
||||
<pinSpacing>
|
||||
<value>0.05</value>
|
||||
<unit class="org.diylc.core.measures.SizeUnit">in</unit>
|
||||
</pinSpacing>
|
||||
</org.diylc.components.semiconductors.TransistorTO92>
|
||||
</list>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>TO-92 w/ 2 Leads</string>
|
||||
<list>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>720</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>740</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>1320</x>
|
||||
<y>250</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper/bodyColor"/>
|
||||
<borderColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper/borderColor"/>
|
||||
<labelColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper/borderColor"/>
|
||||
<leadColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper/leadColor"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.connectivity.Jumper>
|
||||
<name>J2</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>780</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>760</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>-177</x>
|
||||
<y>1259</y>
|
||||
</java.awt.Point>
|
||||
</points>
|
||||
<bodyColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper[2]/bodyColor"/>
|
||||
<borderColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper[2]/borderColor"/>
|
||||
<labelColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper[2]/borderColor"/>
|
||||
<leadColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper[2]/leadColor"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</org.diylc.components.connectivity.Jumper>
|
||||
<org.diylc.components.semiconductors.TransistorTO92>
|
||||
<name>Q1</name>
|
||||
<alpha>100</alpha>
|
||||
<value></value>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<controlPoints>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>740</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>750</y>
|
||||
</java.awt.Point>
|
||||
<java.awt.Point>
|
||||
<x>580</x>
|
||||
<y>760</y>
|
||||
</java.awt.Point>
|
||||
</controlPoints>
|
||||
<bodyColor reference="../../../../entry/list/org.diylc.components.semiconductors.TransistorTO92/bodyColor"/>
|
||||
<borderColor reference="../../../../entry/list/org.diylc.components.semiconductors.TransistorTO92/borderColor"/>
|
||||
<labelColor reference="../../../../entry/list/org.diylc.components.connectivity.Jumper/borderColor"/>
|
||||
<display>NAME</display>
|
||||
<folded>false</folded>
|
||||
<pinSpacing reference="../../../../entry/list/org.diylc.components.semiconductors.TransistorTO92/pinSpacing"/>
|
||||
</org.diylc.components.semiconductors.TransistorTO92>
|
||||
</list>
|
||||
</entry>
|
||||
</map>
|
||||
<entry>
|
||||
<string>TO-92 w/ 3 Leads</string>
|
||||
<list>
|
||||
<diylc.connectivity.Jumper>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<point x="3.6" y="3.1"/>
|
||||
<point x="3.8" y="3.2"/>
|
||||
<point x="3.25" y="-0.205"/>
|
||||
</points>
|
||||
<bodyColor hex="ffffff"/>
|
||||
<borderColor hex="000000"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="759daf"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</diylc.connectivity.Jumper>
|
||||
<diylc.connectivity.Jumper>
|
||||
<name>J2</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<point x="3.6" y="3.4"/>
|
||||
<point x="3.8" y="3.3"/>
|
||||
<point x="-1.03" y="0.475"/>
|
||||
</points>
|
||||
<bodyColor hex="ffffff"/>
|
||||
<borderColor hex="000000"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="759daf"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</diylc.connectivity.Jumper>
|
||||
<diylc.connectivity.Jumper>
|
||||
<name>J3</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<point x="3.595" y="3.25"/>
|
||||
<point x="3.8" y="3.25"/>
|
||||
<point x="0.735" y="-1.395"/>
|
||||
</points>
|
||||
<bodyColor hex="ffffff"/>
|
||||
<borderColor hex="000000"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="759daf"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</diylc.connectivity.Jumper>
|
||||
<diylc.semiconductors.TransistorTO92>
|
||||
<name>Q1</name>
|
||||
<alpha>100</alpha>
|
||||
<value></value>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<controlPoints>
|
||||
<point x="3.8" y="3.2"/>
|
||||
<point x="3.8" y="3.25"/>
|
||||
<point x="3.8" y="3.3"/>
|
||||
</controlPoints>
|
||||
<bodyColor hex="808080"/>
|
||||
<borderColor hex="595959"/>
|
||||
<labelColor hex="000000"/>
|
||||
<display>NAME</display>
|
||||
<folded>false</folded>
|
||||
<pinSpacing value="0.05" unit="in"/>
|
||||
</diylc.semiconductors.TransistorTO92>
|
||||
</list>
|
||||
</entry>
|
||||
<entry>
|
||||
<string>TO-92 w/ 2 Leads</string>
|
||||
<list>
|
||||
<diylc.connectivity.Jumper>
|
||||
<name>J1</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<point x="2.9" y="3.6"/>
|
||||
<point x="2.9" y="3.7"/>
|
||||
<point x="6.6" y="1.25"/>
|
||||
</points>
|
||||
<bodyColor hex="ffffff"/>
|
||||
<borderColor hex="000000"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="759daf"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</diylc.connectivity.Jumper>
|
||||
<diylc.connectivity.Jumper>
|
||||
<name>J2</name>
|
||||
<alpha>127</alpha>
|
||||
<points>
|
||||
<point x="2.9" y="3.9"/>
|
||||
<point x="2.9" y="3.8"/>
|
||||
<point x="-0.885" y="6.295"/>
|
||||
</points>
|
||||
<bodyColor hex="ffffff"/>
|
||||
<borderColor hex="000000"/>
|
||||
<labelColor hex="000000"/>
|
||||
<leadColor hex="759daf"/>
|
||||
<display>NAME</display>
|
||||
<flipStanding>false</flipStanding>
|
||||
<labelOriantation>Directional</labelOriantation>
|
||||
<moveLabel>false</moveLabel>
|
||||
<style>SOLID</style>
|
||||
</diylc.connectivity.Jumper>
|
||||
<diylc.semiconductors.TransistorTO92>
|
||||
<name>Q1</name>
|
||||
<alpha>100</alpha>
|
||||
<value></value>
|
||||
<orientation>DEFAULT</orientation>
|
||||
<controlPoints>
|
||||
<point x="2.9" y="3.7"/>
|
||||
<point x="2.9" y="3.75"/>
|
||||
<point x="2.9" y="3.8"/>
|
||||
</controlPoints>
|
||||
<bodyColor hex="808080"/>
|
||||
<borderColor hex="595959"/>
|
||||
<labelColor hex="000000"/>
|
||||
<display>NAME</display>
|
||||
<folded>false</folded>
|
||||
<pinSpacing value="0.05" unit="in"/>
|
||||
</diylc.semiconductors.TransistorTO92>
|
||||
</list>
|
||||
</entry>
|
||||
</map>
|
||||
@@ -3781,5 +3781,25 @@
|
||||
</changes>
|
||||
<url>https://github.com/bancika/diy-layout-creator/releases</url>
|
||||
</org.diylc.appframework.update.Version>
|
||||
<org.diylc.appframework.update.Version>
|
||||
<versionNumber>
|
||||
<major>4</major>
|
||||
<minor>22</minor>
|
||||
<build>2</build>
|
||||
</versionNumber>
|
||||
<releaseDate>2022-03-18 00:00:00.000 CET</releaseDate>
|
||||
<name></name>
|
||||
<changes>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>BUG_FIX</changeType>
|
||||
<description>Fixed the issue with application hanging when loading certain files</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
<org.diylc.appframework.update.Change>
|
||||
<changeType>BUG_FIX</changeType>
|
||||
<description>Fixed importing building blocks and variants from a file</description>
|
||||
</org.diylc.appframework.update.Change>
|
||||
</changes>
|
||||
<url>https://github.com/bancika/diy-layout-creator/releases</url>
|
||||
</org.diylc.appframework.update.Version>
|
||||
</a>
|
||||
</java.util.Arrays_-ArrayList>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -67,7 +67,13 @@ public class ProjectFileManager {
|
||||
private XStream xStream;
|
||||
// Legacy deserializer for 3.0.1 through 3.0.7, loads Points referenced in
|
||||
// pixels.
|
||||
private XStream xStreamOld;
|
||||
private XStream xStreamOld;
|
||||
|
||||
public static final XStream xStreamSerializer = new XStream(new DomDriver("UTF-8"));
|
||||
|
||||
static {
|
||||
configure(xStreamSerializer);
|
||||
}
|
||||
|
||||
private String currentFileName = null;
|
||||
private boolean modified = false;
|
||||
@@ -100,7 +106,7 @@ public class ProjectFileManager {
|
||||
configure(xStream);
|
||||
this.xStreamOld = new XStream(new DomDriver());
|
||||
this.xStreamOld.addPermission(AnyTypePermission.ANY);
|
||||
xStreamOld.autodetectAnnotations(true);
|
||||
this.xStreamOld.autodetectAnnotations(true);
|
||||
this.messageDispatcher = messageDispatcher;
|
||||
}
|
||||
|
||||
@@ -109,25 +115,23 @@ public class ProjectFileManager {
|
||||
xStream.alias("point", java.awt.geom.Point2D.class);
|
||||
xStream.alias("point", java.awt.geom.Point2D.Double.class);
|
||||
xStream.alias("font", java.awt.Font.class);
|
||||
// TODO figure out why I commented this out
|
||||
// xStream.alias("color", java.awt.Color.class);
|
||||
xStream.alias("project", Project.class);
|
||||
xStream.aliasPackage("diylc", "org.diylc.components");
|
||||
xStream.registerConverter(new PointConverter());
|
||||
xStream.registerConverter(new ColorConverter());
|
||||
xStream.registerConverter(new FontConverter());
|
||||
xStream.registerConverter(new MeasureConverter());
|
||||
xStream.registerConverter(new AreaConverter());
|
||||
xStream.addImmutableType(Color.class);
|
||||
xStream.addImmutableType(java.awt.geom.Point2D.class);
|
||||
xStream.addImmutableType(java.awt.geom.Point2D.Double.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Voltage.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Resistance.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Capacitance.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Current.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Power.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Inductance.class);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Size.class);
|
||||
xStream.registerConverter(new AreaConverter());
|
||||
xStream.addImmutableType(Color.class, true);
|
||||
xStream.addImmutableType(java.awt.geom.Point2D.class, true);
|
||||
xStream.addImmutableType(java.awt.geom.Point2D.Double.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Voltage.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Resistance.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Capacitance.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Current.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Power.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Inductance.class, true);
|
||||
xStream.addImmutableType(org.diylc.core.measures.Size.class, true);
|
||||
xStream.addPermission(AnyTypePermission.ANY);
|
||||
}
|
||||
|
||||
@@ -303,6 +307,9 @@ public class ProjectFileManager {
|
||||
int build = Integer.parseInt(n.getFirstChild().getNodeValue());
|
||||
|
||||
return new VersionNumber(major, minor, build);
|
||||
|
||||
}
|
||||
|
||||
public XStream getXStream() {
|
||||
return xStream;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -3,7 +3,7 @@ package org.diylc.components;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Shape;
|
||||
import java.awt.geom.Area;
|
||||
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import org.diylc.common.ObjectCache;
|
||||
import org.diylc.core.ComponentState;
|
||||
import org.diylc.core.IDrawingObserver;
|
||||
@@ -33,4 +33,28 @@ public abstract class AbstractMultiPartComponent<T> extends AbstractLabeledCompo
|
||||
outline.add((Area)b);
|
||||
return outline;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Shape[] body = getBody();
|
||||
int margin = 20;
|
||||
double minX = 0;
|
||||
double minY = 0;
|
||||
double maxX = 0;
|
||||
double maxY = 0;
|
||||
for (Shape a : body) {
|
||||
if (a != null) {
|
||||
Rectangle2D bounds2d = a.getBounds2D();
|
||||
if (bounds2d.getMinX() < minX)
|
||||
minX = bounds2d.getMinX();
|
||||
if (bounds2d.getMinY() < minY)
|
||||
minY = bounds2d.getMinY();
|
||||
if (bounds2d.getMaxX() > maxX)
|
||||
maxX = bounds2d.getMaxX();
|
||||
if (bounds2d.getMaxY() > maxY)
|
||||
maxY = bounds2d.getMaxY();
|
||||
}
|
||||
}
|
||||
return new Rectangle2D.Double(minX - margin, minY - margin, maxX - minX + 2 * margin, maxY - minY + 2 * margin);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -351,17 +351,5 @@ public class CliffJack1_4 extends AbstractMultiPartComponent<String> {
|
||||
@Override
|
||||
public boolean canPointMoveFreely(int pointIndex) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Area[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Area a : body)
|
||||
if (a != null)
|
||||
area.add(a);
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -375,17 +375,5 @@ public class ClosedJack1_4 extends AbstractMultiPartComponent<String> {
|
||||
@Override
|
||||
public boolean canPointMoveFreely(int pointIndex) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Shape[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Shape a : body)
|
||||
if (a != null)
|
||||
area.add(new Area(a));
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -376,19 +376,7 @@ public class NeutrikJack1_4 extends AbstractMultiPartComponent<String> {
|
||||
public boolean canPointMoveFreely(int pointIndex) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Area[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Area a : body)
|
||||
if (a != null)
|
||||
area.add(a);
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
|
||||
|
||||
enum Mount {
|
||||
PCB, Panel
|
||||
}
|
||||
|
||||
@@ -31,9 +31,7 @@ import java.awt.geom.AffineTransform;
|
||||
import java.awt.geom.Area;
|
||||
import java.awt.geom.Ellipse2D;
|
||||
import java.awt.geom.Point2D;
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import java.awt.geom.RoundRectangle2D;
|
||||
|
||||
import org.diylc.appframework.miscutils.ConfigurationManager;
|
||||
import org.diylc.awt.StringUtils;
|
||||
import org.diylc.common.HorizontalAlignment;
|
||||
@@ -425,18 +423,6 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<String> {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Area[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Area a : body)
|
||||
if (a != null)
|
||||
area.add(a);
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
|
||||
public enum OpenJackType {
|
||||
|
||||
MONO, STEREO, SWITCHED;
|
||||
|
||||
@@ -31,9 +31,7 @@ import java.awt.geom.AffineTransform;
|
||||
import java.awt.geom.Area;
|
||||
import java.awt.geom.Ellipse2D;
|
||||
import java.awt.geom.Point2D;
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import java.awt.geom.RoundRectangle2D;
|
||||
|
||||
import org.diylc.appframework.miscutils.ConfigurationManager;
|
||||
import org.diylc.awt.StringUtils;
|
||||
import org.diylc.common.HorizontalAlignment;
|
||||
@@ -425,18 +423,6 @@ public class OpenJack1_8 extends AbstractMultiPartComponent<String> {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Area[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Area a : body)
|
||||
if (a != null)
|
||||
area.add(a);
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
|
||||
public enum OpenJackType {
|
||||
|
||||
MONO, STEREO, SWITCHED;
|
||||
|
||||
@@ -411,17 +411,5 @@ public class PilotLampHolder extends AbstractMultiPartComponent<String> {
|
||||
|
||||
protected double getTheta() {
|
||||
return Math.toRadians(getAngle());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Area[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Area a : body)
|
||||
if (a != null)
|
||||
area.add(a);
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
}
|
||||
|
||||
-14
@@ -363,20 +363,6 @@ public class RotarySelectorSwitch extends AbstractMultiPartComponent<String> {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Rectangle2D getCachingBounds() {
|
||||
Area area = new Area();
|
||||
Area[] body = getBody();
|
||||
int margin = 20;
|
||||
for (Area a : body)
|
||||
if (a != null)
|
||||
area.add(a);
|
||||
Rectangle2D bounds = area.getBounds2D();
|
||||
return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin,
|
||||
bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin);
|
||||
}
|
||||
|
||||
|
||||
public static enum RotaryPositionCount {
|
||||
TWO(2), THREE(3), FOUR(4);
|
||||
|
||||
|
||||
@@ -1,33 +1,31 @@
|
||||
/*
|
||||
|
||||
DIY Layout Creator (DIYLC).
|
||||
Copyright (c) 2009-2018 held jointly by the individual authors.
|
||||
|
||||
This file is part of DIYLC.
|
||||
|
||||
DIYLC is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
DIYLC is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with DIYLC. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
*/
|
||||
*
|
||||
* DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
|
||||
*
|
||||
* This file is part of DIYLC.
|
||||
*
|
||||
* DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
|
||||
* General Public License as published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with DIYLC. If not, see
|
||||
* <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
package org.diylc.netlist;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import java.util.stream.Collectors;
|
||||
import javax.swing.JLabel;
|
||||
|
||||
import org.diylc.common.INetlistAnalyzer;
|
||||
@@ -47,7 +45,7 @@ import org.diylc.core.IDIYComponent;
|
||||
import org.diylc.netlist.Tree.ITreeWalker;
|
||||
|
||||
public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer {
|
||||
|
||||
|
||||
private static Set<String> JACK_TYPES = new HashSet<String>();
|
||||
private static Set<String> POT_TYPES = new HashSet<String>();
|
||||
private static Set<String> PICKUP_TYPES = new HashSet<String>();
|
||||
@@ -55,84 +53,92 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
|
||||
static {
|
||||
JACK_TYPES.add(OpenJack1_4.class.getCanonicalName());
|
||||
JACK_TYPES.add(ClosedJack1_4.class.getCanonicalName());
|
||||
|
||||
|
||||
POT_TYPES.add(PotentiometerPanel.class.getCanonicalName());
|
||||
|
||||
|
||||
PICKUP_TYPES.add(SingleCoilPickup.class.getCanonicalName());
|
||||
PICKUP_TYPES.add(HumbuckerPickup.class.getCanonicalName());
|
||||
PICKUP_TYPES.add(P90Pickup.class.getCanonicalName());
|
||||
PICKUP_TYPES.add(JazzBassPickup.class.getCanonicalName());
|
||||
PICKUP_TYPES.add(PBassPickup.class.getCanonicalName());
|
||||
|
||||
|
||||
CAP_TYPES.add(RadialCeramicDiskCapacitor.class.getCanonicalName());
|
||||
CAP_TYPES.add(RadialFilmCapacitor.class.getCanonicalName());
|
||||
CAP_TYPES.add(AxialFilmCapacitor.class.getCanonicalName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getName() {
|
||||
return "Analyze Guitar Diagrams";
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getShortName() {
|
||||
return "guitar-diagrams";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getIconName() {
|
||||
return "Guitar";
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getFontName() {
|
||||
public String getFontName() {
|
||||
return new JLabel().getFont().getName();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private int positiveCount;
|
||||
private int negativeCount;
|
||||
private int noiseCount;
|
||||
|
||||
|
||||
protected Summary summarize(Netlist netlist, Node preferredOutput) throws TreeException {
|
||||
List<String> notes = new ArrayList<String>();
|
||||
|
||||
Tree tree = constructTree(netlist);
|
||||
|
||||
|
||||
Tree pickupTree = tree.filter(PICKUP_TYPES);
|
||||
|
||||
|
||||
if (pickupTree == null || pickupTree.getChildren().isEmpty()) {
|
||||
notes.add("No pickups are detected in this switch configuration");
|
||||
} else {
|
||||
positiveCount = 0;
|
||||
negativeCount = 0;
|
||||
noiseCount = 0;
|
||||
|
||||
|
||||
// analyze hum-cancellation and phase
|
||||
pickupTree.walk(new ITreeWalker() {
|
||||
|
||||
@Override
|
||||
public void visit(Tree t) {
|
||||
}
|
||||
public void visit(Tree t) {}
|
||||
|
||||
@Override
|
||||
public void visit(TreeLeaf l) {
|
||||
if ((l.toString().toLowerCase().contains("north") && (l.toString().toLowerCase().contains("->"))) ||
|
||||
(l.toString().toLowerCase().contains("south") && (l.toString().toLowerCase().contains("<-"))))
|
||||
if ((l.toString().toLowerCase().contains("north")
|
||||
&& (l.toString().toLowerCase().contains("->")))
|
||||
|| (l.toString().toLowerCase().contains("south")
|
||||
&& (l.toString().toLowerCase().contains("<-"))))
|
||||
noiseCount++;
|
||||
if ((l.toString().toLowerCase().contains("north") && (l.toString().toLowerCase().contains("<-"))) ||
|
||||
(l.toString().toLowerCase().contains("south") && (l.toString().toLowerCase().contains("->"))))
|
||||
if ((l.toString().toLowerCase().contains("north")
|
||||
&& (l.toString().toLowerCase().contains("<-")))
|
||||
|| (l.toString().toLowerCase().contains("south")
|
||||
&& (l.toString().toLowerCase().contains("->"))))
|
||||
noiseCount--;
|
||||
|
||||
|
||||
if (l.toString().toLowerCase().contains("->"))
|
||||
positiveCount++;
|
||||
if (l.toString().toLowerCase().contains("<-"))
|
||||
negativeCount++;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Set<IDIYComponent<?>> pickups = tree.extractComponents(PICKUP_TYPES);
|
||||
Map<IDIYComponent<?>, Tree> pickupRoots = new HashMap<IDIYComponent<?>, Tree>();
|
||||
|
||||
|
||||
// analyze each pickup separately to see how each coil is wired
|
||||
for (IDIYComponent<?> c : pickups) {
|
||||
if (c instanceof AbstractGuitarPickup) {
|
||||
AbstractGuitarPickup pickup = (AbstractGuitarPickup)c;
|
||||
AbstractGuitarPickup pickup = (AbstractGuitarPickup) c;
|
||||
if (((AbstractGuitarPickup) c).isHumbucker()) {
|
||||
TreeLeaf nLeaf = new TreeLeaf(pickup, 0, 1);
|
||||
TreeLeaf sLeaf = new TreeLeaf(pickup, 2, 3);
|
||||
@@ -141,8 +147,9 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
|
||||
Tree parent = tree.findCommonParent(nTree, sTree);
|
||||
if (parent != null)
|
||||
pickupRoots.put(pickup, parent);
|
||||
if (nTree != null && sTree != null && parent != null) {
|
||||
notes.add("'" + pickup.getName() + "' pickup wired in humbucking mode with " + parent.getConnectionType().name().toLowerCase() + " coils");
|
||||
if (nTree != null && sTree != null && parent != null) {
|
||||
notes.add("'" + pickup.getName() + "' pickup wired in humbucking mode with "
|
||||
+ parent.getConnectionType().name().toLowerCase() + " coils");
|
||||
} else if ((nTree == null && sTree != null) || (nTree != null && sTree == null)) {
|
||||
notes.add("'" + pickup.getName() + "' pickup wired in coil-split mode");
|
||||
}
|
||||
@@ -154,53 +161,59 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// figure out how pickups are wired between them
|
||||
if (pickupRoots.size() > 1) {
|
||||
Tree root = tree.findCommonParent(new ArrayList<Tree>(pickupRoots.values()));
|
||||
StringBuilder sb = new StringBuilder();
|
||||
boolean first = true;
|
||||
boolean first = true;
|
||||
for (IDIYComponent<?> c : pickupRoots.keySet()) {
|
||||
if (!first)
|
||||
sb.append(pickupRoots.size() == 2 ? " and " : ", ");
|
||||
first = false;
|
||||
sb.append("'").append(c.getName()).append("'");
|
||||
}
|
||||
sb.append(" pickups engaged, wired in " ).append(root.getConnectionType().name().toLowerCase());
|
||||
sb.append(" pickups engaged, wired in ")
|
||||
.append(root.getConnectionType().name().toLowerCase());
|
||||
notes.add(sb.toString());
|
||||
} else if (pickupRoots.size() == 1) {
|
||||
AbstractGuitarPickup pickup = (AbstractGuitarPickup) pickupRoots.keySet().iterator().next();
|
||||
notes.add("'" + pickup.getName() + "' is the only engaged pickup");
|
||||
}
|
||||
|
||||
|
||||
boolean humCancelling = noiseCount == 0;
|
||||
|
||||
|
||||
if (humCancelling)
|
||||
notes.add("This configuration is hum-cancelling");
|
||||
else
|
||||
notes.add("This configuration is NOT hum-cancelling");
|
||||
|
||||
|
||||
if (positiveCount > 1 || negativeCount > 1 || (positiveCount == 1 && negativeCount == 1)) {
|
||||
boolean inPhase = (positiveCount == 0 && negativeCount > 0) || (positiveCount > 0 && negativeCount == 0);
|
||||
boolean inPhase =
|
||||
(positiveCount == 0 && negativeCount > 0) || (positiveCount > 0 && negativeCount == 0);
|
||||
if (inPhase)
|
||||
notes.add("All pickup coils are wired in-phase");
|
||||
else
|
||||
notes.add("Some pickup coils are wired OUT-of-phase");
|
||||
notes.add("Some pickup coils are wired OUT-of-phase");
|
||||
}
|
||||
|
||||
|
||||
// locate volume and tone pots
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> volPotPickupMap = new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> tonePotPickupMap = new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> tonePotPickupReverseMap = new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> volPotPickupReverseMap = new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> volPotPickupMap =
|
||||
new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> tonePotPickupMap =
|
||||
new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> tonePotPickupReverseMap =
|
||||
new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
Map<IDIYComponent<?>, List<IDIYComponent<?>>> volPotPickupReverseMap =
|
||||
new HashMap<IDIYComponent<?>, List<IDIYComponent<?>>>();
|
||||
|
||||
Set<IDIYComponent<?>> pots = tree.extractComponents(POT_TYPES);
|
||||
for (IDIYComponent<?> pot : pots) {
|
||||
TreeLeaf leaf1 = new TreeLeaf(pot, 0, 1);
|
||||
TreeLeaf leaf2 = new TreeLeaf(pot, 1, 2);
|
||||
Tree tree1 = tree.locate(leaf1, false);
|
||||
Tree tree2 = tree.locate(leaf2, false);
|
||||
|
||||
|
||||
if ((tree1 == null && tree2 != null) || (tree1 != null && tree2 == null)) {
|
||||
boolean tonePotReversed = tree1 != null;
|
||||
Tree t = tree1 == null ? tree2 : tree1;
|
||||
@@ -210,7 +223,8 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
|
||||
if (caps != null && caps.size() == 1) {
|
||||
for (Map.Entry<IDIYComponent<?>, Tree> r : pickupRoots.entrySet()) {
|
||||
Tree toneParent = tree.findCommonParent(p, r.getValue());
|
||||
if (toneParent != null && toneParent.getConnectionType() == TreeConnectionType.Parallel) {
|
||||
if (toneParent != null
|
||||
&& toneParent.getConnectionType() == TreeConnectionType.Parallel) {
|
||||
if (tonePotReversed) {
|
||||
List<IDIYComponent<?>> pickupList = tonePotPickupReverseMap.get(pot);
|
||||
if (pickupList == null) {
|
||||
@@ -231,23 +245,25 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// volume
|
||||
if (tree1 == null || tree2 == null)
|
||||
continue;
|
||||
for (Map.Entry<IDIYComponent<?>, Tree> r : pickupRoots.entrySet()) {
|
||||
Tree parent1 = tree.findCommonParent(tree1, r.getValue());
|
||||
Tree parent2 = tree.findCommonParent(tree2, r.getValue());
|
||||
if (parent1 != null && parent2 != null && parent1.getConnectionType() == TreeConnectionType.Series && parent2.getConnectionType() == TreeConnectionType.Parallel)
|
||||
{
|
||||
if (parent1 != null && parent2 != null
|
||||
&& parent1.getConnectionType() == TreeConnectionType.Series
|
||||
&& parent2.getConnectionType() == TreeConnectionType.Parallel) {
|
||||
List<IDIYComponent<?>> pickupList = volPotPickupMap.get(pot);
|
||||
if (pickupList == null) {
|
||||
pickupList = new ArrayList<IDIYComponent<?>>();
|
||||
volPotPickupMap.put(pot, pickupList);
|
||||
}
|
||||
pickupList.add(r.getKey());
|
||||
} else if (parent1 != null && parent2 != null && parent1.getConnectionType() == TreeConnectionType.Parallel && parent2.getConnectionType() == TreeConnectionType.Series)
|
||||
{
|
||||
} else if (parent1 != null && parent2 != null
|
||||
&& parent1.getConnectionType() == TreeConnectionType.Parallel
|
||||
&& parent2.getConnectionType() == TreeConnectionType.Series) {
|
||||
List<IDIYComponent<?>> pickupList = volPotPickupReverseMap.get(pot);
|
||||
if (pickupList == null) {
|
||||
pickupList = new ArrayList<IDIYComponent<?>>();
|
||||
@@ -257,81 +273,97 @@ public class GuitarDiagramAnalyzer extends NetlistAnalyzer implements INetlistAn
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (Map.Entry<IDIYComponent<?>, List<IDIYComponent<?>>> e : volPotPickupMap.entrySet()) {
|
||||
StringBuilder sb = new StringBuilder("'" + e.getKey().getName() + "' potentiometer acts as a volume control for ");
|
||||
boolean first = true;
|
||||
for (IDIYComponent<?> c : e.getValue()) {
|
||||
StringBuilder sb = new StringBuilder(
|
||||
"'" + e.getKey().getName() + "' potentiometer acts as a volume control for ");
|
||||
boolean first = true;
|
||||
List<String> pickupNames =
|
||||
e.getValue().stream().map(x -> x.getName()).sorted().collect(Collectors.toList());
|
||||
for (String pickupName : pickupNames) {
|
||||
if (!first)
|
||||
sb.append(e.getValue().size() == 2 ? " and " : ", ");
|
||||
sb.append(pickupNames.size() == 2 ? " and " : ", ");
|
||||
first = false;
|
||||
sb.append("'").append(c.getName()).append("'");
|
||||
sb.append("'").append(pickupName).append("'");
|
||||
}
|
||||
notes.add(sb.toString());
|
||||
notes.add(sb.toString());
|
||||
}
|
||||
|
||||
for (Map.Entry<IDIYComponent<?>, List<IDIYComponent<?>>> e : volPotPickupReverseMap.entrySet()) {
|
||||
StringBuilder sb = new StringBuilder("'" + e.getKey().getName() + "' potentiometer acts as a volume control for ");
|
||||
boolean first = true;
|
||||
for (IDIYComponent<?> c : e.getValue()) {
|
||||
|
||||
for (Map.Entry<IDIYComponent<?>, List<IDIYComponent<?>>> e : volPotPickupReverseMap
|
||||
.entrySet()) {
|
||||
StringBuilder sb = new StringBuilder(
|
||||
"'" + e.getKey().getName() + "' potentiometer acts as a volume control for ");
|
||||
boolean first = true;
|
||||
List<String> pickupNames =
|
||||
e.getValue().stream().map(x -> x.getName()).sorted().collect(Collectors.toList());
|
||||
for (String pickupName : pickupNames) {
|
||||
if (!first)
|
||||
sb.append(e.getValue().size() == 2 ? " and " : ", ");
|
||||
sb.append(pickupNames.size() == 2 ? " and " : ", ");
|
||||
first = false;
|
||||
sb.append("'").append(c.getName()).append("'");
|
||||
sb.append("'").append(pickupName).append("'");
|
||||
}
|
||||
sb.append(", but is wired in REVERSE!");
|
||||
notes.add(sb.toString());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
for (Map.Entry<IDIYComponent<?>, List<IDIYComponent<?>>> e : tonePotPickupMap.entrySet()) {
|
||||
StringBuilder sb = new StringBuilder("'" + e.getKey().getName() + "' potentiometer acts as a tone control for ");
|
||||
boolean first = true;
|
||||
for (IDIYComponent<?> c : e.getValue()) {
|
||||
StringBuilder sb = new StringBuilder(
|
||||
"'" + e.getKey().getName() + "' potentiometer acts as a tone control for ");
|
||||
boolean first = true;
|
||||
List<String> pickupNames =
|
||||
e.getValue().stream().map(x -> x.getName()).sorted().collect(Collectors.toList());
|
||||
for (String pickupName : pickupNames) {
|
||||
if (!first)
|
||||
sb.append(e.getValue().size() == 2 ? " and " : ", ");
|
||||
sb.append(pickupNames.size() == 2 ? " and " : ", ");
|
||||
first = false;
|
||||
sb.append("'").append(c.getName()).append("'");
|
||||
sb.append("'").append(pickupName).append("'");
|
||||
}
|
||||
notes.add(sb.toString());
|
||||
notes.add(sb.toString());
|
||||
}
|
||||
|
||||
for (Map.Entry<IDIYComponent<?>, List<IDIYComponent<?>>> e : tonePotPickupReverseMap.entrySet()) {
|
||||
StringBuilder sb = new StringBuilder("'" + e.getKey().getName() + "' potentiometer acts as a tone control for ");
|
||||
boolean first = true;
|
||||
for (IDIYComponent<?> c : e.getValue()) {
|
||||
|
||||
for (Map.Entry<IDIYComponent<?>, List<IDIYComponent<?>>> e : tonePotPickupReverseMap
|
||||
.entrySet()) {
|
||||
StringBuilder sb = new StringBuilder(
|
||||
"'" + e.getKey().getName() + "' potentiometer acts as a tone control for ");
|
||||
boolean first = true;
|
||||
List<String> pickupNames =
|
||||
e.getValue().stream().map(x -> x.getName()).sorted().collect(Collectors.toList());
|
||||
for (String pickupName : pickupNames) {
|
||||
if (!first)
|
||||
sb.append(e.getValue().size() == 2 ? " and " : ", ");
|
||||
sb.append(pickupNames.size() == 2 ? " and " : ", ");
|
||||
first = false;
|
||||
sb.append("'").append(c.getName()).append("'");
|
||||
sb.append("'").append(pickupName).append("'");
|
||||
}
|
||||
sb.append(", but is wired in REVERSE!");
|
||||
notes.add(sb.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
|
||||
sb.append("Parallel/Series connectivity tree:<br><br>").append(tree.toHTML(0));
|
||||
if (!notes.isEmpty())
|
||||
if (!notes.isEmpty()) {
|
||||
Collections.sort(notes);
|
||||
sb.append("<br><br>Notes:<br>");
|
||||
for (String v : notes) {
|
||||
sb.append(" ").append(v).append("<br>");
|
||||
for (String v : notes) {
|
||||
sb.append(" ").append(v).append("<br>");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return new Summary(netlist, sb.toString());
|
||||
}
|
||||
|
||||
|
||||
public Tree constructTree(Netlist netlist) throws TreeException {
|
||||
List<Node> jackTipNodes = find(JACK_TYPES, "Tip", netlist);
|
||||
List<Node> jackSleeveNodes = find(JACK_TYPES, "Sleeve", netlist);
|
||||
|
||||
|
||||
if (jackTipNodes.size() == 0 || jackSleeveNodes.size() == 0) {
|
||||
throw new TreeException("Could not find anything connected to a jack tip terminal.");
|
||||
} else if (jackTipNodes.size() > 1 || jackSleeveNodes.size() > 1) {
|
||||
throw new TreeException("Multiple jacks found, could not proceed.");
|
||||
} else {
|
||||
} else {
|
||||
Node jackTip = jackTipNodes.get(0);
|
||||
Node jackSleeve = jackSleeveNodes.get(0);
|
||||
Node jackSleeve = jackSleeveNodes.get(0);
|
||||
return constructTreeBetween(netlist, jackTip, jackSleeve);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
*/
|
||||
package org.diylc.netlist;
|
||||
|
||||
import java.text.Collator;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import java.util.stream.Collectors;
|
||||
import org.diylc.common.INetlistAnalyzer;
|
||||
import org.diylc.core.IDIYComponent;
|
||||
|
||||
@@ -38,6 +38,11 @@ public class SpiceAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer {
|
||||
public String getName() {
|
||||
return "Generate Spice Netlist";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getShortName() {
|
||||
return "spice";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getIconName() {
|
||||
@@ -51,16 +56,7 @@ public class SpiceAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer {
|
||||
|
||||
protected Summary summarize(Netlist netlist, Node preferredOutput) throws TreeException {
|
||||
// grab all components that are in the netlist
|
||||
List<IDIYComponent<?>> allComponents = new ArrayList<IDIYComponent<?>>(extractComponents(netlist));
|
||||
Collections.sort(allComponents, new Comparator<IDIYComponent<?>>() {
|
||||
|
||||
@Override
|
||||
public int compare(IDIYComponent<?> o1, IDIYComponent<?> o2) {
|
||||
return o1.getName().compareToIgnoreCase(o2.getName());
|
||||
}
|
||||
});
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
List<IDIYComponent<?>> allComponents = netlist.getComponents();
|
||||
|
||||
List<Group> groups = netlist.getSortedGroups();
|
||||
int unconnectedIndex = groups.size();
|
||||
@@ -71,7 +67,10 @@ public class SpiceAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer {
|
||||
maxLen = c.getName().length();
|
||||
}
|
||||
|
||||
for (IDIYComponent<?> c : allComponents) {
|
||||
List<String> lines = new ArrayList<String>();
|
||||
|
||||
for (IDIYComponent<?> c : allComponents) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
// change the prefix to match spice convention if needed
|
||||
String name = c.getName();
|
||||
String prefix = null;
|
||||
@@ -90,18 +89,18 @@ public class SpiceAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer {
|
||||
if (c.getControlPointNodeName(i) == null)
|
||||
continue;
|
||||
|
||||
int pointIndex = i;
|
||||
int pointIndex = i;
|
||||
|
||||
// remap if needed
|
||||
if (c instanceof ISpiceMapper)
|
||||
pointIndex = ((ISpiceMapper)c).mapToSpiceNode(pointIndex);
|
||||
|
||||
int nodeIndex = find(new Node(c, pointIndex), groups);
|
||||
if (nodeIndex < 0)
|
||||
nodeIndex = unconnectedIndex++;
|
||||
|
||||
// 1-based convention
|
||||
nodeIndex++;
|
||||
|
||||
// remap if needed
|
||||
if (c instanceof ISpiceMapper)
|
||||
pointIndex = ((ISpiceMapper)c).mapToSpiceNode(pointIndex);
|
||||
nodeIndex++;
|
||||
|
||||
nodeIndices.add(nodeIndex);
|
||||
}
|
||||
@@ -120,9 +119,13 @@ public class SpiceAnalyzer extends NetlistAnalyzer implements INetlistAnalyzer {
|
||||
sb.append(" ; ").append(comment);
|
||||
}
|
||||
sb.append("<br>");
|
||||
lines.add(sb.toString());
|
||||
}
|
||||
|
||||
return new Summary(netlist, sb.toString());
|
||||
return new Summary(netlist, lines
|
||||
.stream()
|
||||
.sorted()
|
||||
.collect(Collectors.joining("\n")));
|
||||
}
|
||||
|
||||
private static String formatSpiceNode(int i) {
|
||||
|
||||
@@ -43,7 +43,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
OpenJack1_4 jack = new OpenJack1_4();
|
||||
SingleCoilPickup pickup = new SingleCoilPickup();
|
||||
pickup.setName("Pickup");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 1);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2);
|
||||
netlist.add(tipGroup).add(sleeveGroup);
|
||||
@@ -59,7 +59,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
pickup.setName("Pickup");
|
||||
PotentiometerPanel vol = new PotentiometerPanel();
|
||||
vol.setName("Volume");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol));
|
||||
Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0);
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2);
|
||||
@@ -80,7 +80,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
tone.setName("Tone");
|
||||
RadialCeramicDiskCapacitor cap = new RadialCeramicDiskCapacitor();
|
||||
cap.setName("Cap");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol, tone, cap));
|
||||
Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0).connect(tone, 2);
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2).connect(cap, 0);
|
||||
@@ -108,7 +108,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
cap1.setName("Cap1");
|
||||
RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
|
||||
cap2.setName("Cap2");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
|
||||
Group hotGroup = new Group().connect(pickup1, 1).connect(vol, 0).connect(tone1, 2).connect(pickup2, 1).connect(tone2, 2);
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 2).connect(pickup2, 2).connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
|
||||
@@ -125,7 +125,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
OpenJack1_4 jack = new OpenJack1_4();
|
||||
SingleCoilPickup pickup = new SingleCoilPickup();
|
||||
pickup.setName("Pickup");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 2);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1);
|
||||
netlist.add(tipGroup).add(sleeveGroup);
|
||||
@@ -139,7 +139,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
OpenJack1_4 jack = new OpenJack1_4();
|
||||
HumbuckerPickup pickup = new HumbuckerPickup();
|
||||
pickup.setName("Pickup");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0);
|
||||
Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 3);
|
||||
@@ -154,7 +154,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
OpenJack1_4 jack = new OpenJack1_4();
|
||||
HumbuckerPickup pickup = new HumbuckerPickup();
|
||||
pickup.setName("Pickup");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 3);
|
||||
Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 0);
|
||||
@@ -169,7 +169,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
OpenJack1_4 jack = new OpenJack1_4();
|
||||
HumbuckerPickup pickup = new HumbuckerPickup();
|
||||
pickup.setName("Pickup");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 2);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 3);
|
||||
netlist.add(tipGroup).add(sleeveGroup);
|
||||
@@ -183,7 +183,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
OpenJack1_4 jack = new OpenJack1_4();
|
||||
HumbuckerPickup pickup = new HumbuckerPickup();
|
||||
pickup.setName("Pickup");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 3);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 2);
|
||||
netlist.add(tipGroup).add(sleeveGroup);
|
||||
@@ -199,7 +199,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
pickup1.setName("Pickup1");
|
||||
HumbuckerPickup pickup2 = new HumbuckerPickup();
|
||||
pickup2.setName("Pickup2");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0);
|
||||
Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
|
||||
Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
|
||||
@@ -218,7 +218,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
pickup1.setName("Pickup1");
|
||||
HumbuckerPickup pickup2 = new HumbuckerPickup();
|
||||
pickup2.setName("Pickup2");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 0);
|
||||
Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
|
||||
Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
|
||||
@@ -236,7 +236,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
pickup1.setName("Pickup1");
|
||||
HumbuckerPickup pickup2 = new HumbuckerPickup();
|
||||
pickup2.setName("Pickup2");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 3);
|
||||
Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
|
||||
Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
|
||||
@@ -264,7 +264,7 @@ public class GuitarNetlistAnalyzerTests {
|
||||
cap1.setName("Cap1");
|
||||
RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
|
||||
cap2.setName("Cap2");
|
||||
Netlist netlist = new Netlist();
|
||||
Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
|
||||
Group hotGroup = new Group().connect(pickup1, 0).connect(vol, 0).connect(tone1, 2).connect(pickup2, 0).connect(tone2, 2);
|
||||
Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
|
||||
Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3).connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.RegressionTestRunner"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="diylc-swing"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc-regression-data" TEST user-files"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc-regression-data" TEST travelcaster3"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
|
||||
</launchConfiguration>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<property name="jar.dir" value="${build.dir}/jar" />
|
||||
<property name="report.dir" value="${build.dir}/junitreport" />
|
||||
<property name="main.class" value="org.diylc.DIYLCStarter" />
|
||||
<property name="diylc.version" value="4.22.1" />
|
||||
<property name="diylc.version" value="4.22.2" />
|
||||
|
||||
<property name="osx.jre8.path" value="jre\osx\jre8u321\Contents\Home\" />
|
||||
|
||||
|
||||
@@ -26,8 +26,6 @@ A-O-I REGULATOR
|
||||
AWG
|
||||
And
|
||||
C-B-E BJT
|
||||
C1
|
||||
C2
|
||||
Check Trace Proximity
|
||||
D-G-S JFET
|
||||
D-G-S MOSFET
|
||||
|
||||
@@ -37,6 +37,15 @@
|
||||
<update_contact>nbenitezl_AT_gmail.com</update_contact>
|
||||
<content_rating type="oars-1.1"/>
|
||||
<releases>
|
||||
<release version="4.22.2" date="2022-03-18">
|
||||
<description>
|
||||
<ul>
|
||||
<li>[Bug Fix] Fixed the issue with application hanging when loading certain files</li>
|
||||
<li>[Bug Fix] Fixed importing building blocks and variants from a file</li>
|
||||
</ul>
|
||||
</description>
|
||||
<url>https://github.com/bancika/diy-layout-creator/releases/tag/v4.22.2</url>
|
||||
</release>
|
||||
<release version="4.22.1" date="2022-03-07">
|
||||
<description>
|
||||
<ul>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -97,9 +97,6 @@ import org.diylc.swingframework.TextDialog;
|
||||
import org.diylc.swingframework.export.DrawingExporter;
|
||||
import org.diylc.utils.BomEntry;
|
||||
|
||||
import com.thoughtworks.xstream.XStream;
|
||||
import com.thoughtworks.xstream.io.xml.DomDriver;
|
||||
|
||||
public class ActionFactory {
|
||||
|
||||
private static final Logger LOG = Logger.getLogger(ActionFactory.class);
|
||||
@@ -967,10 +964,8 @@ public class ActionFactory {
|
||||
LOG.debug("Exporting variants to " + file.getAbsolutePath());
|
||||
|
||||
try {
|
||||
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
ProjectFileManager.configure(xStream);
|
||||
xStream.toXML(variantPkg, out);
|
||||
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
|
||||
ProjectFileManager.xStreamSerializer.toXML(variantPkg, out);
|
||||
out.close();
|
||||
LOG.info("Exported variants succesfully");
|
||||
} catch (IOException e) {
|
||||
@@ -1124,10 +1119,8 @@ public class ActionFactory {
|
||||
LOG.debug("Exporting variants to " + file.getAbsolutePath());
|
||||
|
||||
try {
|
||||
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
|
||||
XStream xStream = new XStream(new DomDriver());
|
||||
ProjectFileManager.configure(xStream);
|
||||
xStream.toXML(variantPkg, out);
|
||||
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
|
||||
ProjectFileManager.xStreamSerializer.toXML(variantPkg, out);
|
||||
out.close();
|
||||
LOG.info("Exported building blocks succesfully");
|
||||
} catch (IOException e) {
|
||||
|
||||
@@ -122,7 +122,7 @@ public class MainFrame extends JFrame implements ISwingUI {
|
||||
|
||||
IConfigurationManager configManager = ConfigurationManager.getInstance();
|
||||
|
||||
this.presenter = new Presenter(this, configManager);
|
||||
this.presenter = new Presenter(this, configManager, true);
|
||||
|
||||
presenter.installPlugin(() -> new ToolBox(this));
|
||||
presenter.installPlugin(() -> new FileMenuPlugin(this));
|
||||
|
||||
@@ -21,33 +21,29 @@
|
||||
*/
|
||||
package org.diylc.swing.plugins.file;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Rectangle;
|
||||
import java.beans.PropertyChangeEvent;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.util.EnumSet;
|
||||
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JFileChooser;
|
||||
import javax.swing.JLabel;
|
||||
import java.awt.Color;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Rectangle;
|
||||
import java.beans.PropertyChangeEvent;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.util.EnumSet;
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JFileChooser;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
|
||||
import org.diylc.common.DrawOption;
|
||||
import org.diylc.common.IPlugInPort;
|
||||
import org.diylc.core.Project;
|
||||
import org.diylc.presenter.Presenter;
|
||||
import org.diylc.swing.gui.DummyView;
|
||||
import org.diylc.common.DrawOption;
|
||||
import org.diylc.common.IPlugInPort;
|
||||
import org.diylc.core.Project;
|
||||
import org.diylc.presenter.Presenter;
|
||||
import org.diylc.serialization.ProjectFileManager;
|
||||
import org.diylc.swing.gui.DummyView;
|
||||
import org.diylc.swingframework.IFileChooserAccessory;
|
||||
|
||||
import com.thoughtworks.xstream.XStream;
|
||||
import com.thoughtworks.xstream.io.xml.DomDriver;
|
||||
|
||||
/**
|
||||
* {@link JComponent} that shows preview of the selected project in {@link JFileChooser}. It's
|
||||
* hooked onto {@link JFileChooser} as {@link PropertyChangeListener} and refreshes when file is
|
||||
@@ -60,7 +56,6 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private IPlugInPort presenter;
|
||||
private XStream xStream;
|
||||
private Project emptyProject;
|
||||
private RenderComponent renderComponent;
|
||||
private JLabel nameLabel;
|
||||
@@ -70,7 +65,6 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF
|
||||
|
||||
setPreferredSize(new Dimension(140, 128));
|
||||
presenter = new Presenter(new DummyView(), InMemoryConfigurationManager.getInstance());
|
||||
xStream = new XStream(new DomDriver());
|
||||
|
||||
emptyProject = new Project();
|
||||
emptyProject.setTitle("");
|
||||
@@ -97,7 +91,7 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF
|
||||
File selectedFile = (File) evt.getNewValue();
|
||||
try {
|
||||
FileInputStream in = new FileInputStream(selectedFile);
|
||||
selectedProject = (Project) xStream.fromXML(in);
|
||||
selectedProject = (Project) ProjectFileManager.xStreamSerializer.fromXML(in);
|
||||
in.close();
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
@@ -1,18 +1,27 @@
|
||||
package org.diylc;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.diylc.common.PropertyWrapper;
|
||||
import org.diylc.core.IView;
|
||||
|
||||
public class MockView implements IView {
|
||||
|
||||
private Map<Integer, List<String>> messages = new HashMap<Integer, List<String>>();
|
||||
|
||||
@Override
|
||||
public void showMessage(String message, String title, int messageType) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
messages.putIfAbsent(messageType, new ArrayList<String>());
|
||||
messages.get(messageType).add(message);
|
||||
}
|
||||
|
||||
public Map<Integer, List<String>> getMessages() {
|
||||
return messages;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package org.diylc;
|
||||
|
||||
import java.awt.Point;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import org.diylc.common.ComponentType;
|
||||
import org.diylc.core.Template;
|
||||
import org.junit.Test;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
public class PresenterTests extends TestBase {
|
||||
@@ -24,4 +26,28 @@ public class PresenterTests extends TestBase {
|
||||
instantiateOneClick("Connectivity", "Solder Pad", new Point(1000, 1000));
|
||||
Assert.assertEquals(1, presenter.getCurrentProject().getComponents().size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLoadVariants() {
|
||||
try {
|
||||
ComponentType resistorType = presenter.getComponentTypes().get("Passive").stream().filter(x -> x.getName().equals("Resistor")).findAny().get();
|
||||
List<Template> variantsFor = presenter.getVariantsFor(resistorType);
|
||||
Assert.assertEquals(0, variantsFor.size());
|
||||
presenter.importVariants("./test/resources/variants_test.xml");
|
||||
variantsFor = presenter.getVariantsFor(resistorType);
|
||||
Assert.assertTrue(!variantsFor.isEmpty());
|
||||
} catch (IOException e) {
|
||||
Assert.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLoadBlocks() {
|
||||
try {
|
||||
int blocks = presenter.importBlocks("./test/resources/blocks_test.xml");
|
||||
Assert.assertTrue(blocks > 0);
|
||||
} catch (IOException e) {
|
||||
Assert.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,16 @@ package org.diylc;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
@@ -16,7 +23,12 @@ import java.util.stream.Stream;
|
||||
import org.diylc.appframework.miscutils.ConfigurationManager;
|
||||
import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
|
||||
import org.diylc.appframework.update.VersionNumber;
|
||||
import org.diylc.common.INetlistAnalyzer;
|
||||
import org.diylc.common.IPlugInPort;
|
||||
import org.diylc.core.IView;
|
||||
import org.diylc.netlist.Netlist;
|
||||
import org.diylc.netlist.Summary;
|
||||
import org.diylc.netlist.TreeException;
|
||||
import org.diylc.presenter.Presenter;
|
||||
import org.diylc.swing.plugins.file.ProjectDrawingProvider;
|
||||
import org.diylc.swingframework.export.DrawingExporter;
|
||||
@@ -32,6 +44,15 @@ public class RegressionTestRunner {
|
||||
System.out.println("No path and command provided");
|
||||
return;
|
||||
}
|
||||
//
|
||||
// URL url = DIYLCStarter.class.getResource("log4j.properties");
|
||||
// Properties properties = new Properties();
|
||||
// try {
|
||||
// properties.load(url.openStream());
|
||||
// PropertyConfigurator.configure(properties);
|
||||
// } catch (Exception e) {
|
||||
// System.err.println("Could not initialize log4j configuration: " + e.getMessage());
|
||||
// }
|
||||
|
||||
ConfigurationManager.getInstance().initialize("diylc-test");
|
||||
|
||||
@@ -66,17 +87,17 @@ public class RegressionTestRunner {
|
||||
Presenter presenter = new Presenter(view, InMemoryConfigurationManager.getInstance());
|
||||
VersionNumber currentVersionNumber = presenter.getCurrentVersionNumber();
|
||||
|
||||
String fileName = basePath + File.separator + "reports" + File.separator
|
||||
+ LocalDateTime.now().toString().replace(":", "_") + "-"
|
||||
+ "V" + currentVersionNumber.toString().replace('.', '_') + ".csv";
|
||||
String fileName = basePath + File.separator + "reports" + File.separator
|
||||
+ LocalDateTime.now().toString().replace(":", "_") + "-" + "V"
|
||||
+ currentVersionNumber.toString().replace('.', '_') + ".csv";
|
||||
|
||||
BufferedWriter writer = new BufferedWriter(new FileWriter(fileName));
|
||||
|
||||
|
||||
long okCount = results.stream().filter(x -> x.ok).count();
|
||||
long failCount = results.size() - okCount;
|
||||
long totalTime = results.stream().map(x -> x.duration).reduce(0l, (a, b) -> a + b);
|
||||
long avgTime = totalTime / results.size();
|
||||
|
||||
|
||||
writer.write("OK,Failed,Total Time,Avg Time");
|
||||
writer.newLine();
|
||||
writer.write(Long.toString(okCount));
|
||||
@@ -85,11 +106,11 @@ public class RegressionTestRunner {
|
||||
writer.write(",");
|
||||
writer.write(Long.toString(totalTime));
|
||||
writer.write(",");
|
||||
writer.write(Long.toString(avgTime));
|
||||
writer.write(Long.toString(avgTime));
|
||||
writer.newLine();
|
||||
writer.newLine();
|
||||
writer.newLine();
|
||||
|
||||
|
||||
writer.write("File,Status,Message,Time");
|
||||
writer.newLine();
|
||||
results.stream().sorted(Comparator.comparing(x -> x.fileName)).forEach(item -> {
|
||||
@@ -108,9 +129,9 @@ public class RegressionTestRunner {
|
||||
});
|
||||
|
||||
writer.close();
|
||||
|
||||
System.out.println("OK files: " + okCount + "; Failed files: " + failCount
|
||||
+ "; totalTime: " + (totalTime / 1000) + "s" + "; avgTime: " + avgTime + "ms");
|
||||
|
||||
System.out.println("OK files: " + okCount + "; Failed files: " + failCount + "; totalTime: "
|
||||
+ (totalTime / 1000) + "s" + "; avgTime: " + avgTime + "ms");
|
||||
|
||||
System.out.println("Saved test report to: " + fileName);
|
||||
}
|
||||
@@ -134,8 +155,8 @@ public class RegressionTestRunner {
|
||||
}
|
||||
}
|
||||
RegressionTestResult testResult = processFile(file, command);
|
||||
System.out
|
||||
.println(testResult.fileName + ": " + (testResult.ok ? "OK" : testResult.message));
|
||||
System.out.println(
|
||||
testResult.fileName + ": " + (testResult.message == null ? "OK" : testResult.message));
|
||||
return Stream.of(testResult);
|
||||
}
|
||||
});
|
||||
@@ -144,16 +165,16 @@ public class RegressionTestRunner {
|
||||
private static RegressionTestResult processFile(File file, String command) {
|
||||
String prefix = "File: " + file.getName() + " status: ";
|
||||
try {
|
||||
IView view = new MockView();
|
||||
MockView view = new MockView();
|
||||
Presenter presenter = new Presenter(view, InMemoryConfigurationManager.getInstance());
|
||||
ProjectDrawingProvider drawingProvider =
|
||||
new ProjectDrawingProvider(presenter, false, true, false);
|
||||
presenter.loadProjectFromFile(file.getAbsolutePath());
|
||||
if ("PREPARE".equalsIgnoreCase(command)) {
|
||||
// generate PNG input image for comparison
|
||||
return prepareInputs(file, drawingProvider);
|
||||
return prepareInputs(file, drawingProvider, presenter);
|
||||
} else if ("TEST".equalsIgnoreCase(command)) {
|
||||
return testOutputs(file, prefix, presenter, drawingProvider);
|
||||
return testOutputs(file, prefix, presenter, drawingProvider, view);
|
||||
}
|
||||
return new RegressionTestResult(file.getName()).failed("Command not recognized");
|
||||
} catch (Exception e) {
|
||||
@@ -163,7 +184,7 @@ public class RegressionTestRunner {
|
||||
}
|
||||
|
||||
private static RegressionTestResult testOutputs(File file, String prefix, Presenter presenter,
|
||||
ProjectDrawingProvider drawingProvider) {
|
||||
ProjectDrawingProvider drawingProvider, MockView view) {
|
||||
RegressionTestResult res = new RegressionTestResult(file.getName());
|
||||
File baseDir = file.getParentFile().getParentFile().getParentFile().getParentFile();
|
||||
File outputDir = new File(baseDir.getAbsolutePath() + File.separator + "output" + File.separator
|
||||
@@ -210,11 +231,74 @@ public class RegressionTestRunner {
|
||||
if (ImageComparisonState.MATCH != imageComparisonResult.getImageComparisonState()) {
|
||||
return res.failed("Images do not match!");
|
||||
}
|
||||
return res.succedded();
|
||||
|
||||
List<INetlistAnalyzer> summarizers = presenter.getNetlistAnalyzers();
|
||||
if (summarizers != null) {
|
||||
List<Netlist> netlists = presenter.extractNetlists(true);
|
||||
|
||||
for (INetlistAnalyzer summarizer : summarizers) {
|
||||
File summaryOutputDir =
|
||||
new File(outputDir.getAbsolutePath() + File.separator + summarizer.getShortName());
|
||||
File summaryOutputFile = new File(summaryOutputDir.getAbsolutePath() + File.separator
|
||||
+ file.getName().replace(".diy", ".txt"));
|
||||
summaryOutputDir.mkdirs();
|
||||
if (summaryOutputFile.exists()) {
|
||||
summaryOutputFile.delete();
|
||||
}
|
||||
|
||||
File summaryInputDir = new File(file.getParentFile().getParentFile().getAbsolutePath()
|
||||
+ File.separator + summarizer.getShortName());
|
||||
File summaryInputFile = new File(summaryInputDir.getAbsolutePath() + File.separator
|
||||
+ file.getName().replace(".diy", ".txt"));
|
||||
|
||||
if (!summaryInputFile.exists()) {
|
||||
return res.failed("Summary input file not found for: " + summarizer.getShortName());
|
||||
}
|
||||
|
||||
try {
|
||||
List<String> outputLines = new ArrayList<String>();
|
||||
try {
|
||||
writeSummariesToFile(netlists, summarizer, summaryOutputFile);
|
||||
outputLines = Files.readAllLines(Paths.get(summaryOutputFile.getAbsolutePath()));
|
||||
} catch (Exception e) {
|
||||
try (BufferedWriter writer = new BufferedWriter(
|
||||
new OutputStreamWriter(new FileOutputStream(summaryOutputFile, true), "UTF-8"))) {
|
||||
String line = e.getClass().getCanonicalName() + ": " + e.getMessage();
|
||||
writer.write(line);
|
||||
outputLines.add(line);
|
||||
}
|
||||
}
|
||||
|
||||
List<String> inputLines =
|
||||
Files.readAllLines(Paths.get(summaryInputFile.getAbsolutePath()));
|
||||
|
||||
if (inputLines.size() != outputLines.size()) {
|
||||
return res.failed(
|
||||
"Summary input and output files do not match for: " + summarizer.getShortName());
|
||||
}
|
||||
for (int i = 0; i < inputLines.size(); i++) {
|
||||
if (!inputLines.get(i).equals(outputLines.get(i))) {
|
||||
return res.failed(
|
||||
"Summary input and output files do not match for: " + summarizer.getShortName());
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return res.failed(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String message = null;
|
||||
if (!view.getMessages().isEmpty()) {
|
||||
message = view.getMessages().entrySet().stream().flatMap(x -> x.getValue().stream())
|
||||
.reduce("", String::concat);
|
||||
}
|
||||
|
||||
return res.succedded(message);
|
||||
}
|
||||
|
||||
private static RegressionTestResult prepareInputs(File file,
|
||||
ProjectDrawingProvider drawingProvider) {
|
||||
ProjectDrawingProvider drawingProvider, IPlugInPort plugInPort) {
|
||||
RegressionTestResult res = new RegressionTestResult(file.getName());
|
||||
try {
|
||||
File pngDir =
|
||||
@@ -222,8 +306,32 @@ public class RegressionTestRunner {
|
||||
File pngFile = new File(
|
||||
pngDir.getAbsolutePath() + File.separator + file.getName().replace(".diy", ".png"));
|
||||
pngFile.getParentFile().mkdirs();
|
||||
if (!pngFile.exists()) {
|
||||
DrawingExporter.getInstance().exportPNG(drawingProvider, pngFile);
|
||||
|
||||
// always export image to ensure that rendering is done and continuity areas are populated
|
||||
DrawingExporter.getInstance().exportPNG(drawingProvider, pngFile);
|
||||
|
||||
List<INetlistAnalyzer> summarizers = plugInPort.getNetlistAnalyzers();
|
||||
if (summarizers != null) {
|
||||
List<Netlist> netlists = plugInPort.extractNetlists(true);
|
||||
|
||||
for (INetlistAnalyzer summarizer : summarizers) {
|
||||
File summaryDir = new File(file.getParentFile().getParentFile().getAbsolutePath()
|
||||
+ File.separator + summarizer.getShortName());
|
||||
File summaryFile = new File(summaryDir.getAbsolutePath() + File.separator
|
||||
+ file.getName().replace(".diy", ".txt"));
|
||||
summaryDir.mkdirs();
|
||||
if (!summaryFile.exists()) {
|
||||
try {
|
||||
writeSummariesToFile(netlists, summarizer, summaryFile);
|
||||
|
||||
} catch (Exception e) {
|
||||
try (BufferedWriter writer = new BufferedWriter(
|
||||
new OutputStreamWriter(new FileOutputStream(summaryFile, true), "UTF-8"))) {
|
||||
writer.write(e.getClass().getCanonicalName() + ": " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
return res.failed(e.getMessage());
|
||||
@@ -231,6 +339,23 @@ public class RegressionTestRunner {
|
||||
return res.succedded();
|
||||
}
|
||||
|
||||
private static void writeSummariesToFile(List<Netlist> netlists, INetlistAnalyzer summarizer,
|
||||
File summaryFile)
|
||||
throws TreeException, IOException, UnsupportedEncodingException, FileNotFoundException {
|
||||
List<Summary> summaries = summarizer.summarize(netlists, null);
|
||||
|
||||
try (BufferedWriter writer = new BufferedWriter(
|
||||
new OutputStreamWriter(new FileOutputStream(summaryFile, true), "UTF-8"))) {
|
||||
for (Summary summary : summaries) {
|
||||
writer.write("<b>Switch configuration: ");
|
||||
writer.write(summary.getNetlist().getSwitchSetup().toString());
|
||||
writer.write("</b><br><br>");
|
||||
writer.write(summary.getSummary());
|
||||
writer.newLine();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static class RegressionTestResult {
|
||||
boolean ok;
|
||||
String message;
|
||||
@@ -244,13 +369,18 @@ public class RegressionTestRunner {
|
||||
}
|
||||
|
||||
public RegressionTestResult succedded() {
|
||||
return succedded(null);
|
||||
}
|
||||
|
||||
public RegressionTestResult succedded(String message) {
|
||||
this.ok = true;
|
||||
this.message = message;
|
||||
this.duration = System.currentTimeMillis() - this.startTime;
|
||||
return this;
|
||||
}
|
||||
|
||||
public RegressionTestResult failed(String message) {
|
||||
this.ok = true;
|
||||
this.ok = false;
|
||||
this.message = message;
|
||||
this.duration = System.currentTimeMillis() - this.startTime;
|
||||
return this;
|
||||
|
||||
@@ -2,9 +2,11 @@ package org.diylc;
|
||||
|
||||
import java.awt.Point;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.net.URL;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import java.util.Properties;
|
||||
import org.apache.log4j.PropertyConfigurator;
|
||||
import org.diylc.appframework.miscutils.ConfigurationManager;
|
||||
import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
|
||||
import org.diylc.common.ComponentType;
|
||||
@@ -17,6 +19,15 @@ public class TestBase {
|
||||
protected IView view;
|
||||
|
||||
public TestBase() {
|
||||
URL url = DIYLCStarter.class.getResource("log4j.properties");
|
||||
Properties properties = new Properties();
|
||||
try {
|
||||
properties.load(url.openStream());
|
||||
PropertyConfigurator.configure(properties);
|
||||
} catch (Exception e) {
|
||||
System.err.println("Could not initialize log4j configuration: " + e.getMessage());
|
||||
}
|
||||
|
||||
ConfigurationManager.getInstance().initialize("diylc-test");
|
||||
view = new MockView();
|
||||
presenter = new Presenter(view, InMemoryConfigurationManager.getInstance());
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user