Differences

This shows you the differences between two versions of the page.

--- tools_and_documentation [2023/05/31 20:35] – [Laser Cutters] haley
+++ tools_and_documentation [2023/11/15 00:33] (current) – [3D Printers] haley
@@ Line 1: / Line 1: @@
-===== Tools That Require Training =====
+====== Tools and Documentation ======
+===== Tools That Require Training =====
-=== 3D Printers ===
+==== 3D Printers ====
 <datatables page-length="75">
 ^ Tool ^ Location ^ Training SOP ^
-|[[form2|FormLabs Form 2/3 SLA 3D Printer]]|IW 2448|[[form2sop|Form 2/3 SOP]] |
+|[[form3|FormLabs Form3 SLA 3D Printer]]|IW 2448|[[form2sop|Form 2/3 SOP]] |
 |[[ultimaker3_extended|Ultimaker3/S5 Extended Dual FDM 3D Printer]]|IW 2448| [[ultimaker_3_sop|FDM Training]] |
-|[[stratasys_f270|Stratsys F270 FDM 3D Printer]]|IW 2442|[[ultimaker_3_sop|FDM Training]] |
+|[[stratasys_f270|Stratasys F270 FDM 3D Printer]]|IW 2442|[[ultimaker_3_sop|FDM Training]] |
 |[[objet30pro|Stratasys Objet30 Pro Polyjet 3D Printer]]|uFL 3430| [[objet30trainingsop|Objet 30 Users Outline and SOP]]|
 |[[miicraft_50|MiiCraft 50 DLP 3D Printer]]|IW 2442| [[miicraft_50_sop|Miicraft 50 SOP]] |
@@ Line 15: / Line 17: @@
 </datatables>
-==== Laser Cutters ====
-<datatables page-length="75">
-^ Tool ^ Location ^ Training SOP ^
-|[[trotec_speedy|Trotec Speedy 100]]|uFL 3430|[[laser_cutter_training_sop|Laser cutting SOP]] |
-</datatables>
 ==== PDMS Processing ====
@@ Line 33: / Line 27: @@
 |[[plasma_cleaner|Harrick Plasma Cleaner PDC-32G]]|uFL 3430| {{ :tools:plasmacleaner:ufl_harrick_plasma_operating_instructions.pdf | Plasma Cleaner SOP}}|
 |[[novascan_ozone_cleaner|Novascan Ozone Cleaner]]|uFL 3430| [[Ozone Cleaner SOP]] |
-|[[vapor_silanation_rig|Vapor Silanization Rig]]|uFL 3430| [[vapor_silanation_rig_sop|Vapor Silanization Rig SOP]]|
+|[[vapor_silanation_rig_new|Vapor Silanization Rig New]]|uFL 3430| [[vapor_silanation_rig_sop_new|Vapor Silanization Rig SOP New]]|
@@ Line 42: / Line 36: @@
 ^ Tool ^ Location ^ Training SOP ^
 |[[bandsaw|Bandsaw]]|IW 2448|[[bandsaw_sop|Bandsaw Safe Operating Procedure]]|
-|[[carbide3d_nomad|Carbide 3D Nomad]]|IW 2448|[[carbide_3d_nomad_883_training_sop|Carbide 3D Training SOP]]|
+|[[carbide3d_nomad|Carbide 3D Nomad]]|REMOVED|[[carbide_3d_nomad_883_training_sop|Carbide 3D Training SOP]]|
 |[[shopbot_desktop|ShopBot Desktop CNC Router]]|IW 2448|[[shopbotdesktoptrainingsop|ShopBot Desktop Training SOP]]|
 | [[Diamond Saw]] |uFL 3430|[[trimsaw2sop|Dimond TrimSaw 2 Training SOP]] |
@@ Line 62: / Line 56: @@
 |[[keyence_microscope|Keyence VHX-5000 Microscope]] |uFL 3430| [[keyence_sop|Keyence Microscope Training SOP]]|
 | [[Sonoplot Multimaterial Writer]] |uFL 3430| |
+|[[trotec_speedy|Trotec Speedy 100]]|uFL 3430|[[laser_cutter_training_sop|Laser cutting SOP]] |
+|[[wazer_waterjet|Wazer Waterjet Cutter]]|IW 2448|[[waterjetsop|Waterjet SOP]] |
+|[[crystalmark|CrystalMark Etching Tool]]|uFL 3430|[[crystalmarksop|CrystalMark SOP]] |
 </datatables>