diff --git a/bob/slits/slit-4axis-individual-embed.bob b/bob/slits/slit-4axis-individual-embed.bob index fba33e1..d67f9fb 100644 --- a/bob/slits/slit-4axis-individual-embed.bob +++ b/bob/slits/slit-4axis-individual-embed.bob @@ -1,5 +1,5 @@ - + slit-4axis-individual-embed @@ -7,19 +7,48 @@ 750 500 + + + + 5 5 4-Axis Slits - Individual 710 - 465 + 470 + + + + + + + + + + + + Group_1 + Not Default 197 - 122 + 123 280 195 + + + + + + + + + + + + true Ellipse_5 @@ -120,33 +149,35 @@ Label + Not Default Beam (Z) 65 102 151 - + - + 1 Label_1 + Not Default Pointing Towards You 41 122 195 22 - + - + 1 @@ -159,14 +190,13 @@ 22 22 - + - + - 1 Label_3 @@ -176,14 +206,13 @@ 22 22 - + - + - 1 diff --git a/bob/slits/slit-4axis-size-center-embed.bob b/bob/slits/slit-4axis-size-center-embed.bob index e7ef968..f3cef3e 100644 --- a/bob/slits/slit-4axis-size-center-embed.bob +++ b/bob/slits/slit-4axis-size-center-embed.bob @@ -1,15 +1,31 @@ - + slit-4axis-size-center-embed 750 500 + + + + 5 5 4-Axis Slits - Size and Center 710 - 465 + 470 + + + + + + + + + + + + X Center @@ -64,11 +80,24 @@ Group + Not Default 197 - 117 - 307 + 118 + 280 195 + + + + + + + + + + + + true Ellipse_8 @@ -164,17 +193,18 @@ Label_8 + Not Default Y Center 237 74 70 22 - + - + @@ -183,6 +213,7 @@ false 1 + 1 Polyline_4 @@ -205,51 +236,54 @@ Label_4 + Not Default Beam (Z) 65 67 151 22 - + - + 1 Label_5 + Not Default Pointing Towards You 42 105 195 22 - + - + 1 Label_6 + Not Default Y Size 205 150 60 22 - + - + @@ -258,6 +292,7 @@ false 1 + 1 Polyline_5 @@ -280,16 +315,17 @@ Label_7 + Not Default X Center 105 70 22 - + - + @@ -298,20 +334,22 @@ false 1 + 1 Label_9 + Not Default X Size 30 57 60 22 - + - + @@ -320,6 +358,7 @@ false 1 + 1 diff --git a/bob/slits/slit-4axis.bob b/bob/slits/slit-4axis.bob index 5a57d5c..4ac8dd4 100644 --- a/bob/slits/slit-4axis.bob +++ b/bob/slits/slit-4axis.bob @@ -1,5 +1,5 @@ - + slits-4axis @@ -10,8 +10,8 @@ 20 20 - 750 - 500 + 710 + 470 @@ -28,7 +28,7 @@ Choice Button loc://embed 30 - 480 + 490 690 diff --git a/bob/temperature/temp-config.bob b/bob/temperature/temp-config.bob index 727423c..9595693 100644 --- a/bob/temperature/temp-config.bob +++ b/bob/temperature/temp-config.bob @@ -1,35 +1,57 @@ - + Temp Config + 0 315 370 + + + + 5 5 Label - TITLE + Not Title $(temp) - 0 - 0 310 - 31 - - + 40 + + - - + + - true + + + + 1 Label_1 $(temp).DESC 110 - 31 + 40 + + + + + + + + + + + + + 0 + 0 + 0 + true Label_2 @@ -37,19 +59,47 @@ 5 225 25 - 1 + + + + + + + + + + + + + 0 + 0 + 0 + true Group - 50 - 312 - 161 + Not Default + 5 + 60 + 151 + + + + + + + + + + + + true Meter $(temp) - 310 + 299 149 @@ -58,8 +108,26 @@ $(temp) 105 225 + 90 25 - 1 + + + + + + + + + + + + + 1 + 1 + + + + Action Button @@ -67,6 +135,18 @@ 205 225 25 + + + + + + + + + + + + $(actions) @@ -76,6 +156,28 @@ 260 90 25 + + + + + + + + + + + + + -1 + true + 1 + 1 + true + 1 + + + + Label_3 @@ -83,7 +185,22 @@ 5 260 25 - 1 + + + + + + + + + + + + + 0 + 0 + 0 + true Text Update_1 @@ -91,7 +208,24 @@ 205 260 25 - 1 + + + + + + + + + + + + + 1 + 1 + + + + Text Entry_1 @@ -100,6 +234,28 @@ 295 90 25 + + + + + + + + + + + + + -1 + true + 1 + 1 + true + 1 + + + + Label_4 @@ -107,15 +263,43 @@ 5 295 25 - 1 + + + + + + + + + + + + + 0 + 0 + 0 + true HASOFFSET + Not Default 5 330 190 25 + + + + + + + + + + + + true @@ -127,12 +311,17 @@ Label_5 + Not Default Callibration Offset: 25 - + + + + + 1 @@ -141,6 +330,28 @@ 100 90 25 + + + + + + + + + + + + + -1 + true + 1 + 1 + true + 1 + + + + diff --git a/bob/temperature/temp-embed.bob b/bob/temperature/temp-embed.bob index 4f0ada6..a236d83 100644 --- a/bob/temperature/temp-embed.bob +++ b/bob/temperature/temp-embed.bob @@ -1,9 +1,14 @@ - + Temp Embed + 0 100 20 + + + + 5 5 @@ -21,10 +26,18 @@ $(label) 20 20 - - + + + + + + + + + + $(actions) @@ -32,10 +45,40 @@ $(temp) 20 55 + + + + + + + + + + + + + 1 + 1 + + + + LED $(temp).SEVR 75 + + + + + + + + + + + + diff --git a/bob/water/flow-config.bob b/bob/water/flow-config.bob index c96eb12..7b612ac 100644 --- a/bob/water/flow-config.bob +++ b/bob/water/flow-config.bob @@ -1,29 +1,38 @@ - + Flow Config + 0 255 115 + + + + 5 5 Label TITLE $(P):WF:$(id) - 0 - 0 255 31 - + - + - true - 1 + + + + + 0 + 0 + 0 + true Action Button @@ -31,38 +40,122 @@ 10 80 25 + + + + + + + + + + + + $(actions) Label_1 Flow $(id) 95 - 30 + 35 70 + + + + + + + + + + + + + 0 + 0 + 0 + true Label_2 Low Flow: 10 - 51 + 55 70 + + + + + + + + + + + + + 0 + 0 + 0 + true Label_3 Low Low Flow: 120 - 51 + 55 + + + + + + + + + + + + + 0 + 0 + 0 + true LED_1 $(P):WF:$(id):LOLO 220 - 51 + 55 + + + + + + + + + + + + LED $(P):WF:$(id):LO 80 - 51 + 55 + + + + + + + + + + + + diff --git a/bob/water/flow-embed.bob b/bob/water/flow-embed.bob index c3d639d..2f7e86a 100644 --- a/bob/water/flow-embed.bob +++ b/bob/water/flow-embed.bob @@ -1,9 +1,14 @@ - + Flow Embed + 0 80 20 + + + + Action Button @@ -20,11 +25,35 @@ Flow $(id) 60 20 + + + + + + + + + + + + $(actions) LED $(P):WF:$(id):LO 60 + + + + + + + + + + + +