diff --git a/eastron/SDM120.class.php b/eastron/SDM120.class.php index e6ae0dbd184..be6dd493d37 100644 --- a/eastron/SDM120.class.php +++ b/eastron/SDM120.class.php @@ -58,7 +58,7 @@ class eastron_SDM120 extends sens2_ioport_Abstract /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ diff --git a/hwgroup/HWgSTE.class.php b/hwgroup/HWgSTE.class.php index e44bd8bfdfc..9c92aa0a31a 100644 --- a/hwgroup/HWgSTE.class.php +++ b/hwgroup/HWgSTE.class.php @@ -35,7 +35,7 @@ class hwgroup_HWgSTE extends sens2_ProtoDriver /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -52,7 +52,7 @@ public function prepareConfigForm($form) /** * Прочита стойностите от сензорните входове * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param array $inputs * @param array $config diff --git a/satec/PM175.class.php b/satec/PM175.class.php index bbcc4fb5dd2..f6ca6394b92 100644 --- a/satec/PM175.class.php +++ b/satec/PM175.class.php @@ -43,7 +43,7 @@ class satec_PM175 extends sens2_ProtoDriver /** * Информация за входните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -60,7 +60,7 @@ public function getInputPorts($config = null) /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ diff --git a/sens2/DriverIntf.class.php b/sens2/ControllerIntf.class.php similarity index 98% rename from sens2/DriverIntf.class.php rename to sens2/ControllerIntf.class.php index c5f0c44492f..7be9e84d217 100644 --- a/sens2/DriverIntf.class.php +++ b/sens2/ControllerIntf.class.php @@ -15,8 +15,11 @@ * @since v 0.1 * @title Интерфейс на драйвер на I/O контролер */ -class sens2_DriverIntf +class sens2_ControllerIntf { + + public $oldClassName = 'sens2_DriverIntf'; + /** * Информация за входните портове на устройството * diff --git a/sens2/Controllers.class.php b/sens2/Controllers.class.php index fe863b7df98..250243ccd74 100644 --- a/sens2/Controllers.class.php +++ b/sens2/Controllers.class.php @@ -113,7 +113,7 @@ class sens2_Controllers extends core_Master public function description() { $this->FLD('name', 'identifier(64,utf8)', 'caption=Наименование, mandatory,notConfig'); - $this->FLD('driver', 'class(interface=sens2_DriverIntf, allowEmpty, select=title)', 'caption=Драйвер,silent,mandatory,notConfig,placeholder=Тип на контролера'); + $this->FLD('driver', 'class(interface=sens2_ControllerIntf, allowEmpty, select=title)', 'caption=Драйвер,silent,mandatory,notConfig,placeholder=Тип на контролера'); $this->FLD('config', 'blob(serialize, compress)', 'caption=Конфигурация,input=none,single=none,column=none'); $this->FLD('state', 'enum(active=Активен, closed=Спрян)', 'caption=Състояние,input=none'); $this->FLD('persistentState', 'blob(serialize)', 'caption=Персистентно състояние,input=none,single=none,column=none'); diff --git a/sens2/MockupDrv.class.php b/sens2/MockupDrv.class.php index 0f54f2f8512..9b1bdfaa92a 100644 --- a/sens2/MockupDrv.class.php +++ b/sens2/MockupDrv.class.php @@ -26,7 +26,7 @@ class sens2_MockupDrv extends sens2_ProtoDriver /** * Интерфейси, поддържани от всички наследници */ - public $interfaces = 'sens2_DriverIntf'; + public $interfaces = 'sens2_ControllerIntf'; public function getInputPorts($config = null) diff --git a/sens2/ProtoDriver.class.php b/sens2/ProtoDriver.class.php index 18e13be4361..72d272d3c25 100644 --- a/sens2/ProtoDriver.class.php +++ b/sens2/ProtoDriver.class.php @@ -25,13 +25,13 @@ class sens2_ProtoDriver /** * Интерфейси, поддържани от всички наследници */ - public $interfaces = 'sens2_DriverIntf'; + public $interfaces = 'sens2_ControllerIntf'; /** * Информация за входните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -52,7 +52,7 @@ public function getInputPorts($config = null) /** * Информация за изходните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -73,7 +73,7 @@ public function getOutputPorts() /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -85,7 +85,7 @@ public function prepareConfigForm($form) /** * Проверява след субмитване формата с настройки на контролера * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ diff --git a/sens2/ServMon.class.php b/sens2/ServMon.class.php index fe7324edb96..0149da4138b 100644 --- a/sens2/ServMon.class.php +++ b/sens2/ServMon.class.php @@ -26,7 +26,7 @@ class sens2_ServMon extends sens2_ProtoDriver /** * Интерфейси, поддържани от всички наследници */ - public $interfaces = 'sens2_DriverIntf'; + public $interfaces = 'sens2_ControllerIntf'; public function getInputPorts($config = null) diff --git a/teracom/TCW121.class.php b/teracom/TCW121.class.php index d182fd10a4d..cfdc110202b 100644 --- a/teracom/TCW121.class.php +++ b/teracom/TCW121.class.php @@ -49,7 +49,7 @@ class teracom_TCW121 extends sens2_ProtoDriver /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -68,7 +68,7 @@ public function prepareConfigForm($form) /** * Прочита стойностите от сензорните входове * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param array $inputs * @param array $config diff --git a/teracom/TCW122B.class.php b/teracom/TCW122B.class.php index a0961ce6ef1..9751e21c2b2 100644 --- a/teracom/TCW122B.class.php +++ b/teracom/TCW122B.class.php @@ -49,7 +49,7 @@ class teracom_TCW122B extends sens2_ProtoDriver /** * Информация за входните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -66,7 +66,7 @@ public function getInputPorts($config = null) /** * Информация за изходните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -83,7 +83,7 @@ public function getOutputPorts() /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -101,7 +101,7 @@ public function prepareConfigForm($form) /** * Прочита стойностите от сензорните входове * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param array $inputs * @param array $config diff --git a/teracom/TCW122BCM.class.php b/teracom/TCW122BCM.class.php index 9661f7b2b43..893718b32ca 100644 --- a/teracom/TCW122BCM.class.php +++ b/teracom/TCW122BCM.class.php @@ -49,7 +49,7 @@ class teracom_TCW122BCM extends sens2_ProtoDriver /** * Информация за входните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -66,7 +66,7 @@ public function getInputPorts($config = null) /** * Информация за изходните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -83,7 +83,7 @@ public function getOutputPorts() /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -99,7 +99,7 @@ public function prepareConfigForm($form) /** * Прочита стойностите от сензорните входове * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param array $inputs * @param array $config diff --git a/teracom/TCW181BCM.class.php b/teracom/TCW181BCM.class.php index 3c7b8ab6e78..dcc25b239d3 100644 --- a/teracom/TCW181BCM.class.php +++ b/teracom/TCW181BCM.class.php @@ -47,7 +47,7 @@ class teracom_TCW181BCM extends sens2_ProtoDriver /** * Информация за входните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -64,7 +64,7 @@ public function getInputPorts($config = null) /** * Информация за изходните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -81,7 +81,7 @@ public function getOutputPorts() /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -97,7 +97,7 @@ public function prepareConfigForm($form) /** * Прочита стойностите от сензорните входове * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param array $inputs * @param array $config diff --git a/tsm/TSM.class.php b/tsm/TSM.class.php index 572f339e233..a2d892ca4e8 100644 --- a/tsm/TSM.class.php +++ b/tsm/TSM.class.php @@ -57,7 +57,7 @@ public function prepareConfigForm($form) /** * Прочита стойностите от сензорните входове * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param array $inputs * @param array $config diff --git a/unipi/Neuron.class.php b/unipi/Neuron.class.php index 5a05d13f105..0df7f90e56a 100644 --- a/unipi/Neuron.class.php +++ b/unipi/Neuron.class.php @@ -22,7 +22,7 @@ class unipi_Neuron extends sens2_ProtoDriver /** * Интерфейси, поддържани от всички наследници */ - public $interfaces = 'sens2_DriverIntf'; + public $interfaces = 'sens2_ControllerIntf'; /** @@ -68,7 +68,7 @@ class unipi_Neuron extends sens2_ProtoDriver /** * Информация за входните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -83,7 +83,7 @@ public function getInputPorts($config = null) /** * Информация за изходните портове на устройството * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @return array */ @@ -102,7 +102,7 @@ public function getOutputPorts($config = null) /** * Подготвя форма с настройки на контролера, като добавя полета с $form->FLD(....) * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */ @@ -122,7 +122,7 @@ public function prepareConfigForm($form) /** * Проверява след субмитване формата с настройки на контролера * - * @see sens2_DriverIntf + * @see sens2_ControllerIntf * * @param core_Form */