revpi/revpicommander
1
0
Fork 0
mirror of https://github.com/naruxde/revpicommander.git synced 2025-11-09 00:53:53 +01:00
Code Issues Packages Releases Wiki Activity

Add option for software watchdog and driver reset action

Browse Source
This commit is contained in:
Sven Sager
2020-10-13 20:02:37 +02:00
parent 5eafb2a125
commit 146dd74c95
7 changed files with 309 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
include/ui_dev/revpioption.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>452</width>
<height>503</height>
<width>416</width>
<height>522</height>
</rect>
</property>
<property name="windowTitle">
@@ -27,23 +27,6 @@
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="sbx_autoreloaddelay">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>120</number>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="cbx_zeroonexit">
<property name="text">
<string>... sucessfully without error</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="QCheckBox" name="cbx_zeroonerror">
<property name="text">
@@ -58,10 +41,29 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="cbx_autoreload">
<item row="8" column="1" colspan="2">
<widget class="QComboBox" name="cbb_reset_driver_action">
<item>
<property name="text">
<string>Do nothing</string>
</property>
</item>
<item>
<property name="text">
<string>Restart after piCtory changed</string>
</property>
</item>
<item>
<property name="text">
<string>Always restart the PLC program</string>
</property>
</item>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="lbl_reset_driver_action">
<property name="text">
<string>Restart PLC program after exit or crash</string>
<string>Driver reset action:</string>
</property>
</widget>
</item>
@@ -72,9 +74,6 @@
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<widget class="QLineEdit" name="txt_replace_io"/>
</item>
<item row="6" column="1" colspan="2">
<widget class="QComboBox" name="cbb_replace_io">
<item>
@@ -99,6 +98,13 @@
</item>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="cbx_zeroonexit">
<property name="text">
<string>... sucessfully without error</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="lbl_plc_delay">
<property name="text">
@@ -106,6 +112,33 @@
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="sbx_autoreloaddelay">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>120</number>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="cbx_autoreload">
<property name="text">
<string>Restart PLC program after exit or crash</string>
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<widget class="QLineEdit" name="txt_replace_io"/>
</item>
<item row="9" column="0" colspan="3">
<widget class="QLabel" name="lbl_lbl_reset_driver_action">
<property name="text">
<string>PLC program behavior after piCtory driver reset clicked</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

57
include/ui_dev/revpiprogram.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>488</width>
<height>500</height>
<width>400</width>
<height>501</height>
</rect>
</property>
<property name="windowTitle">
@@ -20,15 +20,8 @@
<string>PLC program</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="1">
<widget class="QRadioButton" name="rbn_pythonversion_2">
<property name="text">
<string>Python 2</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="txt_plcarguments"/>
<item row="1" column="0" colspan="3">
<widget class="QComboBox" name="cbb_plcprogram"/>
</item>
<item row="3" column="2">
<widget class="QRadioButton" name="rbn_pythonversion_3">
@@ -37,13 +30,6 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="lbl_plcprogram">
<property name="text">
<string>Python PLC start program:</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QCheckBox" name="cbx_plcworkdir_set_uid">
<property name="text">
@@ -51,8 +37,12 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QComboBox" name="cbb_plcprogram"/>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="lbl_plcprogram">
<property name="text">
<string>Python PLC start program:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_pythonversion">
@@ -61,6 +51,13 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QRadioButton" name="rbn_pythonversion_2">
<property name="text">
<string>Python 2</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_plcarguments">
<property name="text">
@@ -68,6 +65,26 @@
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="txt_plcarguments"/>
</item>
<item row="5" column="2">
<widget class="QSpinBox" name="sbx_plcprogram_watchdog">
<property name="suffix">
<string> sec.</string>
</property>
<property name="maximum">
<number>600</number>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="lbl_plcprogram_watchdog">
<property name="text">
<string>Software watchdog (0=disabled):</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>