Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
9e1c3629
Commit
9e1c3629
authored
Apr 10, 2013
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
чтобы не было потенциального конфликта переименовал config.h --> uniset-config.h
parent
92f635ed
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
8 deletions
+4
-8
TODO
TODO
+1
-1
MBSlave.cc
Utilities/MBTester/MBSlave.cc
+1
-1
MBTCPServer.cc
Utilities/MBTester/MBTCPServer.cc
+1
-5
configure.ac
configure.ac
+1
-1
No files found.
TODO
View file @
9e1c3629
...
@@ -29,7 +29,7 @@ codegen:
...
@@ -29,7 +29,7 @@ codegen:
iocontrol:
iocontrol:
- добавить ещё один вид сигналов (настройку) "работа по переднему фронту".
- добавить ещё один вид сигналов (настройку) "работа по переднему фронту".
Т.е. сигнал меняет своё состояние по изменению входного (типа для кнопок без фиксации).
Т.е. сигнал меняет своё состояние по изменению входного (типа для кнопок без фиксации).
"trigger"(обрабатывать после jar_delay)
Version 2.0
Version 2.0
============
============
...
...
Utilities/MBTester/MBSlave.cc
View file @
9e1c3629
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#include <sstream>
#include <sstream>
#include "UniSetTypes.h"
#include "UniSetTypes.h"
#include "MBSlave.h"
#include "MBSlave.h"
#include "config.h"
#include "
uniset-
config.h"
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
using
namespace
std
;
using
namespace
std
;
using
namespace
UniSetTypes
;
using
namespace
UniSetTypes
;
...
...
Utilities/MBTester/MBTCPServer.cc
View file @
9e1c3629
...
@@ -7,15 +7,11 @@
...
@@ -7,15 +7,11 @@
#include "MBTCPServer.h"
#include "MBTCPServer.h"
#include "uniset-config.h"
#include "uniset-config.h"
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
#ifndef PACKAGE_URL
#define PACKAGE_URL "http://git.etersoft.ru/projects/?p=asu/uniset.git;a=summary"
#endif
// -------------------------------------------------------------------------
using
namespace
std
;
using
namespace
std
;
using
namespace
UniSetTypes
;
using
namespace
UniSetTypes
;
using
namespace
ModbusRTU
;
using
namespace
ModbusRTU
;
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
MBTCPServer
::
MBTCPServer
(
ModbusAddr
myaddr
,
const
string
&
inetaddr
,
int
port
,
bool
verb
)
:
MBTCPServer
::
MBTCPServer
(
ModbusAddr
myaddr
,
const
string
inetaddr
,
int
port
,
bool
verb
)
:
sslot
(
NULL
),
sslot
(
NULL
),
addr
(
myaddr
),
addr
(
myaddr
),
// prev(ModbusRTU::erNoError),
// prev(ModbusRTU::erNoError),
...
...
configure.ac
View file @
9e1c3629
...
@@ -7,7 +7,7 @@ AC_INIT([uniset], [1.6.1], pv@etersoft.ru)
...
@@ -7,7 +7,7 @@ AC_INIT([uniset], [1.6.1], pv@etersoft.ru)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
# AC_CONFIG_MACRO_DIR([m4])
# AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(
uniset-
config.h)
dnl Initialize maintainer mode
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
AM_MAINTAINER_MODE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment