Skip to content

Commit 519ff25

Browse files
taylorbrown75taylorbrown75
committed
Merge branch 'develop' into csp-version-upgrade-fix
2 parents f7c10ef + ba373aa commit 519ff25

File tree

6 files changed

+933
-458
lines changed

6 files changed

+933
-458
lines changed

‎deploy/runtime/ui/MSLF IPH System Control.json‎

Lines changed: 197 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Name": "MSLF IPH System Control",
3-
"Width": 838.0,
4-
"Height": 364.0,
3+
"Width": 841.0,
4+
"Height": 413.0,
55
"FormObjects": {
66
"GroupBox": {
77
"Visible": 1.0,
@@ -1988,7 +1988,7 @@
19881988
},
19891989
"Height": {
19901990
"Type": 3.0,
1991-
"Integer": 126.0
1991+
"Integer": 171.0
19921992
},
19931993
"Tool Tip": {
19941994
"Type": 5.0,
@@ -2185,6 +2185,172 @@
21852185
"Integer": 4.0
21862186
}
21872187
}
2188+
},
2189+
"Numeric": {
2190+
"Visible": 1.0,
2191+
"ObjectProperties": {
2192+
"Name": {
2193+
"Type": 5.0,
2194+
"String": "rec_qf_delay"
2195+
},
2196+
"X": {
2197+
"Type": 3.0,
2198+
"Integer": 273.0
2199+
},
2200+
"Y": {
2201+
"Type": 3.0,
2202+
"Integer": 381.0
2203+
},
2204+
"Width": {
2205+
"Type": 3.0,
2206+
"Integer": 90.0
2207+
},
2208+
"Height": {
2209+
"Type": 3.0,
2210+
"Integer": 21.0
2211+
},
2212+
"Tool Tip": {
2213+
"Type": 5.0,
2214+
"String": ""
2215+
},
2216+
"Value": {
2217+
"Type": 1.0,
2218+
"Double": 0.0
2219+
},
2220+
"Mode": {
2221+
"Type": 3.0,
2222+
"Integer": 1.0
2223+
},
2224+
"Format": {
2225+
"Type": 3.0,
2226+
"Integer": 1.0
2227+
},
2228+
"Decimals": {
2229+
"Type": 3.0,
2230+
"Integer": 3.0
2231+
},
2232+
"Prefix": {
2233+
"Type": 5.0,
2234+
"String": ""
2235+
},
2236+
"Suffix": {
2237+
"Type": 5.0,
2238+
"String": ""
2239+
},
2240+
"ThousandsSep": {
2241+
"Type": 2.0,
2242+
"Boolean": 0.0
2243+
},
2244+
"Editable": {
2245+
"Type": 2.0,
2246+
"Boolean": 1.0
2247+
},
2248+
"ForeColour": {
2249+
"Type": 4.0,
2250+
"Color": {
2251+
"Red": 0.0,
2252+
"Green": 0.0,
2253+
"Blue": 0.0,
2254+
"Alpha": 255.0
2255+
}
2256+
},
2257+
"BackColour": {
2258+
"Type": 4.0,
2259+
"Color": {
2260+
"Red": 255.0,
2261+
"Green": 255.0,
2262+
"Blue": 255.0,
2263+
"Alpha": 255.0
2264+
}
2265+
},
2266+
"TabOrder": {
2267+
"Type": 3.0,
2268+
"Integer": 4.0
2269+
}
2270+
}
2271+
},
2272+
"Numeric": {
2273+
"Visible": 1.0,
2274+
"ObjectProperties": {
2275+
"Name": {
2276+
"Type": 5.0,
2277+
"String": "rec_su_delay"
2278+
},
2279+
"X": {
2280+
"Type": 3.0,
2281+
"Integer": 273.0
2282+
},
2283+
"Y": {
2284+
"Type": 3.0,
2285+
"Integer": 357.0
2286+
},
2287+
"Width": {
2288+
"Type": 3.0,
2289+
"Integer": 90.0
2290+
},
2291+
"Height": {
2292+
"Type": 3.0,
2293+
"Integer": 21.0
2294+
},
2295+
"Tool Tip": {
2296+
"Type": 5.0,
2297+
"String": ""
2298+
},
2299+
"Value": {
2300+
"Type": 1.0,
2301+
"Double": 0.0
2302+
},
2303+
"Mode": {
2304+
"Type": 3.0,
2305+
"Integer": 1.0
2306+
},
2307+
"Format": {
2308+
"Type": 3.0,
2309+
"Integer": 1.0
2310+
},
2311+
"Decimals": {
2312+
"Type": 3.0,
2313+
"Integer": 3.0
2314+
},
2315+
"Prefix": {
2316+
"Type": 5.0,
2317+
"String": ""
2318+
},
2319+
"Suffix": {
2320+
"Type": 5.0,
2321+
"String": ""
2322+
},
2323+
"ThousandsSep": {
2324+
"Type": 2.0,
2325+
"Boolean": 0.0
2326+
},
2327+
"Editable": {
2328+
"Type": 2.0,
2329+
"Boolean": 1.0
2330+
},
2331+
"ForeColour": {
2332+
"Type": 4.0,
2333+
"Color": {
2334+
"Red": 0.0,
2335+
"Green": 0.0,
2336+
"Blue": 0.0,
2337+
"Alpha": 255.0
2338+
}
2339+
},
2340+
"BackColour": {
2341+
"Type": 4.0,
2342+
"Color": {
2343+
"Red": 255.0,
2344+
"Green": 255.0,
2345+
"Blue": 255.0,
2346+
"Alpha": 255.0
2347+
}
2348+
},
2349+
"TabOrder": {
2350+
"Type": 3.0,
2351+
"Integer": 4.0
2352+
}
2353+
}
21882354
}
21892355
},
21902356
"VarDatabase": {
@@ -2600,6 +2766,32 @@
26002766
"UIObject": "Default",
26012767
"sscVariableName": "",
26022768
"sscVariableValue": ""
2769+
},
2770+
"rec_qf_delay": {
2771+
"Version": 4.0,
2772+
"Type": 1.0,
2773+
"Label": "Receiver startup delay energy fraction",
2774+
"Units": "",
2775+
"Group": "System Control",
2776+
"IndexLabels": "",
2777+
"Flags": 2.0,
2778+
"DefaultValue": 0.25,
2779+
"UIObject": "Default",
2780+
"sscVariableName": "",
2781+
"sscVariableValue": ""
2782+
},
2783+
"rec_su_delay": {
2784+
"Version": 4.0,
2785+
"Type": 1.0,
2786+
"Label": "Receiver startup delay time",
2787+
"Units": "hr",
2788+
"Group": "System Control",
2789+
"IndexLabels": "",
2790+
"Flags": 2.0,
2791+
"DefaultValue": 0.2,
2792+
"UIObject": "Default",
2793+
"sscVariableName": "",
2794+
"sscVariableValue": ""
26032795
}
26042796
},
26052797
"Equations": [
@@ -2675,6 +2867,8 @@
26752867
" enable(\"disp_timeout\", en==1);\r",
26762868
" enable(\"disp_mip_gap\", en==1);\r",
26772869
" enable(\"disp_time_weighting\", en==1);\r",
2870+
" enable(\"rec_su_delay\", en==1);\r",
2871+
" enable(\"rec_qf_delay\", en==1);\r",
26782872
"\r",
26792873
"};"
26802874
]

0 commit comments

Comments
 (0)