Add support for disabling the floor passing beep and hiding car call buttons

3 files changed, 106 insertions, 76 deletions

diff --git a/controllerfw.lua b/controllerfw.lua
index ca8dad8..ffb7d7a 100644
--- a/controllerfw.lua
+++ b/controllerfw.lua
@@ -235,6 +235,8 @@ if mem.params and not mem.params.inspectionspeed then mem.params.inspectionspeed
 if mem.params and not mem.params.indepunlock then mem.params.indepunlock = {} end
 if mem.params and not mem.params.secoverrideusers then mem.params.secoverrideusers = {} end
 if mem.params and mem.params.swingcallwhennotswing == nil then mem.params.swingcallwhennotswing = true end
+if mem.params and not mem.params.suppressbeep then mem.params.suppressbeep = {} end
+if mem.params and not mem.params.hiddenbuttons then mem.params.hiddenbuttons = {} end
 if not mem.editinguser then mem.editinguser = 1 end
 
 if mem.params and #mem.params.floornames < 2 then
@@ -301,6 +303,8 @@ if event.type == "program" then
 			indepunlock = {},
 			secoverrideusers = {},
 			swingcallwhennotswing = true,
+			suppressbeep = {},
+			hiddenbuttons = {},
 		}
 	end
 elseif event.type == "ui" then
@@ -414,6 +418,7 @@ elseif event.type == "ui" then
 			if mainlanding and mainlanding >= 1 and mainlanding <= #mem.params.floorheights then
 				mem.params.mainlanding = math.floor(mainlanding)
 				mem.params.carcallsecurity[math.floor(mainlanding)] = nil
+				mem.params.hiddenbuttons[math.floor(mainlanding)] = nil
 			end
 			local altrecalllanding = tonumber(event.fields.altrecalllanding)
 			if altrecalllanding and altrecalllanding >= 1 and altrecalllanding <= #mem.params.floorheights then
@@ -546,6 +551,12 @@ elseif event.type == "ui" then
 		if event.fields.indepunlock then
 			mem.params.indepunlock[mem.editingfloor] = (event.fields.indepunlock == "true")
 		end
+		if event.fields.suppressbeep then
+			mem.params.suppressbeep[mem.editingfloor] = (event.fields.suppressbeep == "true")
+		end
+		if event.fields.hidebutton then
+			mem.params.hiddenbuttons[mem.editingfloor] = (event.fields.hidebutton == "true")
+		end
 		if event.fields.swingcallwhennotswing then
 			mem.params.swingcallwhennotswing = (event.fields.swingcallwhennotswing == "true")
 		end
@@ -1573,25 +1584,29 @@ elseif mem.screenstate == "carcallsecurity" then
 			fs("1;true]")
 		end
 		if mem.params.carcallsecurity[mem.editingfloor] then
-			fs(string.format("checkbox[8,3.5;indepunlock;"..S("Unlock in Independent")..";%s]",(mem.params.indepunlock[mem.editingfloor] and "true" or "false")))
-			fs("label[8,4.7;"..S("Extra Allowed Users").."]")
+			fs(string.format("checkbox[8,4.5;indepunlock;"..S("Unlock in Independent")..";%s]",(mem.params.indepunlock[mem.editingfloor] and "true" or "false")))
+			fs("label[8,5.7;"..S("Extra Allowed Users").."]")
 			if not mem.params.secoverrideusers[mem.editingfloor] then mem.params.secoverrideusers[mem.editingfloor] = {} end
 			if #mem.params.secoverrideusers[mem.editingfloor] > 0 then
-				fs("textlist[8,6;4,2;user;")
+				fs("textlist[8,7;4,2;user;")
 				for i=1,#mem.params.secoverrideusers[mem.editingfloor],1 do
 					fs(core.formspec_escape(mem.params.secoverrideusers[mem.editingfloor][i])..(i==#mem.params.secoverrideusers[mem.editingfloor] and "" or ","))
 				end
 				fs(";"..tostring(mem.editinguser)..";false]")
 			else
-				fs("label[8,6.25;"..S("(none)").."]")
+				fs("label[8,7.25;"..S("(none)").."]")
 			end
-			fs("field[8,5;3,1;username;;]")
-			fs("button[11.25,5;0.5,1;adduser;+]")
-			fs("button[12,5;0.5,1;deluser;-]")
+			fs("field[8,6;3,1;username;;]")
+			fs("button[11.25,6;0.5,1;adduser;+]")
+			fs("button[12,6;0.5,1;deluser;-]")
 		end
+		local hidden = mem.params.hiddenbuttons[mem.editingfloor] and "true" or "false"
+		fs("checkbox[8,4;hidebutton;"..S("Hide Button")..";"..hidden.."]")
 	else
 		fs("label[8,2;"..S("Main landing cannot be locked").."]")
 	end
+	local suppressed = mem.params.suppressbeep[mem.editingfloor] and "true" or "false"
+	fs("checkbox[8,3.5;suppressbeep;"..S("Suppress Beep Sound")..";"..suppressed.."]")
 end
 
 local arrow = " "
@@ -1626,7 +1641,9 @@ local hidepi = {
 if hidepi[mem.carstate] then mem.pifloor = "--" end
 
 if mem.pifloor ~= oldpifloor and (mem.carstate == "normal" or mem.carstate == "swing") then
-	drivecmd({command="pibeep"})
+	if not mem.params.suppressbeep[getpos(true)] then
+		drivecmd({command="pibeep"})
+	end
 end
 
 local arrowenabled = {
@@ -1669,7 +1686,15 @@ elseif (mem.carstate == "normal" or mem.carstate == "swing") and mem.doorstate =
 end
 
 mem.copformspec = "formspec_version[7]"
-local floorcount = #mem.params.floornames
+local displayedfloors = {}
+local realfloors = {}
+for k,v in pairs(mem.params.floornames) do
+	if not mem.params.hiddenbuttons[k] then
+		table.insert(displayedfloors,v)
+		realfloors[#displayedfloors] = k
+	end
+end
+local floorcount = #displayedfloors
 local copcols = math.floor((floorcount-1)/10)+1
 local coprows = math.floor((floorcount-1)/copcols)+1
 local litimg = "celevator_copbutton_lit.png"
@@ -1678,13 +1703,14 @@ mem.copformspec = mem.copformspec..string.format("size[%f,%f]",copcols*1.25+2.5,
 mem.copformspec = mem.copformspec.."no_prepend[]"
 mem.copformspec = mem.copformspec.."background9[0,0;16,12;celevator_fs_bg.png;true;3]"
 for i=1,floorcount,1 do
+	local landing = realfloors[i]
 	local row = math.floor((i-1)/copcols)+1
 	local col = ((i-1)%copcols)+1
 	local yp = (coprows-row+1)*1.25+1
 	local xp = col*1.25
-	local tex = mem.carcalls[i] and litimg or unlitimg
-	local star = (i == (mem.params.mainlanding or 1) and "*" or "")
-	local label = core.formspec_escape(star..mem.params.floornames[i])
+	local tex = mem.carcalls[landing] and litimg or unlitimg
+	local star = (landing == (mem.params.mainlanding or 1) and "*" or "")
+	local label = core.formspec_escape(star..displayedfloors[i])
 	mem.copformspec = mem.copformspec..string.format("image_button[%f,%f;1.2,1.2;%s;carcall%d;%s;false;false;%s]",xp,yp,tex,i,label,litimg)
 end
 
diff --git a/locale/celevator.es.tr b/locale/celevator.es.tr
index 583bbe2..80d52c0 100644
--- a/locale/celevator.es.tr
+++ b/locale/celevator.es.tr
@@ -6,9 +6,6 @@ Elevator Call Button (on state - you hacker you!)=Botón de llamada de ascensor
 Error reading car information!@nPlease remove and replace this node.=¡Error al leer la información de la cabina!@nRetire y reemplace este bloque.
 Controller/dispatcher is missing!@nPlease remove and replace this node.=¡El controlador/despachador no está presente!@nRetire y reemplace este bloque.
 Controller/dispatcher found but with incorrect ID!@nPlease remove and replace this node.=¡El controlador/despachador tiene un número incorrecto!@nRetire y reemplace este bloque.
-Landing Number=Número de planta
-Save=Guardar
-Car ID=Número del ascensor
 Car (part @1 - you hacker you!)=Cabina del ascensor (parte @1)
 You don't have access to these switches.=No tienes acceso a estos interruptores.
 Really remove this car?=¿De verdad quieres eliminar esta cabina?
@@ -47,6 +44,11 @@ Controller (top section - you hacker you!)=Controlador (mitad superior)
 Controller (top section, car in motion - you hacker you!)=Controlador (mitad superior con cabina en movimiento)
 Controller (top section, open - you hacker you!)=Controlador (mitad superior con puerta abierta)
 Controller (top section, open, car in motion - you hacker you!)=Controlador (mitad superior con puerta abierta y cabina en movimiento)
+Firmware reloaded successfully=El firmware se recargó correctamente
+Can't place cabinet - no room for the top half!=No se puede colocar el armario de control aquí - ¡no hay espacio para la mitad superior!
+Can't place cabinet - top half is protected!=No se puede colocar el armario de control aquí - ¡el espacio para la mitad superior está protegido!
+Hold the sneak button while digging to remove.=Mantén pulsado el botón de sigilo mientras cavas para eliminarlo.
+Can't open cabinet - cabinet is locked.=No se puede abrir el armario - la puerta está cerrada con llave.
 Door Open Timeout=El tiempo para abrir las puertas ha expirado
 Door Close Timeout=El tiempo para cerrar las puertas ha expirado
 Lost Communication With Drive=Comunicación perdida con el inversor
@@ -108,7 +110,9 @@ Security Disabled=Función de seguridad deshabilitada
 Allow Swing Calls When Not In Swing Operation=Permitir llamadas separadas aun cuando esté en modo grupo
 Unlock in Independent=Desbloqear en modo de servicio independiente
 Extra Allowed Users=Usuarios adicionales permitidos
+Hide Button=Ocultar el botón
 Main landing cannot be locked=La planta principal no se puede bloquear.
+Suppress Beep Sound=Desactivar el sonido «bip»
 ID @1: Floor @2 - @3 - @4=Número @1: Planta @2 - @3 - @4
 Call@nCancel=Cancelar
 HOLD=MANTENIDO
@@ -116,24 +120,6 @@ FIRE SVC=INCENDIO
 IND SVC=INDEPENDIENTE
 CAR LIGHT=LUZ
 CAR FAN=VENTILADOR
-Press Next to begin.=Haz clic en «siguiente» para comenzar.
-License Info=Información de la licencia
-Next >=Siguiente >
-< Back=< Atrás
-Done=Listo
-EDIT FLOOR TABLE=EDICIÓN DE LA TABLA DE PLANTAS
-@1 - Height: @2 - PI: @3=@1 - Altura: @2 - Nombre: @3
-New Floor=Planta nueva
-Edit Floor=Editar planta
-Remove Floor=Eliminar planta
-The Floor Height is the distance (in meters/nodes) from the floor level of this floor to the floor level of the next floor.=La altura de la planta es la distancia (en metros/nodos) desde el nivel del suelo de esta planta hasta el nivel del suelo de la planta siguiente.
-(not used at the highest floor)=(No se utiliza en la planta más alta)
-The Floor Name is how the floor will be displayed on the position indicators.=El nombre de la planta es la forma en que se mostrará la planta en los indicadores de posición.
-Editing Floor @1=Editando la planta @1
-Floor Height=Altura de la planta
-Floor Name=Nombre de la planta
-Edit Floor Table=Tabla de plantas
-Back=Atrás
 Please select a floor:=Por favor, seleccione una planta:
 Please use elevator=Por favor, use el ascensor
 ERROR=ERROR
@@ -158,15 +144,12 @@ Elevator Digilines Input/Output=Módulo de entrada/salida de Digilines para el a
 Channel=Canal
 Elevator Digilines Multi-Car Input/Output=Módulo de entrada/salida de Digilines para múltiples ascensores
 You need either the 'protection_bypass' or 'server' privilege to use this.=Necesitas el privilegio 'protection_bypass' o 'server' para poder usar esto.
+Car ID=Número del ascensor
+Save=Guardar
 Elevator Dispatcher=Despachador de ascensor
 Dispatcher (door open - you hacker you!)=Despachador de ascensor (con puerta abierta)
 Dispatcher (top section - you hacker you!)=Despachador de ascensor (mitad superior)
 Dispatcher (top section, open - you hacker you!)=Despachador de ascensor (mitad superior con puerta abierta)
-Firmware reloaded successfully=El firmware se recargó correctamente
-Can't place cabinet - no room for the top half!=No se puede colocar el armario de control aquí - ¡no hay espacio para la mitad superior!
-Can't place cabinet - top half is protected!=No se puede colocar el armario de control aquí - ¡el espacio para la mitad superior está protegido!
-Hold the sneak button while digging to remove.=Mantén pulsado el botón de sigilo mientras cavas para eliminarlo.
-Can't open cabinet - cabinet is locked.=No se puede abrir el armario - la puerta está cerrada con llave.
 Welcome to your new MTronic XT elevator dispatcher!=¡Bienvenido a su nuevo despachador de ascensores MTronic XT!
 Before continuing, make sure you have at least two controllers in group operation mode and ready to connect.=Antes de continuar, asegúrese de tener al menos dos controladores en modo de funcionamiento grupal y listos para conectarse.
 This applies to the whole celevator mod, not just this dispatcher:=Esto se aplica a todo el mod «celevator», no solo a este despachador:
@@ -189,6 +172,24 @@ GROUP DISPLAY=ESTADO DEL GRUPO
 Menu=Menú
 MAIN MENU=MENÚ PRINCIPAL
 Edit Connections=Editar conexiones
+Press Next to begin.=Haz clic en «siguiente» para comenzar.
+License Info=Información de la licencia
+Next >=Siguiente >
+< Back=< Atrás
+Done=Listo
+EDIT FLOOR TABLE=EDICIÓN DE LA TABLA DE PLANTAS
+@1 - Height: @2 - PI: @3=@1 - Altura: @2 - Nombre: @3
+New Floor=Planta nueva
+Edit Floor=Editar planta
+Remove Floor=Eliminar planta
+The Floor Height is the distance (in meters/nodes) from the floor level of this floor to the floor level of the next floor.=La altura de la planta es la distancia (en metros/nodos) desde el nivel del suelo de esta planta hasta el nivel del suelo de la planta siguiente.
+(not used at the highest floor)=(No se utiliza en la planta más alta)
+The Floor Name is how the floor will be displayed on the position indicators.=El nombre de la planta es la forma en que se mostrará la planta en los indicadores de posición.
+Editing Floor @1=Editando la planta @1
+Floor Height=Altura de la planta
+Floor Name=Nombre de la planta
+Edit Floor Table=Tabla de plantas
+Back=Atrás
 Glass Hoistway Door (fast, bottom - you hacker you!)=Puerta de ascensor en vidrio (alta velocidad, parte inferior)
 Glass Hoistway Door (fast, middle - you hacker you!)=Puerta de ascensor en vidrio (alta velocidad, parte media)
 Glass Hoistway Door (fast, top - you hacker you!)=Puerta de ascensor en vidrio (alta velocidad, parte superior)
@@ -203,8 +204,6 @@ Steel Hoistway Door (slow, bottom - you hacker you!)=Puerta de ascensor en acero
 Steel Hoistway Door (slow, middle - you hacker you!)=Puerta de ascensor en acero (baja velocidad, parte media)
 Steel Hoistway Door (slow, top - you hacker you!)=Puerta de ascensor en acero (baja velocidad, parte superior)
 Steel Elevator Hoistway Door=Puerta de ascensor en acero
-Can't place door here - position @1m to the right and @2m up is blocked!=No se puede colocar la puerta aquí - hay una posición bloqueada @1 m a la derecha y @2 m hacia arriba
-Can't place door here - position @1m to the right and @2m up is protected!=No se puede colocar la puerta aquí - hay una posición protegida @1 m a la derecha y @2 m hacia arriba
 Glass Hoistway Door (left, bottom - you hacker you!)=Puerta de ascensor en vidrio (lado izquierdo, parte inferior)
 Glass Hoistway Door (left, middle - you hacker you!)=Puerta de ascensor en vidrio (lado izquierdo, parte media)
 Glass Hoistway Door (left, top - you hacker you!)=Puerta de ascensor en vidrio (lado izquierdo, parte superior)
@@ -219,6 +218,8 @@ Steel Hoistway Door (right, bottom - you hacker you!)=Puerta de ascensor en acer
 Steel Hoistway Door (right, middle - you hacker you!)=Puerta de ascensor en acero (lado derecho, parte media)
 Steel Hoistway Door (right, top - you hacker you!)=Puerta de ascensor en acero (lado derecho, parte superior)
 Center-Opening Steel Elevator Hoistway Door=Puerta de ascensor en acero de apertura central
+Can't place door here - position @1m to the right and @2m up is blocked!=No se puede colocar la puerta aquí - hay una posición bloqueada @1 m a la derecha y @2 m hacia arriba
+Can't place door here - position @1m to the right and @2m up is protected!=No se puede colocar la puerta aquí - hay una posición protegida @1 m a la derecha y @2 m hacia arriba
 Hoistway Door Open-State Placeholder (you hacker you!)=Marcador de posición para puertas de ascensor abiertas
 Hoistway Door Sill, Double Track (you hacker you!)=Alféizar de puerta para ascensor (pista doble)
 Elevator Drive=Inversor de frecuencia para ascensor
@@ -250,6 +251,7 @@ Elevator Fire Service Phase 1 Keyswitch (lit - you hacker you!)=Interruptor de l
 Elevator Fire Service Phase 1 Keyswitch (on state, lit - you hacker you!)=Interruptor de la fase 1 del modo de incendio del ascensor (estado activado y con luz activado)
 Elevator Fire Service Phase 1 Keyswitch (reset state, lit - you hacker you!)=Interruptor de la fase 1 del modo de incendio del ascensor (estado de reinicio y con luz activado)
 Can't connect to a controller/dispatcher you don't have access to.=No se puede conectar a un controlador/despachador al que no se tiene acceso.
+You don't have a key for this switch.=No tienes la llave para este interruptor.
 Elevator Keyswitch=Interruptor de llave del ascensor
 Elevator Keyswitch (maintained, off state - you hacker you!)=Interruptor de llave del ascensor (mantenido, en estado desactivado)
 Elevator Keyswitch (maintained, on state - you hacker you!)=Interruptor de llave del ascensor (mantenido, en estado activado)
@@ -258,7 +260,7 @@ Elevator Keyswitch (momentary, on state - you hacker you!)=Interruptor de llave
 (none)=(ninguno)
 ON=ENCENDIDO
 OFF=APAGADO
-You don't have a key for this switch.=No tienes la llave para este interruptor.
+Landing Number=Número de planta
 Elevator Governor=Limitador de velocidad del ascensor
 Governor Sheave (you hacker you!)=Polea de limitador de velocidad
 Remote interface for MTronic XT elevator controllers=Interfaz remota para controladores de ascensores MTronic XT
@@ -295,9 +297,6 @@ Follow Car=Seguimiento de cabina
 Position: @1m Speed: @2m/s PI: @3=Posición: @1 m Velocidad: @2 m/s Planta: @3
 Fault(s) Active=Avería(s) activa(s)
 No Current Faults=Ninguna avería
-OK=OK
-Move Up=Subir
-Move Down=Bajar
 ID: @1=Número: @1
 No Connections=Nignuna conexión
 New Connection=Conexión nueva
@@ -307,6 +306,9 @@ EDIT CONNECTION=EDITAR CONEXIÓN
 CAR @1=ASC. @1
  IN= OK
 OUT= --
+OK=OK
+Move Up=Subir
+Move Down=Bajar
 Inspection (Any)=Modo de inspección (cualquier)
 Fire Service=Modo de incendio
 Fire Service Phase 1=Modo de incendio - fase 1
diff --git a/locale/template.txt b/locale/template.txt
index bbaa1a9..e96f6f0 100644
--- a/locale/template.txt
+++ b/locale/template.txt
@@ -6,9 +6,6 @@ Elevator Call Button (on state - you hacker you!)=
 Error reading car information!@nPlease remove and replace this node.=
 Controller/dispatcher is missing!@nPlease remove and replace this node.=
 Controller/dispatcher found but with incorrect ID!@nPlease remove and replace this node.=
-Landing Number=
-Save=
-Car ID=
 Car (part @1 - you hacker you!)=
 You don't have access to these switches.=
 Really remove this car?=
@@ -47,6 +44,11 @@ Controller (top section - you hacker you!)=
 Controller (top section, car in motion - you hacker you!)=
 Controller (top section, open - you hacker you!)=
 Controller (top section, open, car in motion - you hacker you!)=
+Firmware reloaded successfully=
+Can't place cabinet - no room for the top half!=
+Can't place cabinet - top half is protected!=
+Hold the sneak button while digging to remove.=
+Can't open cabinet - cabinet is locked.=
 Door Open Timeout=
 Door Close Timeout=
 Lost Communication With Drive=
@@ -108,7 +110,9 @@ Security Disabled=
 Allow Swing Calls When Not In Swing Operation=
 Unlock in Independent=
 Extra Allowed Users=
+Hide Button=
 Main landing cannot be locked=
+Suppress Beep Sound=
 ID @1: Floor @2 - @3 - @4=
 Call@nCancel=
 HOLD=
@@ -116,24 +120,6 @@ FIRE SVC=
 IND SVC=
 CAR LIGHT=
 CAR FAN=
-Press Next to begin.=
-License Info=
-Next >=
-< Back=
-Done=
-EDIT FLOOR TABLE=
-@1 - Height: @2 - PI: @3=
-New Floor=
-Edit Floor=
-Remove Floor=
-The Floor Height is the distance (in meters/nodes) from the floor level of this floor to the floor level of the next floor.=
-(not used at the highest floor)=
-The Floor Name is how the floor will be displayed on the position indicators.=
-Editing Floor @1=
-Floor Height=
-Floor Name=
-Edit Floor Table=
-Back=
 Please select a floor:=
 Please use elevator=
 ERROR=
@@ -158,15 +144,12 @@ Elevator Digilines Input/Output=
 Channel=
 Elevator Digilines Multi-Car Input/Output=
 You need either the 'protection_bypass' or 'server' privilege to use this.=
+Car ID=
+Save=
 Elevator Dispatcher=
 Dispatcher (door open - you hacker you!)=
 Dispatcher (top section - you hacker you!)=
 Dispatcher (top section, open - you hacker you!)=
-Firmware reloaded successfully=
-Can't place cabinet - no room for the top half!=
-Can't place cabinet - top half is protected!=
-Hold the sneak button while digging to remove.=
-Can't open cabinet - cabinet is locked.=
 Welcome to your new MTronic XT elevator dispatcher!=
 Before continuing, make sure you have at least two controllers in group operation mode and ready to connect.=
 This applies to the whole celevator mod, not just this dispatcher:=
@@ -189,6 +172,24 @@ GROUP DISPLAY=
 Menu=
 MAIN MENU=
 Edit Connections=
+Press Next to begin.=
+License Info=
+Next >=
+< Back=
+Done=
+EDIT FLOOR TABLE=
+@1 - Height: @2 - PI: @3=
+New Floor=
+Edit Floor=
+Remove Floor=
+The Floor Height is the distance (in meters/nodes) from the floor level of this floor to the floor level of the next floor.=
+(not used at the highest floor)=
+The Floor Name is how the floor will be displayed on the position indicators.=
+Editing Floor @1=
+Floor Height=
+Floor Name=
+Edit Floor Table=
+Back=
 Glass Hoistway Door (fast, bottom - you hacker you!)=
 Glass Hoistway Door (fast, middle - you hacker you!)=
 Glass Hoistway Door (fast, top - you hacker you!)=
@@ -203,8 +204,6 @@ Steel Hoistway Door (slow, bottom - you hacker you!)=
 Steel Hoistway Door (slow, middle - you hacker you!)=
 Steel Hoistway Door (slow, top - you hacker you!)=
 Steel Elevator Hoistway Door=
-Can't place door here - position @1m to the right and @2m up is blocked!=
-Can't place door here - position @1m to the right and @2m up is protected!=
 Glass Hoistway Door (left, bottom - you hacker you!)=
 Glass Hoistway Door (left, middle - you hacker you!)=
 Glass Hoistway Door (left, top - you hacker you!)=
@@ -219,6 +218,8 @@ Steel Hoistway Door (right, bottom - you hacker you!)=
 Steel Hoistway Door (right, middle - you hacker you!)=
 Steel Hoistway Door (right, top - you hacker you!)=
 Center-Opening Steel Elevator Hoistway Door=
+Can't place door here - position @1m to the right and @2m up is blocked!=
+Can't place door here - position @1m to the right and @2m up is protected!=
 Hoistway Door Open-State Placeholder (you hacker you!)=
 Hoistway Door Sill, Double Track (you hacker you!)=
 Elevator Drive=
@@ -250,6 +251,7 @@ Elevator Fire Service Phase 1 Keyswitch (lit - you hacker you!)=
 Elevator Fire Service Phase 1 Keyswitch (on state, lit - you hacker you!)=
 Elevator Fire Service Phase 1 Keyswitch (reset state, lit - you hacker you!)=
 Can't connect to a controller/dispatcher you don't have access to.=
+You don't have a key for this switch.=
 Elevator Keyswitch=
 Elevator Keyswitch (maintained, off state - you hacker you!)=
 Elevator Keyswitch (maintained, on state - you hacker you!)=
@@ -258,7 +260,7 @@ Elevator Keyswitch (momentary, on state - you hacker you!)=
 (none)=
 ON=
 OFF=
-You don't have a key for this switch.=
+Landing Number=
 Elevator Governor=
 Governor Sheave (you hacker you!)=
 Remote interface for MTronic XT elevator controllers=
@@ -295,9 +297,6 @@ Follow Car=
 Position: @1m Speed: @2m/s PI: @3=
 Fault(s) Active=
 No Current Faults=
-OK=
-Move Up=
-Move Down=
 ID: @1=
 No Connections=
 New Connection=
@@ -307,6 +306,9 @@ EDIT CONNECTION=
 CAR @1=
  IN=
 OUT=
+OK=
+Move Up=
+Move Down=
 Inspection (Any)=
 Fire Service=
 Fire Service Phase 1=