diff --git a/bin b/bin index b0fcdae..ff492a8 160000 --- a/bin +++ b/bin @@ -1 +1 @@ -Subproject commit b0fcdaea35529677cbaaefd809dec57004febf5b +Subproject commit ff492a8310158b23d7d1e7e05a8f62a4a21e52b0 diff --git a/docs/statistics/devices_total.svg b/docs/statistics/devices_total.svg index 2ebaa15..68643d7 100644 --- a/docs/statistics/devices_total.svg +++ b/docs/statistics/devices_total.svg @@ -5,6 +5,6 @@ - 46 + 47 diff --git a/docs/statistics/lines_total.svg b/docs/statistics/lines_total.svg index d87a9c5..95efc65 100644 --- a/docs/statistics/lines_total.svg +++ b/docs/statistics/lines_total.svg @@ -2,9 +2,9 @@ - + - 89 + 92 diff --git a/docs/statistics/tags_total.svg b/docs/statistics/tags_total.svg index baf8124..fcf7ba3 100644 --- a/docs/statistics/tags_total.svg +++ b/docs/statistics/tags_total.svg @@ -5,6 +5,6 @@ - 159 + 182 diff --git a/main.devices.lua b/main.devices.lua deleted file mode 100644 index 97c86cb..0000000 --- a/main.devices.lua +++ /dev/null @@ -1,101 +0,0 @@ ---version = 1 ---Eplanner version = 2022.2.8082.20736 ---PAC_name = 'T1-PLCnext-Demo' ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -system = system or {} -system.init_dev_names = function() - V1 = V('V1') - LS1 = LS('LS1') - LS2 = LS('LS2') - TE1 = TE('TE1') - GS1 = GS('GS1') - QT1 = QT('QT1') - A2HL1 = HL('A2HL1') - A2HL2 = HL('A2HL2') - A2HL3 = HL('A2HL3') - A2HL4 = HL('A2HL4') - A2HL5 = HL('A2HL5') - A2HL6 = HL('A2HL6') - A2HL7 = HL('A2HL7') - A2HL8 = HL('A2HL8') - A5HL1 = HL('A5HL1') - A5HL2 = HL('A5HL2') - A5HL3 = HL('A5HL3') - A5HL4 = HL('A5HL4') - A5HL5 = HL('A5HL5') - A5HL6 = HL('A5HL6') - A5HL7 = HL('A5HL7') - A5HL8 = HL('A5HL8') - A2DI1 = DI('A2DI1') - A2DI2 = DI('A2DI2') - A2DI3 = DI('A2DI3') - A2DI4 = DI('A2DI4') - A2DI5 = DI('A2DI5') - A2DI6 = DI('A2DI6') - A2DI7 = DI('A2DI7') - A2DI8 = DI('A2DI8') - A5DI1 = DI('A5DI1') - A5DI2 = DI('A5DI2') - A5DI3 = DI('A5DI3') - A5DI4 = DI('A5DI4') - A5DI5 = DI('A5DI5') - A5DI6 = DI('A5DI6') - A5DI7 = DI('A5DI7') - A5DI8 = DI('A5DI8') - A3AI1 = AI('A3AI1') - A3AI2 = AI('A3AI2') - A3AO1 = AO('A3AO1') - A3AO2 = AO('A3AO2') - PT1 = PT('PT1') - PT2 = PT('PT2') - F1 = F('F1') - HLA1 = HLA('HLA1') - - __V1 = DEVICE( 0 ) - __LS1 = DEVICE( 1 ) - __LS2 = DEVICE( 2 ) - __TE1 = DEVICE( 3 ) - __GS1 = DEVICE( 4 ) - __QT1 = DEVICE( 5 ) - __A2HL1 = DEVICE( 6 ) - __A2HL2 = DEVICE( 7 ) - __A2HL3 = DEVICE( 8 ) - __A2HL4 = DEVICE( 9 ) - __A2HL5 = DEVICE( 10 ) - __A2HL6 = DEVICE( 11 ) - __A2HL7 = DEVICE( 12 ) - __A2HL8 = DEVICE( 13 ) - __A5HL1 = DEVICE( 14 ) - __A5HL2 = DEVICE( 15 ) - __A5HL3 = DEVICE( 16 ) - __A5HL4 = DEVICE( 17 ) - __A5HL5 = DEVICE( 18 ) - __A5HL6 = DEVICE( 19 ) - __A5HL7 = DEVICE( 20 ) - __A5HL8 = DEVICE( 21 ) - __A2DI1 = DEVICE( 22 ) - __A2DI2 = DEVICE( 23 ) - __A2DI3 = DEVICE( 24 ) - __A2DI4 = DEVICE( 25 ) - __A2DI5 = DEVICE( 26 ) - __A2DI6 = DEVICE( 27 ) - __A2DI7 = DEVICE( 28 ) - __A2DI8 = DEVICE( 29 ) - __A5DI1 = DEVICE( 30 ) - __A5DI2 = DEVICE( 31 ) - __A5DI3 = DEVICE( 32 ) - __A5DI4 = DEVICE( 33 ) - __A5DI5 = DEVICE( 34 ) - __A5DI6 = DEVICE( 35 ) - __A5DI7 = DEVICE( 36 ) - __A5DI8 = DEVICE( 37 ) - __A3AI1 = DEVICE( 38 ) - __A3AI2 = DEVICE( 39 ) - __A3AO1 = DEVICE( 40 ) - __A3AO2 = DEVICE( 41 ) - __PT1 = DEVICE( 42 ) - __PT2 = DEVICE( 43 ) - __F1 = DEVICE( 44 ) - __HLA1 = DEVICE( 45 ) -end diff --git a/main.io.lua b/main.io.lua index 3a233ff..531ed9d 100644 --- a/main.io.lua +++ b/main.io.lua @@ -1,5 +1,5 @@ --version = 1 ---Eplanner version = 2022.2.8082.20736 +--Eplanner version = 2022.8.8251.20557 ------------------------------------------------------------------------------ PAC_name = 'T1-PLCnext-Demo' PAC_id = '28204' @@ -126,7 +126,26 @@ devices = descr = '', dtype = 6, subtype = 2, -- GS_VIRT - article = 'PXC.1191993', + article = 'IFM.LMT100', + }, + + { + name = 'FQT1', + descr = '', + dtype = 7, + subtype = 5, -- FQT_IOLINK + article = 'FES.542582', + AI = + { + { + node = 1, + offset = 40, + physical_port = 12, + logical_port = 4, + module_offset = 36 + }, + }, + par = {0 --[[P_C0]], 5 --[[P_DT]], 0 --[[P_ERR_MIN_FLOW]] } }, { @@ -858,8 +877,28 @@ devices = name = 'F1', descr = '', dtype = 19, - subtype = 2, -- F_VIRT - article = 'IFM.LDL100', + subtype = 1, -- F + article = 'IFM.LMT100', + AO = + { + { + node = 1, + offset = 20, + physical_port = 73, + logical_port = 8, + module_offset = 4 + }, + }, + AI = + { + { + node = 1, + offset = 20, + physical_port = 73, + logical_port = 8, + module_offset = 4 + }, + }, }, { diff --git a/prg.lua b/prg.lua index 80fc94b..0b1c01b 100644 --- a/prg.lua +++ b/prg.lua @@ -1,5 +1,5 @@ --version = 1 ---Eplanner version = 2022.2.8082.20736 +--Eplanner version = 2022.8.8251.20557 --PAC_name = 'T1-PLCnext-Demo' ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ @@ -15,6 +15,7 @@ local prg = LS2 = LS('LS2'), TE1 = TE('TE1'), GS1 = GS('GS1'), + FQT1 = FQT('FQT1'), QT1 = QT('QT1'), A2HL1 = HL('A2HL1'), A2HL2 = HL('A2HL2'),