Trace:

Differences

This shows you the differences between the selected revision and the current version of the page.

--- public:research:laser-machining 2020/06/10 11:12
+++ public:research:laser-machining 2020/07/29 16:03 current
@@ Line 21: / Line 21: @@
 update the current outdated control system. The new control system will provide a user-friendly
 GUI to run on a Windows(7+) Operating System. This GUI will send commands to an Arduino-based hardware
-interface to control various hardware devices.
+interface to control various hardware devices. A supplementary goal of the project is to first develop a
+simple GUI to control the Fiber Laser System.
@@ Line 29: / Line 30: @@
 ^Link^Description^
-|https://github.com/liamward14/Laser-Micromachining-GUI |  Current Github Repo  |
+|https://github.com/liamward14/Laser-Micromachining-GUI |  Current Github Repo (Sapphire Laser) |
 |https://liamward14.github.io/Laser-Micromachining-GUI/ | Published Github Project Site |
+|https://github.com/liamward14/Fiber-Laser-GUI | Github Repo for Fiber Laser |
 ----
@@ Line 57: / Line 59: @@
 \\ \\ \\
 **Control System Diagram**\\
-{{:public:research:laser-micromachining-diagram.png|}}
+<box round green left 60%>
+The Control System diagram can be viewed at this link: [[https://liamward14.github.io/Laser-Micromachining-GUI/|Control System Link]]'
+</box>
+\\ \\ \\ \\
+**Current Status of the Sapphire Laser Control System GUI**\\
+{{:public:research:stat.png|}}
+\\ \\ \\ \\
+**Current Status of the Fiber Laser Control System GUI**\\
+{{:public:research:gui.7.29.png|}}