Skip to content

Commit

Permalink
restore incorrect test output samples
Browse files Browse the repository at this point in the history
  • Loading branch information
@gilesknap
gilesknap committed Jun 13, 2024
1 parent 09c823a commit dfc9a87
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 92 deletions.
18 changes: 9 additions & 9 deletions tests/samples/outputs/fastVacuum/ioc.subst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ pattern

file "$(DLSPLC)/db/dlsPLC_fastVacuumChannel.template" {
pattern
{ "device", "img", "fins_port", "eip_port", "tagidx", "id", "em", "waveform_nelm", "wave0_addr", "wave1_addr", "wave2_addr", "wave3_addr", "wave4_addr", "wave5_addr", "combined_nelm", "timeout" }
{ "SR03C-VA-FAST-01", "SR03S-VA-IMG-01", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "1", "01", "0", "500", "0", "500", "1000", "1500", "2000", "2500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03S-VA-IMG-02", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "2", "02", "0", "500", "3000", "3500", "4000", "4500", "5000", "5500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-01", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "3", "03", "0", "500", "6000", "6500", "7000", "7500", "8000", "8500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-02", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "4", "04", "0", "500", "9000", "9500", "10000", "10500", "11000", "11500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-03", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "5", "05", "0", "500", "12000", "12500", "13000", "13500", "14000", "14500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-04", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "6", "06", "0", "500", "15000", "15500", "16000", "16500", "17000", "17500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03I-VA-IMG-02", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "7", "07", "0", "500", "18000", "18500", "19000", "19500", "20000", "20500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03I-VA-IMG-03", "type='dlsPLC.dummy' entity_enabled=True device='VLVCC_01_FINS'", "VLVCC_01_EIP", "8", "08", "0", "500", "21000", "21500", "22000", "22500", "23000", "23500", "3000", "0" }
{ "device", "img", "fins_port", "eip_port", "tagidx", "id", "em", "waveform_nelm", "wave0_addr", "wave1_addr", "wave2_addr", "wave3_addr", "wave4_addr", "wave5_addr", "combined_nelm", "timeout" }
{ "SR03C-VA-FAST-01", "SR03S-VA-IMG-01", "VLVCC_01_FINS", "VLVCC_01_EIP", "1", "01", "0", "500", "0", "500", "1000", "1500", "2000", "2500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03S-VA-IMG-02", "VLVCC_01_FINS", "VLVCC_01_EIP", "2", "02", "0", "500", "3000", "3500", "4000", "4500", "5000", "5500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-01", "VLVCC_01_FINS", "VLVCC_01_EIP", "3", "03", "0", "500", "6000", "6500", "7000", "7500", "8000", "8500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-02", "VLVCC_01_FINS", "VLVCC_01_EIP", "4", "04", "0", "500", "9000", "9500", "10000", "10500", "11000", "11500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-03", "VLVCC_01_FINS", "VLVCC_01_EIP", "5", "05", "0", "500", "12000", "12500", "13000", "13500", "14000", "14500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03A-VA-IMG-04", "VLVCC_01_FINS", "VLVCC_01_EIP", "6", "06", "0", "500", "15000", "15500", "16000", "16500", "17000", "17500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03I-VA-IMG-02", "VLVCC_01_FINS", "VLVCC_01_EIP", "7", "07", "0", "500", "18000", "18500", "19000", "19500", "20000", "20500", "3000", "0" }
{ "SR03C-VA-FAST-01", "SR03I-VA-IMG-03", "VLVCC_01_FINS", "VLVCC_01_EIP", "8", "08", "0", "500", "21000", "21500", "22000", "22500", "23000", "23500", "3000", "0" }
}
16 changes: 8 additions & 8 deletions tests/samples/outputs/motorSim/ioc.subst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ pattern

file "basic_asyn_motor.db" {
pattern
{ "P", "M", "DTYP", "PORT", "ADDR", "DESC", "EGU", "DIR", "VELO", "VMAX", "MRES", "DHLM", "DLLM", "INIT" }
{ "IBEK-MO-TST-01:", "M0", "asynMotor", "type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} '", "0", "Motor 0 for ioc motorSim.ibek.ioc", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "M1", "asynMotor", "type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} '", "1", "Motor 1 {{enclosed in escaped curly braces}} ", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "M2", "asynMotor", "type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} '", "2", "Motor 2", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "M3", "asynMotor", "type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} '", "3", "Motor 3", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "P", "M", "DTYP", "PORT", "ADDR", "DESC", "EGU", "DIR", "VELO", "VMAX", "MRES", "DHLM", "DLLM", "INIT" }
{ "IBEK-MO-TST-01:", "M0", "asynMotor", "controllerOne", "0", "Motor 0 for ioc motorSim.ibek.ioc", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "M1", "asynMotor", "controllerOne", "1", "Motor 1 {{enclosed in escaped curly braces}} ", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "M2", "asynMotor", "controllerOne", "2", "Motor 2", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "M3", "asynMotor", "controllerOne", "3", "Motor 3", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
}

file "basic_cs_asyn_motor.db" {
pattern
{ "P", "CS_NUM", "DTYP", "PORT", "ADDR", "DESC", "EGU", "DIR", "VELO", "VMAX", "MRES", "DHLM", "DLLM", "INIT" }
{ "IBEK-MO-TST-01:", "3", "asynMotor", "type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} '", "1", "CS Motor 1", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "3", "asynMotor", "type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} '", "2", "CS Motor 2", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "P", "CS_NUM", "DTYP", "PORT", "ADDR", "DESC", "EGU", "DIR", "VELO", "VMAX", "MRES", "DHLM", "DLLM", "INIT" }
{ "IBEK-MO-TST-01:", "3", "asynMotor", "controllerOne", "1", "CS Motor 1", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
{ "IBEK-MO-TST-01:", "3", "asynMotor", "controllerOne", "2", "CS Motor 2", "degrees", "0", "10.0", "10.0", ".01", "20000", "-20000", "" }
}

file "simple.pvi.template" {
Expand Down
12 changes: 6 additions & 6 deletions tests/samples/outputs/motorSim/st.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ iocInit


# motorSimCreateAxis(controller_asyn_port_name, axis, axis_description)
motorSimConfigAxis(type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} ', 0, 20000, -20000, 500, 500)
motorSimConfigAxis(controllerOne, 0, 20000, -20000, 500, 500)
# motorSimCreateAxis(controller_asyn_port_name, axis, axis_description)
motorSimConfigAxis(type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} ', 1, 20000, -20000, 500, 500)
motorSimConfigAxis(controllerOne, 1, 20000, -20000, 500, 500)
# motorSimCreateAxis(controller_asyn_port_name, axis, axis_description)
motorSimConfigAxis(type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} ', 2, 20000, -20000, 1500, 1500)
motorSimConfigAxis(controllerOne, 2, 20000, -20000, 1500, 1500)
# motorSimCreateAxis(controller_asyn_port_name, axis, axis_description)
motorSimConfigAxis(type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} ', 3, 20000, -20000, 2500, 2500)
motorSimConfigAxis(controllerOne, 3, 20000, -20000, 2500, 2500)
# motorSimCreateAxis(controller_asyn_port_name, axis, axis_description)
motorSimConfigAxis(type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} ', 1, 20000, -20000, 100, 100)
motorSimConfigAxis(controllerOne, 1, 20000, -20000, 100, 100)
# motorSimCreateAxis(controller_asyn_port_name, axis, axis_description)
motorSimConfigAxis(type='motorSim.simMotorController' entity_enabled=True controllerName='controllerOne' P='IBEK-MO-TST-01:' numAxes=4 port=type='asyn.AsynIP' entity_enabled=True port='192.168.0.55:2002' name='controllerOnePort' input_eos='"\\n"' output_eos='"\\n"' priority=100 noAuto_connect=False noProcessEos=False baud=9600 parity='none' crtscts='N' stop='1' disconnectOnReadTimeout='Y' bits='8' DESC='Simulated Motion Controller testing escaping: {{enclosed in escaped curly braces}} ', 2, 20000, -20000, 100, 100)
motorSimConfigAxis(controllerOne, 2, 20000, -20000, 100, 100)

Loading

0 comments on commit dfc9a87

Please sign in to comment.