diff options
| author | cheapie <no-email-for-you@example.com> | 2025-03-23 13:25:38 -0500 |
|---|---|---|
| committer | cheapie <no-email-for-you@example.com> | 2025-03-23 13:25:38 -0500 |
| commit | 1919f3ed7ff05af5b186406cec3daec931e33a46 (patch) | |
| tree | 9ca76dc5ac8f7461c237a2255b7ffc07daa3e198 | |
| parent | 2a2d7f18755845e2c68f872918261f4526d3cafb (diff) | |
| download | celevator-1919f3ed7ff05af5b186406cec3daec931e33a46.tar celevator-1919f3ed7ff05af5b186406cec3daec931e33a46.tar.gz celevator-1919f3ed7ff05af5b186406cec3daec931e33a46.tar.bz2 celevator-1919f3ed7ff05af5b186406cec3daec931e33a46.tar.xz celevator-1919f3ed7ff05af5b186406cec3daec931e33a46.zip | |
Allow car top inspection to override machine room inspection
| -rw-r--r-- | controllerfw.lua | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/controllerfw.lua b/controllerfw.lua index 3fff47a..f1bf2ff 100644 --- a/controllerfw.lua +++ b/controllerfw.lua @@ -48,7 +48,7 @@ local modenames = { stop = "Emergency Stop", mrinspect = "Machine Room Inspection", carinspect = "Car Top Inspection", - inspconflict = "Inspection Conflict", + inspconflict = "Inspection Conflict", --No longer used but some controllers may be in it at update time fs1 = "Fire Service - Phase 1", fs2 = "Fire Service - Phase 2", fs2hold = "Fire Service - Phase 2 Hold", @@ -904,19 +904,6 @@ elseif mem.controllerstopsw or mem.screenstate == "floortable" or mem.screenstat mem.direction = nil interrupt(nil,"opentimeout") interrupt(nil,"closetimeout") -elseif mem.controllerinspectsw and mem.cartopinspectsw then - mem.carstate = "inspconflict" - mem.carcalls = {} - mem.upcalls = {} - mem.dncalls = {} - mem.swingupcalls = {} - mem.swingdncalls = {} - mem.groupupcalls = {} - mem.groupdncalls = {} - mem.direction = nil - drivecmd({command="estop"}) - interrupt(nil,"opentimeout") - interrupt(nil,"closetimeout") elseif mem.controllerinspectsw and not mem.cartopinspectsw then mem.carstate = "mrinspect" mem.carcalls = {} @@ -930,7 +917,7 @@ elseif mem.controllerinspectsw and not mem.cartopinspectsw then interrupt(nil,"opentimeout") interrupt(nil,"closetimeout") if oldstate ~= "mrinspect" then drivecmd({command="estop"}) end -elseif mem.cartopinspectsw and not mem.controllerinspectsw then +elseif mem.cartopinspectsw then mem.carstate = "carinspect" mem.carcalls = {} mem.upcalls = {} |