summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Morley <chrisinnanaimo@hotmail.com>2008-12-30 18:17:27 +0000
committerChris Morley <chrisinnanaimo@hotmail.com>2008-12-30 18:17:27 +0000
commit7bbae021ccad3ea1d038628130bee88dedd4e2c5 (patch)
tree1eca3dac2899800888256cee0e93fe4cd8c80b6c
parent8967166389b729df017dc91f344d9f2f9366328e (diff)
downloadlinuxcnc-7bbae021ccad3ea1d038628130bee88dedd4e2c5.tar.gz
linuxcnc-7bbae021ccad3ea1d038628130bee88dedd4e2c5.zip
Fix the ladder programs to clean them up of errors and ugly symbol names
Diffstat
-rw-r--r--configs/common/configurable_options/ladder/estop.clp207
-rw-r--r--configs/common/configurable_options/ladder/serialmodbus.clp13
2 files changed, 134 insertions, 86 deletions
diff --git a/configs/common/configurable_options/ladder/estop.clp b/configs/common/configurable_options/ladder/estop.clp
index c4910587c..fa0cf0be5 100644
--- a/configs/common/configurable_options/ladder/estop.clp
+++ b/configs/common/configurable_options/ladder/estop.clp
@@ -1,22 +1,100 @@
_FILES_CLASSICLADDER
+_FILE-rung_1.csv
+#VER=2.0
+#LABEL=Rung 1
+#COMMENT=Stepper Estop Chain
+#PREVRUNG=0
+#NEXTRUNG=2
+0-0-50/0 , 1-0-50/0 , 9-0-50/0 , 9-0-50/1 , 9-0-0/0 , 9-0-0/0 , 9-0-60/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/0
+0-0-0/0 , 2-0-50/1 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-50/2 , 9-0-0/0 , 9-0-0/0 , 0-1-60/1
+0-0-50/0 , 1-0-50/0 , 2-0-50/1 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/1 , 9-0-0/0 , 0-1-60/1
+9-0-0/0 , 1-0-50/0 , 2-0-50/1 , 1-0-60/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 0-1-0/0
+0-0-60/1 , 0-0-0/0 , 0-0-0/0 , 1-1-50/2 , 0-1-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-60/6
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+_/FILE-rung_1.csv
+_FILE-symbols.csv
+#VER=1.0
+%I0,GUI-E,
+%I1,EXT-E,
+%I2,E-RESET,
+%I3,Lube_req,
+%I4,Lube_up,
+%I5, ,
+%I6, ,
+%I7, ,
+%I8, ,
+%I9, ,
+%Q0,EMC-E,
+%Q1,Lube_on,
+%Q2,Lube_low,
+%Q3, ,
+%Q4, ,
+%Q5, ,
+%Q6, ,
+%Q7, ,
+%Q8, ,
+%Q9, ,
+%T0,Time-on,Time lube pump is on
+%T1,Time-off,Time lube pump is off
+%T2,Time-warn,Time before low lube warning
+_/FILE-symbols.csv
+_FILE-rung_2.csv
+#VER=2.0
+#LABEL=
+#COMMENT=Intermittent Lube
+#PREVRUNG=1
+#NEXTRUNG=-1
+9-0-0/0 , 1-0-50/3 , 2-0-0/0 , 99-0-0/0 , 10-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 53-0-60/1
+0-0-0/0 , 0-0-0/0 , 0-1-0/0 , 99-0-0/0 , 99-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 52-0-60/1
+0-0-0/0 , 0-0-0/0 , 2-1-60/1 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 10-0-0/1 , 0-0-60/0 , 0-0-0/0 , 0-0-0/0
+0-0-0/0 , 0-0-0/0 , 0-1-0/0 , 0-0-0/0 , 0-0-0/0 , 99-0-0/0 , 99-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-0/0
+0-0-0/0 , 0-0-0/0 , 1-1-50/4 , 99-0-0/0 , 10-0-0/2 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-60/9
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 99-0-0/0 , 99-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/2
+_/FILE-rung_2.csv
+_FILE-modbusioconf.csv
+#VER=1.0
+_/FILE-modbusioconf.csv
+_FILE-com_params.txt
+MODBUS_MASTER_SERIAL_PORT=
+MODBUS_MASTER_SERIAL_SPEED=9600
+MODBUS_ELEMENT_OFFSET=0
+MODBUS_MASTER_SERIAL_USE_RTS_TO_SEND=0
+MODBUS_MASTER_TIME_INTER_FRAME=100
+MODBUS_MASTER_TIME_OUT_RECEIPT=500
+MODBUS_MASTER_TIME_AFTER_TRANSMIT=0
+MODBUS_DEBUG_LEVEL=0
+MODBUS_MAP_COIL_READ=0
+MODBUS_MAP_COIL_WRITE=0
+MODBUS_MAP_INPUT=0
+MODBUS_MAP_HOLDING=0
+MODBUS_MAP_REGISTER_READ=0
+MODBUS_MAP_REGISTER_WRITE=0
+_/FILE-com_params.txt
+_FILE-timers_iec.csv
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+_/FILE-timers_iec.csv
_FILE-timers.csv
-; Timers :
-; Base(see classicladder.h),Preset
1,10
1,20
0,20
2,1
2,5
+1,0
+1,0
+1,0
+1,0
+1,0
_/FILE-timers.csv
-_FILE-monostables.csv
-; Monostables :
-; Base(see classicladder.h),Preset
-1,10
-1,20
-_/FILE-monostables.csv
_FILE-counters.csv
-; Counters :
-; Preset
0
0
0
@@ -28,18 +106,15 @@ _FILE-counters.csv
0
0
_/FILE-counters.csv
+_FILE-sections.csv
+#VER=1.0
+#NAME000=Prog1
+000,0,-1,1,2,0
+_/FILE-sections.csv
_FILE-arithmetic_expressions.csv
-; Arithmetic expressions :
-; Compare or Operate ones
-
-
-
-
+#VER=2.0
_/FILE-arithmetic_expressions.csv
_FILE-rung_0.csv
-; Rung :
-; all the blocks with the following format :
-; type (see classicladder.h) - ConnectedWithTop - VarType (see classicladder.h) / VarOffset
#VER=2.0
#LABEL=
#COMMENT=
@@ -52,73 +127,37 @@ _FILE-rung_0.csv
0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
_/FILE-rung_0.csv
-_FILE-rung_1.csv
-; Rung :
-; all the blocks with the following format :
-; type (see classicladder.h) - ConnectedWithTop - VarType (see classicladder.h) / VarOffset
-#VER=2.0
-#LABEL=Rung 1
-#COMMENT=Stepper Estop Chain
-#PREVRUNG=0
-#NEXTRUNG=2
-103-0-50/0 , 1-0-50/0 , 9-0-50/0 , 9-0-50/1 , 9-0-0/0 , 9-0-0/0 , 9-0-60/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/0
-103-0-0/0 , 2-0-50/1 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-50/2 , 9-0-0/0 , 9-0-0/0 , 0-1-60/1
-103-0-50/0 , 1-0-50/0 , 2-0-50/1 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/1 , 9-0-0/0 , 0-1-60/1
-9-0-0/0 , 1-0-50/0 , 2-0-50/1 , 1-0-60/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 0-1-0/0
-0-0-60/1 , 0-0-0/0 , 0-0-0/0 , 1-1-50/2 , 0-1-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-60/6
-0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
-_/FILE-rung_1.csv
-_FILE-rung_2.csv
-; Rung :
-; all the blocks with the following format :
-; type (see classicladder.h) - ConnectedWithTop - VarType (see classicladder.h) / VarOffset
-#VER=2.0
-#LABEL=
-#COMMENT=Intermittent Lube
-#PREVRUNG=1
-#NEXTRUNG=-1
-9-0-0/0 , 1-0-50/3 , 2-0-0/0 , 99-0-0/0 , 10-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 53-0-60/1
-0-0-0/0 , 0-0-0/0 , 0-1-0/0 , 99-0-0/0 , 99-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 52-0-60/1
-0-0-0/0 , 0-0-0/0 , 2-1-60/1 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 10-0-0/1 , 0-0-60/0 , 0-0-0/0 , 0-0-0/0
-0-0-0/0 , 0-0-0/0 , 0-1-0/0 , 0-0-0/0 , 0-0-0/0 , 99-0-0/0 , 99-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-0/0
-0-0-0/0 , 0-0-0/0 , 1-1-50/4 , 99-0-0/0 , 10-0-0/2 , 103-0-0/0 , 103-0-0/0 , 103-0-0/0 , 103-0-0/0 , 103-0-60/9
-0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 99-0-0/0 , 99-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/2
-_/FILE-rung_2.csv
-_FILE-sections.csv
-; Sections
+_FILE-ioconf.csv
#VER=1.0
-#NAME000=Prog1
-000,0,-1,1,2,0
-_/FILE-sections.csv
+_/FILE-ioconf.csv
+_FILE-monostables.csv
+1,10
+1,20
+1,0
+1,0
+1,0
+1,0
+1,0
+1,0
+1,0
+1,0
+_/FILE-monostables.csv
_FILE-sequential.csv
-; Sequential
#VER=1.0
_/FILE-sequential.csv
-_FILE-ioconf.csv
-; I/O Configuration
-_/FILE-ioconf.csv
-_FILE-symbols.csv
-; Symbols
-#VER=1.0
-%I0,CLinB0,Auto named bit-in pin
-%I1,CLinB1,Auto named bit-in pin
-%I2,CLinB2,Auto named bit-in pin
-%I3,CLinB3,Auto named bit-in pin
-%I4,CLinB4,Auto named bit-in pin
-%I5,CLinB5,Auto named bit-in pin
-%I6,CLinB6,Auto named bit-in pin
-%I7,CLinB7,Auto named bit-in pin
-%I8,CLinB8,Auto named bit-in pin
-%I9,CLinB9,Auto named bit-in pin
-%Q0,CLoutB0,Auto named bit-out pin
-%Q1,CLoutB1,Auto named bit-out pin
-%Q2,CLoutB2,Auto named bit-out pin
-%Q3,CLoutB3,Auto named bit-out pin
-%Q4,CLoutB4,Auto named bit-out pin
-%Q5,CLoutB5,Auto named bit-out pin
-%Q6,CLoutB6,Auto named bit-out pin
-%Q7,CLoutB7,Auto named bit-out pin
-%Q8,CLoutB8,Auto named bit-out pin
-%Q9,CLoutB9,Auto named bit-out pin
-_/FILE-symbols.csv
+_FILE-general.txt
+PERIODIC_REFRESH=50
+SIZE_NBR_RUNGS=100
+SIZE_NBR_BITS=500
+SIZE_NBR_WORDS=100
+SIZE_NBR_TIMERS=10
+SIZE_NBR_MONOSTABLES=10
+SIZE_NBR_COUNTERS=10
+SIZE_NBR_TIMERS_IEC=10
+SIZE_NBR_PHYS_INPUTS=15
+SIZE_NBR_PHYS_OUTPUTS=15
+SIZE_NBR_ARITHM_EXPR=100
+SIZE_NBR_SECTIONS=10
+SIZE_NBR_SYMBOLS=100
+_/FILE-general.txt
_/FILES_CLASSICLADDER
diff --git a/configs/common/configurable_options/ladder/serialmodbus.clp b/configs/common/configurable_options/ladder/serialmodbus.clp
index 64104c329..e12e4b1c6 100644
--- a/configs/common/configurable_options/ladder/serialmodbus.clp
+++ b/configs/common/configurable_options/ladder/serialmodbus.clp
@@ -1,6 +1,9 @@
_FILES_CLASSICLADDER
_FILE-symbols.csv
#VER=1.0
+%E0,Mod_Error,modbus com error
+%I0,EXT_error,
+%E1,INT_error,User error flag
_/FILE-symbols.csv
_FILE-modbusioconf.csv
#VER=1.0
@@ -16,6 +19,12 @@ MODBUS_MASTER_TIME_INTER_FRAME=200
MODBUS_MASTER_TIME_OUT_RECEIPT=500
MODBUS_MASTER_TIME_AFTER_TRANSMIT=0
MODBUS_DEBUG_LEVEL=1
+MODBUS_MAP_COIL_READ=0
+MODBUS_MAP_COIL_WRITE=0
+MODBUS_MAP_INPUT=0
+MODBUS_MAP_HOLDING=0
+MODBUS_MAP_REGISTER_READ=0
+MODBUS_MAP_REGISTER_WRITE=0
_/FILE-com_params.txt
_FILE-timers_iec.csv
1,0,0
@@ -68,8 +77,8 @@ _FILE-rung_0.csv
#PREVRUNG=0
#NEXTRUNG=1
0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
-1-0-50/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/0
-0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+1-0-50/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-70/1
+1-0-70/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 16:01:43 +0000