diff --git a/diylc/catalog_full.json b/diylc/catalog_full.json
index a30e54e4..b896f8f9 100644
--- a/diylc/catalog_full.json
+++ b/diylc/catalog_full.json
@@ -16828,7 +16828,7 @@
"description" : "Glass diode, like most small signal diodes.",
"creationMethod" : "POINT_BY_POINT",
"notes" : [ "The two control points are the holes the leads go into and the body is centred between them; 'Length' is the body length, not the hole spacing", "If the control points are closer together than 'Length' (0.2in by default) the part is drawn standing, its body over the first point, or over the second with 'Reverse (standing)'; to keep it lying on a tighter footprint, reduce 'Length'", "A datasheet model is a part number such as 1N4148, BAT46 or 1N34A and sets 'Value', 'Length', 'Width' and the body colours to match its package; set 'Value' to the same part number together with the model" ],
- "datasheetModels" : [ "BYV26C", "BYV26E", "1N34A", "1N60", "1N60P", "1N270", "AA119", "AA143", "OA47", "OA90", "OA91", "OA95", "1N5711", "BAT41", "BAT42", "BAT43", "BAT46", "BAT48", "BAT85", "BAT86", "1N914", "1N916", "1N3600", "1N4148", "1N4151", "1N4448", "1S1588", "1S2473", "1SS133", "BA221", "BAV21", "MA150", "MA856", "1N746A", "1N747A", "1N748A", "1N749A", "1N750A", "1N751A", "1N752A", "1N753A", "1N754A", "1N755A", "1N756A", "1N757A", "1N758A", "1N759A", "1N4728A", "1N4729A", "1N4730A", "1N4731A", "1N4732A", "1N4733A", "1N4734A", "1N4735A", "1N4736A", "1N4737A", "1N4738A", "1N4739A", "1N4740A", "1N4741A", "1N4742A", "1N4743A", "1N4744A", "1N4745A", "1N4746A", "1N4747A", "1N4748A", "1N4749A", "1N4750A", "1N4751A", "1N4752A", "1N4753A", "1N4754A", "1N4755A", "1N4756A", "1N4757A", "1N4758A", "1N4759A", "1N4760A", "1N4761A", "1N4762A", "1N4763A", "1N4764A", "1N5221B", "1N5222B", "1N5223B", "1N5224B", "1N5225B", "1N5226B", "1N5227B", "1N5228B", "1N5229B", "1N5230B", "1N5231B", "1N5232B", "1N5233B", "1N5234B", "1N5235B", "1N5236B", "1N5237B", "1N5238B", "1N5239B", "1N5240B", "1N5241B", "1N5242B", "1N5243B", "1N5244B", "1N5245B", "1N5246B", "1N5247B", "1N5248B", "1N5249B", "1N5250B", "1N5251B", "1N5252B", "1N5253B", "1N5254B", "1N5255B", "1N5256B", "1N5257B", "1N5258B", "1N5259B", "1N5260B", "1N5261B", "1N5262B", "1N5263B", "1N5264B", "1N5265B", "1N5266B", "1N5267B", "BZX55C2V4", "BZX55C2V7", "BZX55C3V0", "BZX55C3V3", "BZX55C3V6", "BZX55C3V9", "BZX55C4V3", "BZX55C4V7", "BZX55C5V1", "BZX55C5V6", "BZX55C6V2", "BZX55C6V8", "BZX55C7V5", "BZX55C8V2", "BZX55C9V1", "BZX55C10", "BZX55C11", "BZX55C12", "BZX55C13", "BZX55C15", "BZX55C16", "BZX55C18", "BZX55C20", "BZX55C22", "BZX55C24", "BZX55C27", "BZX55C30", "BZX55C33", "BZX55C36", "BZX55C39", "BZX55C43", "BZX55C47", "BZX55C51", "BZX55C56", "BZX55C62", "BZX55C68", "BZX55C75", "BZX79C2V4", "BZX79C2V7", "BZX79C3V0", "BZX79C3V3", "BZX79C3V6", "BZX79C3V9", "BZX79C4V3", "BZX79C4V7", "BZX79C5V1", "BZX79C5V6", "BZX79C6V2", "BZX79C6V8", "BZX79C7V5", "BZX79C8V2", "BZX79C9V1", "BZX79C10", "BZX79C11", "BZX79C12", "BZX79C13", "BZX79C15", "BZX79C16", "BZX79C18", "BZX79C20", "BZX79C22", "BZX79C24", "BZX79C27", "BZX79C30", "BZX79C33", "BZX79C36", "BZX79C39", "BZX79C43", "BZX79C47", "BZX79C51", "BZX79C56", "BZX79C62", "BZX79C68", "BZX79C75", "BZX85C3V3", "BZX85C3V6", "BZX85C3V9", "BZX85C4V3", "BZX85C4V7", "BZX85C5V1", "BZX85C5V6", "BZX85C6V2", "BZX85C6V8", "BZX85C7V5", "BZX85C8V2", "BZX85C9V1", "BZX85C10", "BZX85C11", "BZX85C12", "BZX85C13", "BZX85C15", "BZX85C16", "BZX85C18", "BZX85C20", "BZX85C22", "BZX85C24", "BZX85C27", "BZX85C30", "BZX85C33", "BZX85C36", "BZX85C39", "BZX85C43", "BZX85C47", "BZX85C51", "BZX85C56", "BZX85C62", "BZX85C68", "BZX85C75" ],
+ "datasheetModels" : [ "BYV26C", "BYV26E", "1N270", "1N34A", "1N60", "1N60P", "AA119", "AA143", "OA47", "OA90", "OA91", "OA95", "1N5711", "BAT41", "BAT42", "BAT43", "BAT46", "BAT48", "BAT85", "BAT86", "1N3600", "1N4148", "1N4151", "1N4448", "1N914", "1N916", "1S1588", "1S2473", "1SS133", "BA221", "BAV21", "MA150", "MA856", "1N4728A", "1N4729A", "1N4730A", "1N4731A", "1N4732A", "1N4733A", "1N4734A", "1N4735A", "1N4736A", "1N4737A", "1N4738A", "1N4739A", "1N4740A", "1N4741A", "1N4742A", "1N4743A", "1N4744A", "1N4745A", "1N4746A", "1N4747A", "1N4748A", "1N4749A", "1N4750A", "1N4751A", "1N4752A", "1N4753A", "1N4754A", "1N4755A", "1N4756A", "1N4757A", "1N4758A", "1N4759A", "1N4760A", "1N4761A", "1N4762A", "1N4763A", "1N4764A", "1N5221B", "1N5222B", "1N5223B", "1N5224B", "1N5225B", "1N5226B", "1N5227B", "1N5228B", "1N5229B", "1N5230B", "1N5231B", "1N5232B", "1N5233B", "1N5234B", "1N5235B", "1N5236B", "1N5237B", "1N5238B", "1N5239B", "1N5240B", "1N5241B", "1N5242B", "1N5243B", "1N5244B", "1N5245B", "1N5246B", "1N5247B", "1N5248B", "1N5249B", "1N5250B", "1N5251B", "1N5252B", "1N5253B", "1N5254B", "1N5255B", "1N5256B", "1N5257B", "1N5258B", "1N5259B", "1N5260B", "1N5261B", "1N5262B", "1N5263B", "1N5264B", "1N5265B", "1N5266B", "1N5267B", "1N746A", "1N747A", "1N748A", "1N749A", "1N750A", "1N751A", "1N752A", "1N753A", "1N754A", "1N755A", "1N756A", "1N757A", "1N758A", "1N759A", "BZX55C10", "BZX55C11", "BZX55C12", "BZX55C13", "BZX55C15", "BZX55C16", "BZX55C18", "BZX55C20", "BZX55C22", "BZX55C24", "BZX55C27", "BZX55C2V4", "BZX55C2V7", "BZX55C30", "BZX55C33", "BZX55C36", "BZX55C39", "BZX55C3V0", "BZX55C3V3", "BZX55C3V6", "BZX55C3V9", "BZX55C43", "BZX55C47", "BZX55C4V3", "BZX55C4V7", "BZX55C51", "BZX55C56", "BZX55C5V1", "BZX55C5V6", "BZX55C62", "BZX55C68", "BZX55C6V2", "BZX55C6V8", "BZX55C75", "BZX55C7V5", "BZX55C8V2", "BZX55C9V1", "BZX79C10", "BZX79C11", "BZX79C12", "BZX79C13", "BZX79C15", "BZX79C16", "BZX79C18", "BZX79C20", "BZX79C22", "BZX79C24", "BZX79C27", "BZX79C2V4", "BZX79C2V7", "BZX79C30", "BZX79C33", "BZX79C36", "BZX79C39", "BZX79C3V0", "BZX79C3V3", "BZX79C3V6", "BZX79C3V9", "BZX79C43", "BZX79C47", "BZX79C4V3", "BZX79C4V7", "BZX79C51", "BZX79C56", "BZX79C5V1", "BZX79C5V6", "BZX79C62", "BZX79C68", "BZX79C6V2", "BZX79C6V8", "BZX79C75", "BZX79C7V5", "BZX79C8V2", "BZX79C9V1", "BZX85C10", "BZX85C11", "BZX85C12", "BZX85C13", "BZX85C15", "BZX85C16", "BZX85C18", "BZX85C20", "BZX85C22", "BZX85C24", "BZX85C27", "BZX85C30", "BZX85C33", "BZX85C36", "BZX85C39", "BZX85C3V3", "BZX85C3V6", "BZX85C3V9", "BZX85C43", "BZX85C47", "BZX85C4V3", "BZX85C4V7", "BZX85C51", "BZX85C56", "BZX85C5V1", "BZX85C5V6", "BZX85C62", "BZX85C68", "BZX85C6V2", "BZX85C6V8", "BZX85C75", "BZX85C7V5", "BZX85C8V2", "BZX85C9V1" ],
"properties" : [ {
"name" : "Alpha",
"type" : "Percentage",
@@ -16921,7 +16921,7 @@
"description" : "Plastic diode, like most rectifier, zener, schottky, etc.",
"creationMethod" : "POINT_BY_POINT",
"notes" : [ "The two control points are the holes the leads go into and the body is centred between them; 'Length' is the body length, not the hole spacing", "If the control points are closer together than 'Length' (0.25in by default) the part is drawn standing, its body over the first point; to keep it lying on a tighter footprint, reduce 'Length'", "A datasheet model is a part number such as 1N4007, 1N5819 or UF4007 and sets 'Value', 'Length', 'Width' and the body colours to match its package; set 'Value' to the same part number together with the model" ],
- "datasheetModels" : [ "1N4933", "1N4934", "1N4935", "1N4936", "1N4937", "BA157", "BA158", "BA159", "BY399", "FR101", "FR102", "FR103", "FR104", "FR105", "FR106", "FR107", "HER101", "HER102", "HER103", "HER104", "HER105", "HER106", "HER107", "HER108", "MUR120", "MUR160", "MUR460", "UF4001", "UF4002", "UF4003", "UF4004", "UF4005", "UF4006", "UF4007", "UF5400", "UF5401", "UF5402", "UF5404", "UF5406", "UF5407", "UF5408", "1N4001", "1N4002", "1N4003", "1N4004", "1N4005", "1N4006", "1N4007", "1N5391", "1N5392", "1N5393", "1N5394", "1N5395", "1N5396", "1N5397", "1N5398", "1N5399", "1N5400", "1N5401", "1N5402", "1N5404", "1N5406", "1N5407", "1N5408", "6A10", "BY255", "1N5817", "1N5818", "1N5819", "1N5820", "1N5821", "1N5822", "11DQ04", "SB140", "SB160", "SB560", "SR160" ],
+ "datasheetModels" : [ "1N4933", "1N4934", "1N4935", "1N4936", "1N4937", "BA157", "BA158", "BA159", "BY399", "FR101", "FR102", "FR103", "FR104", "FR105", "FR106", "FR107", "HER101", "HER102", "HER103", "HER104", "HER105", "HER106", "HER107", "HER108", "MUR120", "MUR160", "MUR460", "UF4001", "UF4002", "UF4003", "UF4004", "UF4005", "UF4006", "UF4007", "UF5400", "UF5401", "UF5402", "UF5404", "UF5406", "UF5407", "UF5408", "1N4001", "1N4002", "1N4003", "1N4004", "1N4005", "1N4006", "1N4007", "1N5391", "1N5392", "1N5393", "1N5394", "1N5395", "1N5396", "1N5397", "1N5398", "1N5399", "1N5400", "1N5401", "1N5402", "1N5404", "1N5406", "1N5407", "1N5408", "6A10", "BY255", "11DQ04", "1N5817", "1N5818", "1N5819", "1N5820", "1N5821", "1N5822", "SB140", "SB160", "SB560", "SR160" ],
"properties" : [ {
"name" : "Alpha",
"type" : "Percentage",
@@ -19663,7 +19663,7 @@
"description" : "Sub-miniature (pencil) vacuum tube",
"creationMethod" : "SINGLE_CLICK",
"notes" : [ "The tube is drawn as seen from above, from the component side of the board. Leads are numbered as in the data book, lead 1 first. In the circular arrangement standing upright, the first control point is the body centre and the leads follow it counter-clockwise from the gap in the circle - the mirror of the data book's bottom view; there the top lead, if any, is the centre point. In-line and folded tubes have lead 1 at the first control point, and the top lead is the last control point", "'Pin Names' is a comma-separated list of lead names in lead order with the top lead last: P plate, G triode grid, G1/G2/G3 grids, K cathode, IS internal shield, F or H plus the lead number for filament or heater ends; sections of a multi-section tube are numbered first (1P, 2G); leads joined inside end in _1, _2; NC and IC leads are never connected. 'Pin Labels' draws the names (default), the lead numbers or nothing", "A datasheet model is a tube type such as 6021 or 6N16B and sets 'Pin Arrangement', 'Top Lead', 'Lead Count', 'Diameter', 'Thickness', 'Length', 'Pin Names' and 'Value'; 'Diameter' is the broad side of a flat bulb, the width seen when the tube lies folded. Set 'Value' to the same tube type together with the model" ],
- "datasheetModels" : [ "6D6A", "6N16B", "6N17B", "6N21B", "6021", "6111", "6112", "5896", "1Zh18B", "1Zh24B", "1Zh29B", "5886", "6Zh1B", "6Zh2B", "5636", "5678", "5840", "5899", "6205", "6206", "1P24B", "6P30B", "5672", "5902", "6088", "6S6B", "6S7B", "6S31B", "6S32B", "5703", "5718", "5719", "5744", "5977", "6814" ],
+ "datasheetModels" : [ "6D6A", "6021", "6111", "6112", "6N16B", "6N17B", "6N21B", "5896", "1Zh18B", "1Zh24B", "1Zh29B", "5886", "5636", "5678", "5840", "5899", "6205", "6206", "6Zh1B", "6Zh2B", "1P24B", "5672", "5902", "6088", "6P30B", "5703", "5718", "5719", "5744", "5977", "6814", "6S31B", "6S32B", "6S6B", "6S7B" ],
"properties" : [ {
"name" : "Alpha",
"type" : "Percentage",
@@ -19919,8 +19919,8 @@
"namePrefix" : "V",
"description" : "Various types of tube/valve sockets",
"creationMethod" : "SINGLE_CLICK",
- "notes" : [ "The first control point is the socket centre, not a pin. Pins sit on a circle and are numbered clockwise, starting after the gap (B9A, B7G, B12C) or the key (OCTAL), which points right at 'Angle' 0; 'Angle' rotates the socket clockwise in degrees. This is the bottom view used for wiring", "'Pin Names' is a comma-separated list of electrode names in pin order starting at pin 1: P plate, G triode grid, G1/G2/G3 control, screen and suppressor grids, K cathode, BP beam plates, IS internal shield, HCT heater centre tap. Sections of a multi-section tube are numbered first (1P, 1G, 2P); heater ends are named after their pin (H4, H5) because they are separate nets; pins joined inside the tube end in _1, _2; NC and IC pins are never connected. 'Pin Labels' draws the names (default), the pin numbers or nothing", "A datasheet model is a tube type such as 12AX7 or EL34 and sets 'Base', 'Pin Names' and 'Designation'. Set 'Designation' to the same tube type together with the model" ],
- "datasheetModels" : [ "6AQ5", "6AS5", "6BF5", "6BW6", "6CM6", "6CU5", "6CZ5", "6EM5", "6L6", "6L6GC", "6P1P", "6P3S", "6P3S-E", "6P6S", "6P27S", "6V6", "6V6GT", "6Y6G", "12AB5", "35C5", "50B5", "50C5", "50L6GT", "5881", "6550", "6973", "7581A", "KT66", "KT88", "KT120", "KT150", "6BE6", "6SA7", "12BE6", "12SA7", "ECH81", "ECH83", "UCH81", "EBF89", "UBF89", "6AT6", "6AV6", "6SQ7", "12AT6", "12AV6", "12SQ7", "EABC80", "6AS7", "6BL7", "6BX7", "6CG7", "6DJ8", "6FQ7", "6H30P", "6N1P", "6N1P-EV", "6N2P", "6N2P-EV", "6N3P", "6N5S", "6N6P", "6N8S", "6N9S", "6N13S", "6N23P", "6N23P-EV", "6N24P", "6SL7", "6SN7", "12AT7", "12AU7", "12AX7", "12AY7", "12AZ7", "12BH7", "12DW7", "5687", "5751", "5965", "6072", "6080", "6922", "7025", "7308", "E88CC", "ECC81", "ECC82", "ECC83", "ECC85", "ECC88", "ECC99", "6AK5", "6AU6", "6BA6", "6SJ7", "6Zh1P", "6Zh32P", "5879", "6267", "EF80", "EF86", "EF184", "6BD6", "6SG7", "6SK7", "12BA6", "12SK7", "EF85", "6AK6", "6AM5", "6AR5", "6BQ5", "6CA7", "6CL6", "6CW5", "6DL5", "6EH5", "6F6G", "6K6GT", "6P14P", "6P14P-EV", "6P15P", "6P18P", "7189", "7189A", "7591", "EL34", "EL84", "EL86", "EL91", "EL95", "6S4S", "6S19P", "5AR4", "5C3S", "5C4S", "5U4GB", "5V4G", "5Y3GT", "6AX5GT", "6C4P", "6CA4", "6X4", "6X5", "6X5GT", "35W4", "35Z5GT", "EZ80", "EZ81", "GZ32", "GZ34", "12AC6", "12AD6", "12AE6", "12AF6", "12BL6", "12CX6", "12DL8", "12DS7", "12DZ6", "12EG6", "12EK6", "12EL6", "12EM6", "12FK6", "12FM6", "12FX8", "12J8", "12K5", "6C5", "6J5", "6S45P", "12B4A", "6BM8", "6GW8", "ECL82", "ECL86", "UCL82", "6AF6", "1629", "EM80", "EM81", "EM84", "0A2", "0A3", "0B2", "0C3", "0D3" ],
+ "notes" : [ "The first control point is the socket centre, not a pin. Pins sit on a circle and are numbered clockwise, starting after the gap (B9A, B7G, B12C), the key (OCTAL) or the pair of thick filament pins (UX4), which points right at 'Angle' 0; 'Angle' rotates the socket clockwise in degrees. This is the bottom view used for wiring", "'Pin Names' is a comma-separated list of electrode names in pin order starting at pin 1: P plate, G triode grid, G1/G2/G3 control, screen and suppressor grids, K cathode, BP beam plates, IS internal shield, HCT heater centre tap. Sections of a multi-section tube are numbered first (1P, 1G, 2P); heater ends are named after their pin (H4, H5) because they are separate nets; pins joined inside the tube end in _1, _2; NC and IC pins are never connected. 'Pin Labels' draws the names (default), the pin numbers or nothing", "A datasheet model is a tube type such as 12AX7 or EL34 and sets 'Base', 'Pin Names' and 'Designation'. Set 'Designation' to the same tube type together with the model" ],
+ "datasheetModels" : [ "12AB5", "35C5", "50B5", "50C5", "50L6GT", "5881", "6550", "6973", "6AQ5", "6AS5", "6BF5", "6BW6", "6CM6", "6CU5", "6CZ5", "6EM5", "6L6", "6L6GC", "6P1P", "6P27S", "6P3S", "6P3S-E", "6P6S", "6V6", "6V6GT", "6Y6G", "7581A", "KT120", "KT150", "KT66", "KT88", "12BE6", "12SA7", "6BE6", "6SA7", "ECH81", "ECH83", "UCH81", "EBF89", "UBF89", "12AT6", "12AV6", "12SQ7", "6AT6", "6AV6", "6SQ7", "EABC80", "12AT7", "12AU7", "12AX7", "12AY7", "12AZ7", "12BH7", "12DW7", "5687", "5751", "5965", "6072", "6080", "6922", "6AS7", "6BL7", "6BX7", "6CG7", "6DJ8", "6FQ7", "6H30P", "6N13S", "6N1P", "6N1P-EV", "6N23P", "6N23P-EV", "6N24P", "6N2P", "6N2P-EV", "6N3P", "6N5S", "6N6P", "6N8S", "6N9S", "6SL7", "6SN7", "7025", "7308", "E88CC", "ECC81", "ECC82", "ECC83", "ECC85", "ECC88", "ECC99", "5879", "6267", "6AK5", "6AU6", "6BA6", "6SJ7", "6Zh1P", "6Zh32P", "EF184", "EF80", "EF86", "12BA6", "12SK7", "6BD6", "6SG7", "6SK7", "EF85", "6AK6", "6AM5", "6AR5", "6BQ5", "6CA7", "6CL6", "6CW5", "6DL5", "6EH5", "6F6G", "6K6GT", "6P14P", "6P14P-EV", "6P15P", "6P18P", "7189", "7189A", "7591", "EL34", "EL84", "EL86", "EL91", "EL95", "2A3", "300B", "45", "6A3", "6S19P", "6S4S", "35W4", "35Z5GT", "5AR4", "5C3S", "5C4S", "5U4GB", "5V4G", "5Y3GT", "5Z3", "6AX5GT", "6C4P", "6CA4", "6X4", "6X5", "6X5GT", "EZ80", "EZ81", "GZ32", "GZ34", "12AC6", "12AD6", "12AE6", "12AF6", "12BL6", "12CX6", "12DL8", "12DS7", "12DZ6", "12EG6", "12EK6", "12EL6", "12EM6", "12FK6", "12FM6", "12FX8", "12J8", "12K5", "12B4A", "6C5", "6J5", "6S45P", "6BM8", "6GW8", "ECL82", "ECL86", "UCL82", "1629", "6AF6", "EM80", "EM81", "EM84", "0A2", "0A3", "0B2", "0C3", "0D3" ],
"properties" : [ {
"name" : "Alpha",
"type" : "Percentage",
@@ -19932,7 +19932,7 @@
}, {
"name" : "Base",
"type" : "Base",
- "possibleValues" : [ "B9A", "OCTAL", "B7G", "B12C" ],
+ "possibleValues" : [ "B9A", "OCTAL", "B7G", "B12C", "UX4" ],
"defaultValue" : "B9A"
}, {
"name" : "Color",
@@ -20095,6 +20095,23 @@
"i" : 12,
"label" : "12"
} ]
+ }, {
+ "when" : {
+ "Base" : "UX4"
+ },
+ "pins" : [ {
+ "i" : 1,
+ "label" : "1"
+ }, {
+ "i" : 2,
+ "label" : "2"
+ }, {
+ "i" : 3,
+ "label" : "3"
+ }, {
+ "i" : 4,
+ "label" : "4"
+ } ]
} ]
}
} ]
diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml
index ae74193e..ccb801f9 100644
--- a/diylc/diylc-core/src/main/resources/update.xml
+++ b/diylc/diylc-core/src/main/resources/update.xml
@@ -529,6 +529,10 @@
NEW_FEATURE
Added a datasheet to 'Tube Socket' - pick a tube by its type from the component's submenu to set its base and electrode labels at once - more than 180 preamp, power, rectifier, radio, space-charge and Soviet tubes; the AI Assistant can place these tubes by type too
+
+ IMPROVEMENT
+ Added the UX4 base to 'Tube Socket', with the 300B, 2A3, 6A3 and 45 triodes and the 5Z3 rectifier in its datasheet
+
NEW_FEATURE
Added datasheets to 'Diode (plastic)' and 'Diode (glass)' - pick a part by its number from the component's submenu to draw it at its real package size and colours - more than 300 rectifiers, Schottky, signal, germanium and zener diodes, including the Japanese clippers of classic overdrive pedals; the AI Assistant can place these parts by part number too
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/tube/TubeSocket.java b/diylc/diylc-library/src/main/java/org/diylc/components/tube/TubeSocket.java
index 6888763b..1ea34e75 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/tube/TubeSocket.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/tube/TubeSocket.java
@@ -59,7 +59,7 @@ import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
import org.diylc.utils.Constants;
-@AiNote("The first control point is the socket centre, not a pin. Pins sit on a circle and are numbered clockwise, starting after the gap (B9A, B7G, B12C) or the key (OCTAL), which points right at 'Angle' 0; 'Angle' rotates the socket clockwise in degrees. This is the bottom view used for wiring")
+@AiNote("The first control point is the socket centre, not a pin. Pins sit on a circle and are numbered clockwise, starting after the gap (B9A, B7G, B12C), the key (OCTAL) or the pair of thick filament pins (UX4), which points right at 'Angle' 0; 'Angle' rotates the socket clockwise in degrees. This is the bottom view used for wiring")
@AiNote("'Pin Names' is a comma-separated list of electrode names in pin order starting at pin 1: P plate, G triode grid, G1/G2/G3 control, screen and suppressor grids, K cathode, BP beam plates, IS internal shield, HCT heater centre tap. Sections of a multi-section tube are numbered first (1P, 1G, 2P); heater ends are named after their pin (H4, H5) because they are separate nets; pins joined inside the tube end in _1, _2; NC and IC pins are never connected. 'Pin Labels' draws the names (default), the pin numbers or nothing")
@AiNote("A datasheet model is a tube type such as 12AX7 or EL34 and sets 'Base', 'Pin Names' and 'Designation'. Set 'Designation' to the same tube type together with the model")
@ComponentDescriptor(name = "Tube Socket", author = "Branislav Stojkovic", category = "Tubes",
@@ -80,11 +80,13 @@ public class TubeSocket extends AbstractAngledComponent
private static final Size B12C_CUTOUT_DIAMETER = new Size(5.5d, SizeUnit.mm);
private static final Size B12C_PIN_SPACING_PCB = new Size(25d, SizeUnit.mm);
private static final Size B12C_PIN_SPACING_CHASSIS = new Size(22d, SizeUnit.mm);
+ private static final Size UX4_PIN_SPACING = new Size(16.3d, SizeUnit.mm);
private static final Size OCTAL_DIAMETER = new Size(25d, SizeUnit.mm);
private static final Size B9A_DIAMETER = new Size(3 / 4d, SizeUnit.in);
private static final Size B7G_DIAMETER = new Size(17d, SizeUnit.mm);
private static final Size B12C_DIAMETER = new Size(30d, SizeUnit.mm);
+ private static final Size UX4_DIAMETER = new Size(30d, SizeUnit.mm);
private static final long serialVersionUID = 1L;
@@ -188,6 +190,11 @@ public class TubeSocket extends AbstractAngledComponent
pinSpacing = getClosestOdd(getMount() == Mount.PCB ? B12C_PIN_SPACING_PCB.convertToPixels() : B12C_PIN_SPACING_CHASSIS.convertToPixels());
hasEmptySpace = true;
break;
+ case UX4:
+ pinCount = 4;
+ pinSpacing = getClosestOdd(UX4_PIN_SPACING.convertToPixels());
+ hasEmptySpace = false;
+ break;
default:
throw new RuntimeException("Unexpected base: " + base);
}
@@ -221,6 +228,9 @@ public class TubeSocket extends AbstractAngledComponent
case B12C:
bodyDiameter = getClosestOdd(B12C_DIAMETER.convertToPixels());
break;
+ case UX4:
+ bodyDiameter = getClosestOdd(UX4_DIAMETER.convertToPixels());
+ break;
default:
throw new RuntimeException("Unexpected base: " + base);
}
@@ -473,7 +483,7 @@ public class TubeSocket extends AbstractAngledComponent
}
public static enum Base {
- B9A("Noval B9A"), OCTAL("Octal"), B7G("Small-button B7G"), B12C("Duodecar B12C");
+ B9A("Noval B9A"), OCTAL("Octal"), B7G("Small-button B7G"), B12C("Duodecar B12C"), UX4("UX4");
String name;
diff --git a/diylc/diylc-library/src/main/resources/datasheets/DiodeGlass.datasheet b/diylc/diylc-library/src/main/resources/datasheets/DiodeGlass.datasheet
index bf830474..07d3c636 100644
--- a/diylc/diylc-library/src/main/resources/datasheets/DiodeGlass.datasheet
+++ b/diylc/diylc-library/src/main/resources/datasheets/DiodeGlass.datasheet
@@ -1,9 +1,9 @@
Fast Rectifier,BYV26C,SOD-57,4.2 mm,3.5 mm,#202020,#B0B0B0,#202020
Fast Rectifier,BYV26E,SOD-57,4.2 mm,3.5 mm,#202020,#B0B0B0,#202020
+Germanium,1N270,DO-7,6.7 mm,2.45 mm,#E8F2F2,#141414,#5E5E5E
Germanium,1N34A,DO-7,6.7 mm,2.45 mm,#E8F2F2,#141414,#5E5E5E
Germanium,1N60,DO-35,4 mm,1.8 mm,#E8F2F2,#141414,#5E5E5E
Germanium,1N60P,DO-35,4 mm,1.8 mm,#E8F2F2,#141414,#5E5E5E
-Germanium,1N270,DO-7,6.7 mm,2.45 mm,#E8F2F2,#141414,#5E5E5E
Germanium,AA119,DO-7,6.7 mm,2.45 mm,#E8F2F2,#141414,#5E5E5E
Germanium,AA143,DO-7,6.7 mm,2.45 mm,#E8F2F2,#141414,#5E5E5E
Germanium,OA47,DO-7,6.7 mm,2.45 mm,#E8F2F2,#141414,#5E5E5E
@@ -18,12 +18,12 @@ Schottky,BAT46,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Schottky,BAT48,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Schottky,BAT85,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Schottky,BAT86,DO-34,2.6 mm,1.6 mm,#E1F0FF,#141414,#D9652B
-Signal,1N914,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
-Signal,1N916,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,1N3600,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,1N4148,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,1N4151,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,1N4448,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
+Signal,1N914,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
+Signal,1N916,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,1S1588,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,1S2473,DO-35,4 mm,1.8 mm,#E1F0FF,#E8C547,#D9652B
Signal,1SS133,DO-34,2.6 mm,1.6 mm,#E1F0FF,#E8C547,#D9652B
@@ -31,20 +31,6 @@ Signal,BA221,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,BAV21,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#D9652B
Signal,MA150,DO-35,4 mm,1.8 mm,#E1F0FF,#F0F0F0,#D9652B
Signal,MA856,DO-34,2.6 mm,1.6 mm,#E1F0FF,#E8C547,#D9652B
-Zener (1N7xx),1N746A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N747A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N748A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N749A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N750A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N751A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N752A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N753A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N754A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N755A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N756A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N757A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N758A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (1N7xx),1N759A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (1N47xx),1N4728A,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (1N47xx),1N4729A,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (1N47xx),1N4730A,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
@@ -129,21 +115,20 @@ Zener (1N52xx),1N5264B,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (1N52xx),1N5265B,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (1N52xx),1N5266B,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (1N52xx),1N5267B,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C2V4,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C2V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C3V0,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C3V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C3V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C3V9,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C4V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C4V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C5V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C5V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C6V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C6V8,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C7V5,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C8V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX55),BZX55C9V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N746A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N747A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N748A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N749A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N750A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N751A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N752A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N753A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N754A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N755A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N756A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N757A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N758A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (1N7xx),1N759A,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C10,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C11,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C12,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
@@ -155,32 +140,32 @@ Zener (BZX55),BZX55C20,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C22,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C24,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C27,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C2V4,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C2V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C30,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C33,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C36,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C39,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C3V0,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C3V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C3V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C3V9,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C43,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C47,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C4V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C4V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C51,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C56,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C5V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C5V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C62,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C68,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C6V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C6V8,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX55),BZX55C75,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C2V4,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C2V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C3V0,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C3V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C3V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C3V9,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C4V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C4V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C5V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C5V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C6V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C6V8,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C7V5,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C8V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX79),BZX79C9V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C7V5,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C8V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX55),BZX55C9V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C10,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C11,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C12,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
@@ -192,29 +177,32 @@ Zener (BZX79),BZX79C20,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C22,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C24,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C27,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C2V4,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C2V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C30,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C33,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C36,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C39,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C3V0,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C3V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C3V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C3V9,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C43,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C47,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C4V3,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C4V7,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C51,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C56,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C5V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C5V6,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C62,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C68,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C6V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C6V8,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX79),BZX79C75,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C3V3,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C3V6,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C3V9,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C4V3,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C4V7,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C5V1,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C5V6,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C6V2,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C6V8,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C7V5,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C8V2,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
-Zener (BZX85),BZX85C9V1,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C7V5,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C8V2,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX79),BZX79C9V1,DO-35,4 mm,1.8 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C10,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C11,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C12,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
@@ -230,10 +218,22 @@ Zener (BZX85),BZX85C30,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C33,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C36,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C39,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C3V3,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C3V6,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C3V9,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C43,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C47,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C4V3,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C4V7,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C51,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C56,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C5V1,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C5V6,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C62,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C68,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C6V2,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C6V8,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
Zener (BZX85),BZX85C75,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C7V5,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C8V2,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
+Zener (BZX85),BZX85C9V1,DO-41,4.3 mm,2.4 mm,#E1F0FF,#141414,#E07A3A
diff --git a/diylc/diylc-library/src/main/resources/datasheets/DiodePlastic.datasheet b/diylc/diylc-library/src/main/resources/datasheets/DiodePlastic.datasheet
index 606b43f9..979cf72d 100644
--- a/diylc/diylc-library/src/main/resources/datasheets/DiodePlastic.datasheet
+++ b/diylc/diylc-library/src/main/resources/datasheets/DiodePlastic.datasheet
@@ -64,13 +64,13 @@ Rectifier,1N5407,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
Rectifier,1N5408,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
Rectifier,6A10,R-6,8.85 mm,8.85 mm,#1E1E1E,#BDBDBD
Rectifier,BY255,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
+Schottky,11DQ04,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,1N5817,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,1N5818,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,1N5819,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,1N5820,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
Schottky,1N5821,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
Schottky,1N5822,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
-Schottky,11DQ04,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,SB140,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,SB160,DO-41,4.6 mm,2.4 mm,#1E1E1E,#BDBDBD
Schottky,SB560,DO-201AD,8.5 mm,5.1 mm,#1E1E1E,#BDBDBD
diff --git a/diylc/diylc-library/src/main/resources/datasheets/SubminiTube.datasheet b/diylc/diylc-library/src/main/resources/datasheets/SubminiTube.datasheet
index c480669a..4f6700b1 100644
--- a/diylc/diylc-library/src/main/resources/datasheets/SubminiTube.datasheet
+++ b/diylc/diylc-library/src/main/resources/datasheets/SubminiTube.datasheet
@@ -1,35 +1,35 @@
Diode,6D6A,Inline,no,7.2 mm,7.2 mm,36 mm,P,H2,H3,K
-Dual Triode,6N16B,Circular,no,10.2 mm,10.2 mm,36 mm,2P,1K,1G,H4,1P,2K,2G,H8
-Dual Triode,6N17B,Circular,no,10.2 mm,10.2 mm,36 mm,2P,1K,1G,H4,1P,2K,2G,H8
-Dual Triode,6N21B,Circular,no,10.2 mm,10.2 mm,40 mm,1K,IS,1G,1P,H5,2K,NC,2G,2P,H10
Dual Triode,6021,Circular,no,0.4 in,0.4 in,1.375 in,2P,2G,H3,2K,1K,H6,1G,1P
Dual Triode,6111,Circular,no,0.4 in,0.4 in,1.375 in,2P,2G,H3,2K,1K,H6,1G,1P
Dual Triode,6112,Circular,no,0.4 in,0.4 in,1.375 in,2P,2G,H3,2K,1K,H6,1G,1P
+Dual Triode,6N16B,Circular,no,10.2 mm,10.2 mm,36 mm,2P,1K,1G,H4,1P,2K,2G,H8
+Dual Triode,6N17B,Circular,no,10.2 mm,10.2 mm,36 mm,2P,1K,1G,H4,1P,2K,2G,H8
+Dual Triode,6N21B,Circular,no,10.2 mm,10.2 mm,40 mm,1K,IS,1G,1P,H5,2K,NC,2G,2P,H10
Duo-Diode,5896,Circular,no,0.4 in,0.4 in,1.375 in,2P,2K,H3,IS,1P,H6,1K,NC
Pentode,1Zh18B,Circular,yes,8.5 mm,8.5 mm,42 mm,F1,F2,NC,NC,G2,G1,P
Pentode,1Zh24B,Circular,yes,8.5 mm,8.5 mm,42 mm,F1,F2,IS,G3,G2,G1,P
Pentode,1Zh29B,Circular,yes,8.5 mm,8.5 mm,40 mm,HCT,G3,G2,F4,IS,F6,G1,P
Pentode,5886,Inline,no,0.4 in,0.285 in,1.5 in,P,G2,F3,F4,NC,NC,G1
-Pentode (RF/IF),6Zh1B,Inline,no,10.2 mm,10.2 mm,36 mm,P,G2,H3,H4,G3,K,G1
-Pentode (RF/IF),6Zh2B,Inline,no,10.2 mm,10.2 mm,38 mm,P,G3,G2,H4,H5,K,G1
Pentode (RF/IF),5636,Circular,no,0.4 in,0.4 in,1.375 in,G1,K_1,H3,G3,P,H6,G2,K_2
Pentode (RF/IF),5678,Inline,no,0.4 in,0.285 in,1.5 in,P,G2,F3,G1,F5
Pentode (RF/IF),5840,Circular,no,0.4 in,0.4 in,1.375 in,G1,K_1,H3,K_2,P,H6,G2,K_3
Pentode (RF/IF),5899,Circular,no,0.4 in,0.4 in,1.375 in,G1,K_1,H3,K_2,P,H6,G2,K_3
Pentode (RF/IF),6205,Circular,no,0.4 in,0.4 in,1.375 in,G1,K_1,H3,G3,P,H6,G2,K_2
Pentode (RF/IF),6206,Circular,no,0.4 in,0.4 in,1.375 in,G1,K_1,H3,K_2,P,H6,G2,K_3
+Pentode (RF/IF),6Zh1B,Inline,no,10.2 mm,10.2 mm,36 mm,P,G2,H3,H4,G3,K,G1
+Pentode (RF/IF),6Zh2B,Inline,no,10.2 mm,10.2 mm,38 mm,P,G3,G2,H4,H5,K,G1
Power Pentode,1P24B,Circular,yes,10.5 mm,10.5 mm,45 mm,HCT,F2,G2,IS,NC,F6,G3,NC,G1,P
-Power Pentode,6P30B,Circular,no,10.8 mm,10.8 mm,48 mm,K,H2,G2,P,NC,H6,G1,G3
Power Pentode,5672,Inline,no,0.385 in,0.285 in,1.5 in,P,G2,F3,G1,F5
Power Pentode,5902,Circular,no,0.4 in,0.4 in,1.75 in,G1,K_1,H3,K_2,P,H6,G2,K_3
Power Pentode,6088,Inline,no,0.385 in,0.285 in,1.5 in,P,G2,F3,G1,F5
-Triode,6S6B,Inline,no,10.2 mm,10.2 mm,36 mm,P,H2,H3,G,K
-Triode,6S7B,Inline,no,10.2 mm,10.2 mm,36 mm,P,H2,H3,G,K
-Triode,6S31B,Circular,no,10.2 mm,10.2 mm,39 mm,K,H2,NC,NC,P,NC,H7,G,NC,NC
-Triode,6S32B,Circular,no,10.2 mm,10.2 mm,30 mm,K,NC,G,NC,H5,NC,P,NC,NC,H10
+Power Pentode,6P30B,Circular,no,10.8 mm,10.8 mm,48 mm,K,H2,G2,P,NC,H6,G1,G3
Triode,5703,Inline,no,0.4 in,0.4 in,1.5 in,P,NC,H3,H4,G,K
Triode,5718,Circular,no,0.4 in,0.4 in,1.375 in,G,NC,H3,NC,K,H6,NC,P
Triode,5719,Circular,no,0.4 in,0.4 in,1.375 in,G,NC,H3,NC,K,H6,NC,P
Triode,5744,Inline,no,0.4 in,0.4 in,1.5 in,P,H2,H3,G,K
Triode,5977,Circular,no,0.4 in,0.4 in,1.375 in,G,NC,H3,NC,K,H6,NC,P
Triode,6814,Circular,no,0.4 in,0.4 in,1.375 in,G,NC,H3,NC,K,H6,NC,P
+Triode,6S31B,Circular,no,10.2 mm,10.2 mm,39 mm,K,H2,NC,NC,P,NC,H7,G,NC,NC
+Triode,6S32B,Circular,no,10.2 mm,10.2 mm,30 mm,K,NC,G,NC,H5,NC,P,NC,NC,H10
+Triode,6S6B,Inline,no,10.2 mm,10.2 mm,36 mm,P,H2,H3,G,K
+Triode,6S7B,Inline,no,10.2 mm,10.2 mm,36 mm,P,H2,H3,G,K
diff --git a/diylc/diylc-library/src/main/resources/datasheets/TubeSocket.datasheet b/diylc/diylc-library/src/main/resources/datasheets/TubeSocket.datasheet
index 37967058..9c817b9c 100644
--- a/diylc/diylc-library/src/main/resources/datasheets/TubeSocket.datasheet
+++ b/diylc/diylc-library/src/main/resources/datasheets/TubeSocket.datasheet
@@ -1,3 +1,11 @@
+Beam Tetrode,12AB5,B9A,9EU,G2_1,NC,G1_1,H4,H5,G1_2,K,G2_2,P
+Beam Tetrode,35C5,B7G,7CV,K,G1_1,H3,H4,G1_2,G2,P
+Beam Tetrode,50B5,B7G,7BZ,G1_1,K,H3,H4,P,G2,G1_2
+Beam Tetrode,50C5,B7G,7CV,K,G1_1,H3,H4,G1_2,G2,P
+Beam Tetrode,50L6GT,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
+Beam Tetrode,5881,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
+Beam Tetrode,6550,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
+Beam Tetrode,6973,B9A,9EU,G2_1,NC,G1_1,H4,H5,G1_2,K,G2_2,P
Beam Tetrode,6AQ5,B7G,7BZ,G1_1,K,H3,H4,P,G2,G1_2
Beam Tetrode,6AS5,B7G,7CV,K,G1_1,H3,H4,G1_2,G2,P
Beam Tetrode,6BF5,B7G,7BZ,G1_1,K,H3,H4,P,G2,G1_2
@@ -9,64 +17,34 @@ Beam Tetrode,6EM5,B9A,9HN,G2,NC,G1_1,H4,H5,G1_2,K,IC,P
Beam Tetrode,6L6,OCTAL,7AC,SH,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6L6GC,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6P1P,B9A,-,P_1,G2_1,K_1,H4,H5,P_2,G1,K_2,G2_2
+Beam Tetrode,6P27S,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6P3S,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6P3S-E,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6P6S,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,6P27S,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6V6,OCTAL,7AC,SH,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6V6GT,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,6Y6G,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,12AB5,B9A,9EU,G2_1,NC,G1_1,H4,H5,G1_2,K,G2_2,P
-Beam Tetrode,35C5,B7G,7CV,K,G1_1,H3,H4,G1_2,G2,P
-Beam Tetrode,50B5,B7G,7BZ,G1_1,K,H3,H4,P,G2,G1_2
-Beam Tetrode,50C5,B7G,7CV,K,G1_1,H3,H4,G1_2,G2,P
-Beam Tetrode,50L6GT,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,5881,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,6550,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,6973,B9A,9EU,G2_1,NC,G1_1,H4,H5,G1_2,K,G2_2,P
Beam Tetrode,7581A,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,KT66,OCTAL,7AC,IC,H2,P,G2,G1,NC,H7,K
-Beam Tetrode,KT88,OCTAL,7AC,SH,H2,P,G2,G1,NC,H7,K
Beam Tetrode,KT120,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
Beam Tetrode,KT150,OCTAL,7AC,NC,H2,P,G2,G1,NC,H7,K
-Converter,6BE6,B7G,7CH,G1,K,H3,H4,P,G2,G3
-Converter,6SA7,OCTAL,8R,G5,H2,P,G2,G1,K,H7,G3
+Beam Tetrode,KT66,OCTAL,7AC,IC,H2,P,G2,G1,NC,H7,K
+Beam Tetrode,KT88,OCTAL,7AC,SH,H2,P,G2,G1,NC,H7,K
Converter,12BE6,B7G,7CH,G1,K,H3,H4,P,G2,G3
Converter,12SA7,OCTAL,8R,G5,H2,P,G2,G1,K,H7,G3
+Converter,6BE6,B7G,7CH,G1,K,H3,H4,P,G2,G3
+Converter,6SA7,OCTAL,8R,G5,H2,P,G2,G1,K,H7,G3
Converter,ECH81,B9A,9CA,HG2,HG1,K,H4,H5,HP,HG3,TP,TG
Converter,ECH83,B9A,9CA,HG2,HG1,K,H4,H5,HP,HG3,TP,TG
Converter,UCH81,B9A,9CA,HG2,HG1,K,H4,H5,HP,HG3,TP,TG
Diode-Pentode,EBF89,B9A,9HE,PG2,PG1,K,H4,H5,PP,1D,2D,PG3
Diode-Pentode,UBF89,B9A,9HE,PG2,PG1,K,H4,H5,PP,1D,2D,PG3
-Diode-Triode,6AT6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
-Diode-Triode,6AV6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
-Diode-Triode,6SQ7,OCTAL,8Q,SH,TG,K,2D,1D,TP,H7,H8
Diode-Triode,12AT6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
Diode-Triode,12AV6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
Diode-Triode,12SQ7,OCTAL,8Q,SH,TG,K,2D,1D,TP,H7,H8
+Diode-Triode,6AT6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
+Diode-Triode,6AV6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
+Diode-Triode,6SQ7,OCTAL,8Q,SH,TG,K,2D,1D,TP,H7,H8
Diode-Triode,EABC80,B9A,9E,3D,2D,2DK,H4,H5,1D,K,TG,TP
-Dual Triode,6AS7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6BL7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6BX7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6CG7,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
-Dual Triode,6DJ8,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
-Dual Triode,6FQ7,B9A,9LP,2P,2G,2K,H4,H5,1P,1G,1K,NC
-Dual Triode,6H30P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
-Dual Triode,6N1P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
-Dual Triode,6N1P-EV,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
-Dual Triode,6N2P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
-Dual Triode,6N2P-EV,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
-Dual Triode,6N3P,B9A,-,H1,1K,1G,1P,IS,2P,2G,2K,H9
-Dual Triode,6N5S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6N6P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
-Dual Triode,6N8S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6N9S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6N13S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6N23P,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
-Dual Triode,6N23P-EV,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
-Dual Triode,6N24P,B9A,-,2K,2G,2P,H4,H5,1G,1K_1,1K_2,1P
-Dual Triode,6SL7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
-Dual Triode,6SN7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
Dual Triode,12AT7,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
Dual Triode,12AU7,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
Dual Triode,12AX7,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
@@ -80,6 +58,28 @@ Dual Triode,5965,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
Dual Triode,6072,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
Dual Triode,6080,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
Dual Triode,6922,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
+Dual Triode,6AS7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6BL7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6BX7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6CG7,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
+Dual Triode,6DJ8,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
+Dual Triode,6FQ7,B9A,9LP,2P,2G,2K,H4,H5,1P,1G,1K,NC
+Dual Triode,6H30P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
+Dual Triode,6N13S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6N1P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
+Dual Triode,6N1P-EV,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
+Dual Triode,6N23P,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
+Dual Triode,6N23P-EV,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
+Dual Triode,6N24P,B9A,-,2K,2G,2P,H4,H5,1G,1K_1,1K_2,1P
+Dual Triode,6N2P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
+Dual Triode,6N2P-EV,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
+Dual Triode,6N3P,B9A,-,H1,1K,1G,1P,IS,2P,2G,2K,H9
+Dual Triode,6N5S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6N6P,B9A,-,1P,1G,1K,H4,H5,2P,2G,2K,IS
+Dual Triode,6N8S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6N9S,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6SL7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
+Dual Triode,6SN7,OCTAL,8BD,2G,2P,2K,1G,1P,1K,H7,H8
Dual Triode,7025,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
Dual Triode,7308,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
Dual Triode,E88CC,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
@@ -89,22 +89,22 @@ Dual Triode,ECC83,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
Dual Triode,ECC85,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
Dual Triode,ECC88,B9A,9AJ,2P,2G,2K,H4,H5,1P,1G,1K,IS
Dual Triode,ECC99,B9A,9A,2P,2G,2K,H4,H5,1P,1G,1K,HCT
+Pentode,5879,B9A,9AD,G1,NC,K,H4,H5,NC,G2,P,G3
+Pentode,6267,B9A,9CQ,G2,IS_1,K,H4,H5,P,IS_2,G3,G1
Pentode,6AK5,B7G,7BD,G1,K_1,H3,H4,P,G2,K_2
Pentode,6AU6,B7G,7BK,G1,G3,H3,H4,P,G2,K
Pentode,6BA6,B7G,7BK,G1,G3,H3,H4,P,G2,K
Pentode,6SJ7,OCTAL,8N,SH,H2,G3,G1,K,G2,H7,P
Pentode,6Zh1P,B7G,-,G1,K_1,H3,H4,P,G2,K_2
Pentode,6Zh32P,B9A,9CQ,G2,IS_1,K,H4,H5,P,IS_2,G3,G1
-Pentode,5879,B9A,9AD,G1,NC,K,H4,H5,NC,G2,P,G3
-Pentode,6267,B9A,9CQ,G2,IS_1,K,H4,H5,P,IS_2,G3,G1
+Pentode,EF184,B9A,9AQ,K_1,G1,K_2,H4,H5,IS,P,G2,G3
Pentode,EF80,B9A,9AQ,K_1,G1,K_2,H4,H5,IS,P,G2,G3
Pentode,EF86,B9A,9CQ,G2,IS_1,K,H4,H5,P,IS_2,G3,G1
-Pentode,EF184,B9A,9AQ,K_1,G1,K_2,H4,H5,IS,P,G2,G3
+Pentode (RF/IF),12BA6,B7G,7BK,G1,G3,H3,H4,P,G2,K
+Pentode (RF/IF),12SK7,OCTAL,8N,SH,H2,G3,G1,K,G2,H7,P
Pentode (RF/IF),6BD6,B7G,7BK,G1,G3,H3,H4,P,G2,K
Pentode (RF/IF),6SG7,OCTAL,8BK,SH,H2,K_1,G1,K_2,G2,H7,P
Pentode (RF/IF),6SK7,OCTAL,8N,SH,H2,G3,G1,K,G2,H7,P
-Pentode (RF/IF),12BA6,B7G,7BK,G1,G3,H3,H4,P,G2,K
-Pentode (RF/IF),12SK7,OCTAL,8N,SH,H2,G3,G1,K,G2,H7,P
Pentode (RF/IF),EF85,B9A,9AQ,K_1,G1,K_2,H4,H5,IS,P,G2,G3
Power Pentode,6AK6,B7G,7BK,G1,G3,H3,H4,P,G2,K
Power Pentode,6AM5,B7G,-,G1,K,H3,H4,P,NC,G2
@@ -129,22 +129,27 @@ Power Pentode,EL84,B9A,9CV,IC,G1,K,H4,H5,IC,P,IC,G2
Power Pentode,EL86,B9A,9CV,IC,G1,K,H4,H5,IC,P,IC,G2
Power Pentode,EL91,B7G,-,G1,K,H3,H4,P,NC,G2
Power Pentode,EL95,B7G,7DQ,G1_1,K,H3,H4,P,G2,G1_2
-Power Triode,6S4S,OCTAL,5S,NC,F2,P,NC,G,NC,F7,NC
+Power Triode,2A3,UX4,4D,F1,P,G,F4
+Power Triode,300B,UX4,4D,F1,P,G,F4
+Power Triode,45,UX4,4D,F1,P,G,F4
+Power Triode,6A3,UX4,4D,F1,P,G,F4
Power Triode,6S19P,B9A,-,P_1,G_1,P_2,H4,H5,P_3,G_2,P_4,K
+Power Triode,6S4S,OCTAL,5S,NC,F2,P,NC,G,NC,F7,NC
+Rectifier,35W4,B7G,5BQ,NC,NC,H3,H4,P,HT,K
+Rectifier,35Z5GT,OCTAL,6AD,NC,H2,HT,NC,P,NC,H7,K
Rectifier,5AR4,OCTAL,5L,IC,H2,NC,1P,NC,2P,NC,HK8
Rectifier,5C3S,OCTAL,5T,NC,F2,NC,2P,NC,1P,NC,F8
Rectifier,5C4S,OCTAL,5L,NC,H2,NC,1P,NC,2P,NC,HK8
Rectifier,5U4GB,OCTAL,5T,NC,F2,NC,2P,NC,1P,NC,F8
Rectifier,5V4G,OCTAL,5L,NC,H2,NC,1P,NC,2P,NC,HK8
Rectifier,5Y3GT,OCTAL,5T,NC,F2,NC,2P,NC,1P,NC,F8
+Rectifier,5Z3,UX4,4C,F1,2P,1P,F4
Rectifier,6AX5GT,OCTAL,6S,NC,H2,2P,NC,1P,NC,H7,K
Rectifier,6C4P,B7G,-,1P,NC,H3,H4,K,NC,2P
Rectifier,6CA4,B9A,9M,1P,NC,K,H4,H5,NC,2P,NC,NC
Rectifier,6X4,B7G,7CF,2P,NC,H3,H4,NC,1P,K
Rectifier,6X5,OCTAL,6S,SH,H2,2P,NC,1P,NC,H7,K
Rectifier,6X5GT,OCTAL,6S,NC,H2,2P,NC,1P,NC,H7,K
-Rectifier,35W4,B7G,5BQ,NC,NC,H3,H4,P,HT,K
-Rectifier,35Z5GT,OCTAL,6AD,NC,H2,HT,NC,P,NC,H7,K
Rectifier,EZ80,B9A,9M,1P,IC,K,H4,H5,IC,2P,IC,IC
Rectifier,EZ81,B9A,9M,1P,IC,K,H4,H5,IC,2P,IC,IC
Rectifier,GZ32,OCTAL,5L,NC,H2,NC,1P,NC,2P,NC,HK8
@@ -167,17 +172,17 @@ Space-Charge,12FM6,B7G,7BT,TG,K,H3,H4,2D,1D,TP
Space-Charge,12FX8,B9A,9KV,HG2,HG1,HP,H4,H5,TG,HK,TP,HG3
Space-Charge,12J8,B9A,9GC,G1,K,G2,H4,H5,P,DK,2D,1D
Space-Charge,12K5,B7G,7FD,K,G2,H3,H4,G1_1,G1_2,P
+Triode,12B4A,B9A,9AG,K,G_1,HCT,H4,H5,NC,G_2,NC,P
Triode,6C5,OCTAL,6Q,SH,H2,P,NC,G,NC,H7,K
Triode,6J5,OCTAL,6Q,SH,H2,P,NC,G,NC,H7,K
Triode,6S45P,B9A,-,K_1,G_1,K_2,H4,H5,K_3,P,G_2,K_4
-Triode,12B4A,B9A,9AG,K,G_1,HCT,H4,H5,NC,G_2,NC,P
Triode-Pentode,6BM8,B9A,9EX,TG,PK,PG1,H4,H5,PP,PG2,TK,TP
Triode-Pentode,6GW8,B9A,9LZ,TG,TK,PG2,H4,H5,PP,PK,PG1,TP
Triode-Pentode,ECL82,B9A,9EX,TG,PK,PG1,H4,H5,PP,PG2,TK,TP
Triode-Pentode,ECL86,B9A,9LZ,TG,TK,PG2,H4,H5,PP,PK,PG1,TP
Triode-Pentode,UCL82,B9A,9EX,TG,PK,PG1,H4,H5,PP,PG2,TK,TP
-Tuning Indicator,6AF6,OCTAL,7AG,NC,H2,2RC,1RC,TA,NC,H7,K
Tuning Indicator,1629,OCTAL,7AL,NC,H2,P,TA,G,NC,H7,K
+Tuning Indicator,6AF6,OCTAL,7AG,NC,H2,2RC,1RC,TA,NC,H7,K
Tuning Indicator,EM80,B9A,9DB,G,K,IC,H4,H5,IC,P,IC,TA
Tuning Indicator,EM81,B9A,9DB,G,K,IC,H4,H5,IC,P,IC,TA
Tuning Indicator,EM84,B9A,9GA,G,IC,K,H4,H5,TA,DE,IC,P
diff --git a/diylc/diylc-library/src/test/java/org/diylc/components/tube/TubeSocketTest.java b/diylc/diylc-library/src/test/java/org/diylc/components/tube/TubeSocketTest.java
index 09640d03..491d138c 100644
--- a/diylc/diylc-library/src/test/java/org/diylc/components/tube/TubeSocketTest.java
+++ b/diylc/diylc-library/src/test/java/org/diylc/components/tube/TubeSocketTest.java
@@ -50,6 +50,20 @@ public class TubeSocketTest {
Assert.assertEquals("K", socket.getControlPointNodeName(8));
}
+ /** The thick filament pins 1 and 4 straddle the direction the other bases put their key. */
+ @Test
+ public void ux4FilamentPinsFaceTheKeyDirection() {
+ TubeSocket socket = new TubeSocket();
+ socket.setBase(Base.UX4);
+
+ Assert.assertEquals(5, socket.getControlPointCount());
+ double centerX = socket.getControlPoint(0).getX();
+ Assert.assertTrue(socket.getControlPoint(1).getX() > centerX);
+ Assert.assertTrue(socket.getControlPoint(2).getX() < centerX);
+ Assert.assertTrue(socket.getControlPoint(3).getX() < centerX);
+ Assert.assertTrue(socket.getControlPoint(4).getX() > centerX);
+ }
+
/** Files saved before the option existed always drew the names, and still do. */
@Test
public void socketWithoutTheOptionShowsNames() throws Exception {
diff --git a/diylc/docs/plans/tube-socket-datasheets.md b/diylc/docs/plans/tube-socket-datasheets.md
index d45b3f2f..cd7d9a53 100644
--- a/diylc/docs/plans/tube-socket-datasheets.md
+++ b/diylc/docs/plans/tube-socket-datasheets.md
@@ -51,8 +51,8 @@ joined against 9, and that choice is made by the wiring, not the tube.
### Explicitly out of scope
-- `Jumbo4PinTubeSocket` (fixed `G,F1,P,F2` for 211/805/845) and the UX4 base of 300B, 2A3 and 45:
- a 4-pin base is not a `TubeSocket.Base`. Candidate for a second phase.
+- `Jumbo4PinTubeSocket` (fixed `G,F1,P,F2` for 211/805/845): a separate class with its own
+ ceramic body and terminals. The UX4 base of 300B and 2A3 was added later (ยง7, phase 5).
- Magnoval (B9D: EL509, PL519), loctal and the B12C compactrons: no datasheet rows until a user
asks; B12C exists as a base but few DIY tubes use it.
- `SubminiTube` and the tube schematic symbols.
@@ -213,4 +213,11 @@ where the basing is confirmed identical (the 6L6 family is not uniformly 7AC, an
(datasheet, and the shorted-variant fix).
4. **Pin labels**: done - V13 ("Pin Names"), V14 ("Pin Labels"), factory presets re-keyed,
`TubeSocketTest` covers the old-file default; rendered in all three modes.
-5. **Later, on request**: the UX4/jumbo 4-pin bases (300B, 2A3, 211, 845), magnoval.
+5. **UX4**: done - `Base.UX4`, four pins 90 degrees apart on a 16.3 mm pin circle (Radiomuseum base
+ table; pins 1 and 4 are 4.0 mm, 2 and 3 are 3.2 mm), drawn on a 30 mm body like the octal. Pin 1
+ follows the convention of the other bases: the gap between the thick filament pins 1 and 4
+ points right at 'Angle' 0, numbered clockwise in the bottom view. Rows for 2A3 and 45 (RCA,
+ basing 4D), 6A3 (Tung-Sol, 4D) and 300B (JJ; same layout as 4D), named `F1,P,G,F4` per V6, and
+ the 5Z3 rectifier (RCA 4C: plate 2 on pin 2, plate 1 on pin 3; Tung-Sol agrees but does not
+ number the plates), `F1,2P,1P,F4`. The 50 and 80 are also UX4 and left out until a sheet is read.
+6. **Later, on request**: the jumbo 4-pin base (211, 845) in the datasheet, magnoval.