Merge branch 'master' of git.eter:/projects/asu/uniset
Conflicts:
.gear/rules
AUTHORS
IDL/Makefile.am
IDL/Processes/IOController_i.idl
IDL/Processes/Makefile.am
IDL/UniSetTypes/Makefile.am
IDL/UniSetTypes/UniSetObject_i.idl
IDL/UniSetTypes/UniSetTypes_i.idl
Makefile.am
TODO
Utilities/Admin/Makefile.am
Utilities/Admin/admin.cc
Utilities/Admin/admin.sh
Utilities/Admin/create_links.sh
Utilities/MBTester/MBSlave.cc
Utilities/MBTester/MBSlave.h
Utilities/MBTester/MBTCPServer.cc
Utilities/MBTester/MBTCPServer.h
Utilities/MBTester/Makefile.am
Utilities/MBTester/mbrtuslave.cc
Utilities/MBTester/mbrtutester.cc
Utilities/MBTester/mbslave.cc
Utilities/MBTester/mbtcpserver.cc
Utilities/MBTester/mbtcptester.cc
Utilities/Makefile.am
Utilities/NullController/Makefile.am
Utilities/NullController/NullController.cc
Utilities/NullController/NullController.h
Utilities/NullController/main.cc
Utilities/NullController/start_fg.sh
Utilities/NullController/stop.sh
Utilities/SImitator/Makefile.am
Utilities/SImitator/create_links.sh
Utilities/SImitator/main.cc
Utilities/SImitator/start_fg.sh
Utilities/SMonit/Makefile.am
Utilities/SMonit/smonitor.cc
Utilities/SMonit/start_fg.sh
Utilities/SMonit/stop.sh
Utilities/SViewer-text/Makefile.am
Utilities/SViewer-text/main.cc
Utilities/SViewer-text/start_fg.sh
Utilities/SViewer-text/stop.sh
Utilities/codegen/Makefile.am
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
Utilities/codegen/ctl-cpp-cc-alone.xsl
Utilities/codegen/ctl-cpp-cc-ask.xsl
Utilities/codegen/ctl-cpp-cc.xsl
Utilities/codegen/ctl-cpp-common.xsl
Utilities/codegen/ctl-cpp-h-alone.xsl
Utilities/codegen/ctl-cpp-h.xsl
Utilities/codegen/ctl-cpp-main-alone.xsl
Utilities/codegen/ctl-cpp-main.xsl
Utilities/codegen/skel-main.cc
Utilities/codegen/skel.cc
Utilities/codegen/skel.h
Utilities/codegen/tests/Makefile.am
Utilities/codegen/tests/TestGen.cc
Utilities/codegen/tests/TestGen.h
Utilities/codegen/tests/TestGenAlone.cc
Utilities/codegen/tests/TestGenAlone.h
Utilities/codegen/tests/create_links.sh
Utilities/codegen/tests/start_fg.sh
Utilities/codegen/tests/testgen.src.xml
Utilities/scripts/Makefile.am
conf/release_helper.sh
conf/test.xml
configure.ac
docs/DocPages/Concept.dox
docs/DocPages/Configuration.dox
docs/DocPages/Services.dox
docs/DocPages/commonpage.dox
extensions/DBServer-MySQL/DBServer_MySQL.cc
extensions/DBServer-MySQL/DBServer_MySQL.h
extensions/DBServer-MySQL/Makefile.am
extensions/DBServer-MySQL/create_links.sh
extensions/DBServer-MySQL/main.cc
extensions/DBServer-MySQL/start_fg.sh
extensions/DBServer-SQLite/DBServer_SQLite.cc
extensions/DBServer-SQLite/DBServer_SQLite.h
extensions/DBServer-SQLite/Makefile.am
extensions/DBServer-SQLite/SQLiteInterface.cc
extensions/DBServer-SQLite/SQLiteInterface.h
extensions/DBServer-SQLite/main.cc
extensions/DBServer-SQLite/start_fg.sh
extensions/DBServer-SQLite/test.cc
extensions/IOControl/ComediInterface.cc
extensions/IOControl/ComediInterface.h
extensions/IOControl/IOControl.cc
extensions/IOControl/IOControl.h
extensions/IOControl/Makefile.am
extensions/IOControl/create_links.sh
extensions/IOControl/iocalibr.cc
extensions/IOControl/iocontrol.cc
extensions/IOControl/iotest.cc
extensions/IOControl/start_fg.sh
extensions/LogicProcessor/Element.cc
extensions/LogicProcessor/Element.h
extensions/LogicProcessor/LProcessor.cc
extensions/LogicProcessor/LProcessor.h
extensions/LogicProcessor/Makefile.am
extensions/LogicProcessor/PassiveLProcessor.cc
extensions/LogicProcessor/PassiveLProcessor.h
extensions/LogicProcessor/Schema.cc
extensions/LogicProcessor/Schema.h
extensions/LogicProcessor/SchemaXML.cc
extensions/LogicProcessor/TAND.cc
extensions/LogicProcessor/TDelay.cc
extensions/LogicProcessor/TDelay.h
extensions/LogicProcessor/TNOT.cc
extensions/LogicProcessor/TOR.cc
extensions/LogicProcessor/create_links.sh
extensions/LogicProcessor/logicproc.cc
extensions/LogicProcessor/plogicproc.cc
extensions/LogicProcessor/start_fg.sh
extensions/LogicProcessor/start_fg_plogic.sh
extensions/Makefile.am
extensions/ModbusMaster/MBExchange.cc
extensions/ModbusMaster/MBExchange.h
extensions/ModbusMaster/MBTCPMaster.cc
extensions/ModbusMaster/MBTCPMaster.h
extensions/ModbusMaster/MBTCPMultiMaster.cc
extensions/ModbusMaster/MBTCPMultiMaster.h
extensions/ModbusMaster/Makefile.am
extensions/ModbusMaster/RTUExchange.cc
extensions/ModbusMaster/RTUExchange.h
extensions/ModbusMaster/RTUStorage.cc
extensions/ModbusMaster/RTUStorage.h
extensions/ModbusMaster/main.cc
extensions/ModbusMaster/mtr-conv.cc
extensions/ModbusMaster/mtr-read.cc
extensions/ModbusMaster/mtr-setup.cc
extensions/ModbusMaster/multi-main.cc
extensions/ModbusMaster/rtuexchange.cc
extensions/ModbusMaster/rtustate.cc
extensions/ModbusMaster/start_fg_mbrtu.sh
extensions/ModbusMaster/start_fg_mbtcp.sh
extensions/ModbusMaster/start_fg_mbtcpmulti.sh
extensions/ModbusMaster/stop.sh
extensions/ModbusMaster/uniset-start.sh
extensions/ModbusMaster/vtconv.cc
extensions/ModbusSlave/MBSlave.cc
extensions/ModbusSlave/MBSlave.h
extensions/ModbusSlave/Makefile.am
extensions/ModbusSlave/create_links.sh
extensions/ModbusSlave/mbslave.cc
extensions/ModbusSlave/start_fg.sh
extensions/ModbusSlave/start_tcp2_fg.sh
extensions/ModbusSlave/start_tcp_fg.sh
extensions/ModbusSlave/start_tcp_fg2.sh
extensions/RRDServer/Makefile.am
extensions/RRDServer/RRDServer.cc
extensions/RRDServer/RRDServer.h
extensions/RRDServer/create_links.sh
extensions/RRDServer/main.cc
extensions/RRDServer/start_fg.sh
extensions/SMDBServer/Makefile.am
extensions/SMDBServer/SMDBServer.cc
extensions/SMDBServer/SMDBServer.h
extensions/SMDBServer/create_links.sh
extensions/SMDBServer/main.cc
extensions/SMDBServer/start_fg.sh
extensions/SMViewer/Makefile.am
extensions/SMViewer/SMViewer.cc
extensions/SMViewer/SMViewer.h
extensions/SMViewer/main.cc
extensions/SharedMemory/Makefile.am
extensions/SharedMemory/SharedMemory.cc
extensions/SharedMemory/SharedMemory.h
extensions/SharedMemory/create_links.sh
extensions/SharedMemory/smemory.cc
extensions/SharedMemory/start_fg.sh
extensions/SharedMemoryPlus/Makefile.am
extensions/SharedMemoryPlus/smemory-plus.cc
extensions/SharedMemoryPlus/start_fg.sh
extensions/SharedMemoryPlus/stop.sh
extensions/UNetUDP/Makefile.am
extensions/UNetUDP/UDPPacket.cc
extensions/UNetUDP/UDPPacket.h
extensions/UNetUDP/UNetExchange.cc
extensions/UNetUDP/UNetExchange.h
extensions/UNetUDP/UNetReceiver.cc
extensions/UNetUDP/UNetReceiver.h
extensions/UNetUDP/UNetSender.cc
extensions/UNetUDP/UNetSender.h
extensions/UNetUDP/start_fg.sh
extensions/UNetUDP/stop.sh
extensions/UNetUDP/unet-udp-tester.cc
extensions/UNetUDP/unetexchange.cc
extensions/UNetUDP/uniset-functions.sh
extensions/UNetUDP/uniset-start.sh
extensions/UniNetwork/Makefile.am
extensions/UniNetwork/UniExchange.cc
extensions/UniNetwork/UniExchange.h
extensions/UniNetwork/create_links.sh
extensions/UniNetwork/start_fg.sh
extensions/UniNetwork/uninet.cc
extensions/include/Calibration.h
extensions/include/DigitalFilter.h
extensions/include/Extensions.h
extensions/include/IOBase.h
extensions/include/MTR.h
extensions/include/PID.h
extensions/include/SMInterface.h
extensions/include/SingleProcess.h
extensions/include/UObject_SK.h
extensions/include/VTypes.h
extensions/lib/Calibration.cc
extensions/lib/DigitalFilter.cc
extensions/lib/Extensions.cc
extensions/lib/IOBase.cc
extensions/lib/MTR.cc
extensions/lib/Makefile.am
extensions/lib/PID.cc
extensions/lib/SMInterface.cc
extensions/lib/SingleProcess.cc
extensions/lib/UObject_SK.cc
extensions/lib/VTypes.cc
extensions/tests/Makefile.am
extensions/tests/calibration.cc
include/CallBackTimer.h
include/ComPort.h
include/ComPort485F.h
include/Configuration.h
include/DBServer.h
include/Debug.h
include/DebugStream.h
include/DelayTimer.h
include/Exceptions.h
include/HourGlass.h
include/IOController.h
include/IONotifyController.h
include/IONotifyController_LT.h
include/IORFile.h
include/LT_Object.h
include/Makefile.am
include/MessageType.h
include/Mutex.h
include/NCRestorer.h
include/ORepHelpers.h
include/ObjectIndex.h
include/ObjectIndex_Array.h
include/ObjectIndex_XML.h
include/ObjectIndex_idXML.h
include/ObjectRepository.h
include/ObjectRepositoryFactory.h
include/OmniThreadCreator.h
include/PassiveObject.h
include/PassiveTimer.h
include/ProxyManager.h
include/Pulse.h
include/Restorer.h
include/RunLock.h
include/SMonitor.h
include/SViewer.h
include/ThreadCreator.h
include/Trigger.h
include/TriggerAND.h
include/TriggerOR.h
include/TriggerOutput.h
include/UniSetObject.h
include/UniSetObject_LT.h
include/UniSetTypes.h
include/UniXML.h
include/WDTInterface.h
include/modbus/Makefile.am
include/modbus/ModbusClient.h
include/modbus/ModbusHelpers.h
include/modbus/ModbusRTUErrors.h
include/modbus/ModbusRTUMaster.h
include/modbus/ModbusRTUSlave.h
include/modbus/ModbusRTUSlaveSlot.h
include/modbus/ModbusServer.h
include/modbus/ModbusServerSlot.h
include/modbus/ModbusTCPCore.h
include/modbus/ModbusTCPMaster.h
include/modbus/ModbusTCPServer.h
include/modbus/ModbusTCPServerSlot.h
include/modbus/ModbusTypes.h
lib/Makefile.am
python/examples/start_fg_UC.sh
python/lib/Makefile.am
python/lib/UGlobal.py
python/lib/UInterface.py
python/lib/__init__.py
python/lib/pyUniSet/Makefile.am
python/lib/pyUniSet/UConnector.cc
python/lib/pyUniSet/UConnector.h
python/lib/pyUniSet/UConnector.i
python/lib/pyUniSet/UConnector_wrap.cxx
python/lib/pyUniSet/UExceptions.h
python/lib/pyUniSet/UExceptions_wrap.cxx
python/lib/pyUniSet/UInterface.i
python/lib/pyUniSet/UInterface_wrap.cxx
python/lib/pyUniSet/UModbus.cc
python/lib/pyUniSet/UModbus.h
python/lib/pyUniSet/UModbus.i
python/lib/pyUniSet/UModbus_wrap.cxx
python/lib/pyUniSet/UTypes.h
python/lib/pyUniSet/pyUConnector.py
python/lib/pyUniSet/pyUExceptions.py
python/lib/pyUniSet/pyUModbus.py
python/lib/pyUniSet/pyUniSet.py
python/tests/UConnector/start_fg.sh
python/tests/UConnector/testUC.py
python/tests/UInterface/start_fg.sh
python/tests/UInterface/testUI.py
python/tests/UModbus/testUModbus.py
src/Communications/ComPort.cc
src/Communications/ComPort485F.cc
src/Communications/Makefile.am
src/Communications/Modbus/Makefile.am
src/Communications/Modbus/ModbusClient.cc
src/Communications/Modbus/ModbusHelpers.cc
src/Communications/Modbus/ModbusRTUMaster.cc
src/Communications/Modbus/ModbusRTUSlave.cc
src/Communications/Modbus/ModbusRTUSlaveSlot.cc
src/Communications/Modbus/ModbusServer.cc
src/Communications/Modbus/ModbusServerSlot.cc
src/Communications/Modbus/ModbusTCPCore.cc
src/Communications/Modbus/ModbusTCPMaster.cc
src/Communications/Modbus/ModbusTCPServer.cc
src/Communications/Modbus/ModbusTCPServerSlot.cc
src/Communications/Modbus/ModbusTCPTypes.cc
src/Communications/Modbus/ModbusTypes.cc
src/Interfaces/Makefile.am
src/Makefile.am
src/ObjectRepository/IORFile.cc
src/ObjectRepository/Makefile.am
src/ObjectRepository/ORepHelpers.cc
src/ObjectRepository/ObjectIndex.cc
src/ObjectRepository/ObjectIndex_Array.cc
src/ObjectRepository/ObjectIndex_XML.cc
src/ObjectRepository/ObjectIndex_idXML.cc
src/ObjectRepository/ObjectRepository.cc
src/ObjectRepository/ObjectRepositoryFactory.cc
src/ObjectRepository/PassiveObject.cc
src/ObjectRepository/ProxyManager.cc
src/ObjectRepository/UniSetObject.cc
src/ObjectRepository/UniSetObject_LT.cc
src/ObjectRepository/UniSetTypes.cc
src/Processes/IOController.cc
src/Processes/IONotifyController.cc
src/Processes/IONotifyController_LT.cc
src/Processes/Makefile.am
src/Services/DBServer.cc
src/Services/Makefile.am
src/Timers/Makefile.am
src/Timers/PassiveSysTimer.cc
src/Timers/PassiveTimer.cc
src/Timers/ThrPassiveTimer.cc
src/Timers/WaitingPassiveTimer.cc
src/Various/Configuration.cc
src/Various/Debug.cc
src/Various/DebugStream.cc
src/Various/LT_Object.cc
src/Various/Makefile.am
src/Various/MessageType.cc
src/Various/Mutex.cc
src/Various/Restorer_XML.cc
src/Various/RunLock.cc
src/Various/SMonitor.cc
src/Various/SViewer.cc
src/Various/UniXML.cc
src/Various/WDTInterface.cc
tests/Makefile.am
tests/UniXmlTest/Makefile.am
tests/UniXmlTest/XmlTest.cc
tests/calibration.cc
tests/conftest.cc
tests/const_char.cc
tests/delaytimer.cc
tests/getline.cc
tests/hourglass.cc
tests/int_unsigned.cc
tests/iterator_test.cc
tests/passivetimer.cc
tests/sscanf_hex.cc
tests/stop.sh
tests/testID.xml
tests/ui.cc
tests/uitest.sh
tests/umutex.cc
tests/unixml.cc
Showing
Please
register
or
sign in
to comment