[Emc-commit] emc2/configs/halui_halvcp halui.vcp, 1.3, 1.4 halvcp.hal, 1.5, 1.6

[EMC C. s. <cv...@cv...>]

Modified file emc2/configs/halui_halvcp/halui.vcp

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/configs/halui_halvcp/halui.vcp?rev=1.4>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/configs/halui_halvcp/halui.vcp.diff?r1=1.3;r2=1.4>

Branch: HEAD

Log:
revision 1.4
date: 2006/06/29 21:27:32;  author: alex_joni;  state: Exp;  lines: +42 -15
use some of the latest halui pins (spindle stats & brake)

--- halui.vcp	2006/06/28 17:31:23	1.3
+++ halui.vcp	2006/06/29 21:27:32	1.4
@@ -115,21 +115,48 @@
 	    box {
 		layout = vertical
 		title = "spindle"
-		button {
-		    halpin = button.spindle-start
-		    label { text = "start" }
+		box {
+		    layout = horizontal
+		    box {
+			layout = vertical
+			button {
+			    halpin = button.spindle-start
+			    label { text = "start" }
+			}
+			button {
+			    halpin = button.spindle-stop
+			    label { text = "stop" }
+			}
+		    }
+		    LED {
+			halpin = led.spindle-is-on
+			on-color = "#00F"
+			off-color = "#006"
+		    }
+		}    
+		box {
+		    layout = horizontal
+		    button {
+			halpin = button.spindle-forward
+			label { text = "forward" }
+		    }
+		    LED {
+			halpin = led.spindle-runs-forward
+			on-color = "#0F0"
+			off-color = "#020"
+		    }
 		}
-		button {
-		    halpin = button.spindle-stop
-		    label { text = "stop" }
-		}
-		button {
-		    halpin = button.spindle-forward
-		    label { text = "forward" }
-		}
-		button {
-		    halpin = button.spindle-reverse
-		    label { text = "reverse" }
+		box {
+		    layout = horizontal
+		    button {
+			halpin = button.spindle-reverse
+			label { text = "reverse" }
+		    }
+		    LED {
+			halpin = led.spindle-runs-backward
+			on-color = "#0F0"
+			off-color = "#020"
+		    }
 		}
 		button {
 		    halpin = button.spindle-increase

Modified file emc2/configs/halui_halvcp/halvcp.hal

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/configs/halui_halvcp/halvcp.hal?rev=1.6>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/configs/halui_halvcp/halvcp.hal.diff?r1=1.5;r2=1.6>

Branch: HEAD

Log:
revision 1.6
date: 2006/06/29 21:27:32;  author: alex_joni;  state: Exp;  lines: +4 -0
use some of the latest halui pins (spindle stats & brake)

--- halvcp.hal	2006/06/28 17:31:23	1.5
+++ halvcp.hal	2006/06/29 21:27:32	1.6
@@ -28,3 +28,7 @@
 linkpp led.mode.is-manual       halui.mode.is-manual
 linkpp led.mode.is-auto         halui.mode.is-auto  
 linkpp led.mode.is-mdi          halui.mode.is-mdi   
+
+linkpp led.spindle-is-on        halui.spindle.is-on
+linkpp led.spindle-runs-forward halui.spindle.runs-forward
+linkpp led.spindle-runs-backward halui.spindle.runs-backward